XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(deps): 依赖更新

Browse Source
This commit is contained in:
YuanHuakk
2023-12-19 22:56:43 +08:00
parent 3c5ce5bba3
commit fb4666bb04
5 changed files with 404 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/index.ts
View File

@@ -6,11 +6,12 @@ import { argv } from "yargs";
const { robot = 1, desc } = argv; const { robot = 1, desc } = argv;
const CIPluginOptFn = async () => {
/** /**
* @typedef { import("@tarojs/plugin-mini-ci").CIOptions } CIOptions * @typedef { import("@tarojs/plugin-mini-ci").CIOptions } CIOptions
* @type {CIOptions} * @type {CIOptions}
*/ */
const CIPluginOpt = { return {
weapp: { weapp: {
appid: process.env.TARO_APP_ID, appid: process.env.TARO_APP_ID,
privateKeyPath: process.env.TARO_APP_KEY, privateKeyPath: process.env.TARO_APP_KEY,
@@ -18,6 +19,7 @@ const CIPluginOpt = {
}, },
desc, desc,
}; };
};
const config = { const config = {
projectName: "taroApp", projectName: "taroApp",
@@ -36,7 +38,7 @@ const config = {
}, },
sourceRoot: "src", sourceRoot: "src",
outputRoot: "dist", outputRoot: "dist",
plugins: ["@tarojs/plugin-html", ["@tarojs/plugin-mini-ci", CIPluginOpt]], plugins: ["@tarojs/plugin-html", ["@tarojs/plugin-mini-ci", CIPluginOptFn]],
defineConstants: {}, defineConstants: {},
copy: { copy: {
patterns: [], patterns: [],

46
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "jdt-user", "name": "jdt-user",
"version": "3.0.5", "version": "3.0.6",
"private": true, "private": true,
"description": "", "description": "",
"templateInfo": { "templateInfo": {
@@ -9,7 +9,7 @@
"css": "sass" "css": "sass"
}, },
"taroConfig": { "taroConfig": {
"version": "3.0.5" "version": "3.0.6"
}, },
"scripts": { "scripts": {
"build:weapp": "taro build --type weapp", "build:weapp": "taro build --type weapp",
@@ -61,22 +61,22 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.23.5", "@babel/runtime": "^7.23.5",
"@nutui/icons-vue-taro": "^0.0.9", "@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.2.3", "@nutui/nutui-taro": "^4.2.4",
"@qiun/vue-ucharts": "2.5.0-20230101", "@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.19", "@tarojs/components": "3.6.20",
"@tarojs/helper": "3.6.19", "@tarojs/helper": "3.6.20",
"@tarojs/plugin-framework-vue3": "3.6.19", "@tarojs/plugin-framework-vue3": "3.6.20",
"@tarojs/plugin-html": "3.6.19", "@tarojs/plugin-html": "3.6.20",
"@tarojs/plugin-platform-alipay": "3.6.19", "@tarojs/plugin-platform-alipay": "3.6.20",
"@tarojs/plugin-platform-h5": "3.6.19", "@tarojs/plugin-platform-h5": "3.6.20",
"@tarojs/plugin-platform-jd": "3.6.19", "@tarojs/plugin-platform-jd": "3.6.20",
"@tarojs/plugin-platform-qq": "3.6.19", "@tarojs/plugin-platform-qq": "3.6.20",
"@tarojs/plugin-platform-swan": "3.6.19", "@tarojs/plugin-platform-swan": "3.6.20",
"@tarojs/plugin-platform-tt": "3.6.19", "@tarojs/plugin-platform-tt": "3.6.20",
"@tarojs/plugin-platform-weapp": "3.6.19", "@tarojs/plugin-platform-weapp": "3.6.20",
"@tarojs/runtime": "3.6.19", "@tarojs/runtime": "3.6.20",
"@tarojs/shared": "3.6.19", "@tarojs/shared": "3.6.20",
"@tarojs/taro": "3.6.19", "@tarojs/taro": "3.6.20",
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"pinia": "^2.1.7", "pinia": "^2.1.7",
"vue": "^3.3.9" "vue": "^3.3.9"
@@ -85,22 +85,22 @@
"@babel/core": "^7.23.5", "@babel/core": "^7.23.5",
"@commitlint/cli": "^18.4.3", "@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3", "@commitlint/config-conventional": "^18.4.3",
"@tarojs/cli": "3.6.19", "@tarojs/cli": "3.6.20",
"@tarojs/plugin-mini-ci": "^3.6.20", "@tarojs/plugin-mini-ci": "3.6.20",
"@tarojs/taro-loader": "3.6.19", "@tarojs/taro-loader": "3.6.20",
"@tarojs/webpack5-runner": "3.6.19", "@tarojs/webpack5-runner": "3.6.20",
"@types/node": "^18.19.1", "@types/node": "^18.19.1",
"@types/webpack-env": "^1.18.4", "@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^6.13.1", "@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1", "@typescript-eslint/parser": "^6.13.1",
"@vue/babel-plugin-jsx": "^1.1.5", "@vue/babel-plugin-jsx": "^1.1.5",
"@vue/compiler-sfc": "^3.3.9", "@vue/compiler-sfc": "^3.3.9",
"babel-preset-taro": "3.6.19", "babel-preset-taro": "3.6.20",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"css-loader": "3.4.2", "css-loader": "3.4.2",
"cz-customizable": "^7.0.0", "cz-customizable": "^7.0.0",
"eslint": "^8.55.0", "eslint": "^8.55.0",
"eslint-config-taro": "3.6.19", "eslint-config-taro": "3.6.20",
"eslint-plugin-vue": "^9.19.2", "eslint-plugin-vue": "^9.19.2",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^15.1.0", "lint-staged": "^15.1.0",

747
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

4
src/pages/cart/index.vue
View File

@@ -143,8 +143,8 @@ const changeBox = (label: string[], item: any) => {
label.forEach((id: string) => { label.forEach((id: string) => {
item.Goods.forEach((itm: any) => { item.Goods.forEach((itm: any) => {
if (itm.gid === id) { if (itm.gid === id) {
item["Count"].priceCount += itm.price * itm.number; item["Count"].priceCount += itm.price;
item["Count"].exchangeCount += itm.exchange * itm.number; item["Count"].exchangeCount += itm.exchange;
} }
}); });
}); });

1
src/pages/mer/mer_detail/index.vue
View File

@@ -49,6 +49,7 @@
<nut-tabs <nut-tabs
v-model="value" v-model="value"
title-scroll title-scroll
size="large"
direction="vertical" direction="vertical"
title-gutter="5" title-gutter="5"
animated-time="0" animated-time="0"