From 1566eae251b3bfcf9f6c021614130eba7dc36ef4 Mon Sep 17 00:00:00 2001 From: Huakk <1751826683@qq.com> Date: Sat, 29 Jun 2024 11:24:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(custom):=20=E4=BF=AE=E5=A4=8D=E8=8B=A5?= =?UTF-8?q?=E5=B9=B2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 46 ++++++++++++++-------------- src/app.config.ts | 1 + src/components/Cart.vue | 5 +++ src/pages/fastBuy/index.config.ts | 4 +++ src/pages/fastBuy/index.scss | 6 ++++ src/pages/fastBuy/index.vue | 40 ++++++++++++++++++++++++ src/pages/index/index.vue | 10 ++++-- src/pages/user/index.vue | 5 +++ src/pages/users/order_list/index.vue | 2 +- src/utils/request.ts | 2 +- 10 files changed, 94 insertions(+), 27 deletions(-) create mode 100644 src/pages/fastBuy/index.config.ts create mode 100644 src/pages/fastBuy/index.scss create mode 100644 src/pages/fastBuy/index.vue diff --git a/package.json b/package.json index 898bae4..2ae4f43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jdt-user", - "version": "4.0.1", + "version": "4.0.2", "private": true, "description": "", "templateInfo": { @@ -9,7 +9,7 @@ "css": "sass" }, "taroConfig": { - "version": "4.0.1" + "version": "4.0.2" }, "scripts": { "build:weapp": "taro build --type weapp", @@ -62,22 +62,22 @@ "dependencies": { "@babel/runtime": "^7.23.5", "@nutui/icons-vue-taro": "^0.0.9", - "@nutui/nutui-taro": "^4.3.6", + "@nutui/nutui-taro": "^4.3.9", "@qiun/vue-ucharts": "2.5.0-20230101", - "@tarojs/components": "3.6.29", - "@tarojs/helper": "3.6.29", - "@tarojs/plugin-framework-vue3": "3.6.29", - "@tarojs/plugin-html": "3.6.29", - "@tarojs/plugin-platform-alipay": "3.6.29", - "@tarojs/plugin-platform-h5": "3.6.29", - "@tarojs/plugin-platform-jd": "3.6.29", - "@tarojs/plugin-platform-qq": "3.6.29", - "@tarojs/plugin-platform-swan": "3.6.29", - "@tarojs/plugin-platform-tt": "3.6.29", - "@tarojs/plugin-platform-weapp": "3.6.29", - "@tarojs/runtime": "3.6.29", - "@tarojs/shared": "3.6.29", - "@tarojs/taro": "3.6.29", + "@tarojs/components": "3.6.32", + "@tarojs/helper": "3.6.32", + "@tarojs/plugin-framework-vue3": "3.6.32", + "@tarojs/plugin-html": "3.6.32", + "@tarojs/plugin-platform-alipay": "3.6.32", + "@tarojs/plugin-platform-h5": "3.6.32", + "@tarojs/plugin-platform-jd": "3.6.32", + "@tarojs/plugin-platform-qq": "3.6.32", + "@tarojs/plugin-platform-swan": "3.6.32", + "@tarojs/plugin-platform-tt": "3.6.32", + "@tarojs/plugin-platform-weapp": "3.6.32", + "@tarojs/runtime": "3.6.32", + "@tarojs/shared": "3.6.32", + "@tarojs/taro": "3.6.32", "dayjs": "^1.11.10", "pinia": "^2.1.7", "vue": "^3.3.9" @@ -86,10 +86,10 @@ "@babel/core": "^7.23.5", "@commitlint/cli": "^18.4.3", "@commitlint/config-conventional": "^18.4.3", - "@tarojs/cli": "3.6.29", - "@tarojs/plugin-mini-ci": "3.6.29", - "@tarojs/taro-loader": "3.6.29", - "@tarojs/webpack5-runner": "3.6.29", + "@tarojs/cli": "3.6.32", + "@tarojs/plugin-mini-ci": "3.6.31", + "@tarojs/taro-loader": "3.6.32", + "@tarojs/webpack5-runner": "3.6.32", "@types/node": "^18.19.1", "@types/webpack-env": "^1.18.4", "@typescript-eslint/eslint-plugin": "^6.13.1", @@ -98,12 +98,12 @@ "@vue/babel-plugin-jsx": "^1.1.5", "@vue/compiler-sfc": "^3.3.9", "autoprefixer": "^10.4.19", - "babel-preset-taro": "3.6.29", + "babel-preset-taro": "3.6.32", "commitizen": "^4.3.0", "css-loader": "3.4.2", "cz-customizable": "^7.0.0", "eslint": "^8.55.0", - "eslint-config-taro": "3.6.29", + "eslint-config-taro": "3.6.32", "eslint-plugin-vue": "^9.19.2", "husky": "^8.0.3", "lint-staged": "^15.1.0", diff --git a/src/app.config.ts b/src/app.config.ts index df07920..1610233 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -8,6 +8,7 @@ export default defineAppConfig({ 'pages/game/gamedetail/index', 'pages/game/gameview/index', 'pages/game/view/index', + 'pages/fastBuy/index', ], subPackages: [ { diff --git a/src/components/Cart.vue b/src/components/Cart.vue index 466c05d..efa49f1 100644 --- a/src/components/Cart.vue +++ b/src/components/Cart.vue @@ -168,6 +168,11 @@ const create_order = async () => { icon: 'none', }); } catch (e) { + if (e.msg === '请先设置交易密码') { + Taro.navigateTo({ + url: '/pages/users/pwd/index', + }); + } Taro.showToast({ title: e.msg, icon: 'none', diff --git a/src/pages/fastBuy/index.config.ts b/src/pages/fastBuy/index.config.ts new file mode 100644 index 0000000..b52af90 --- /dev/null +++ b/src/pages/fastBuy/index.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '', + navigationStyle: 'custom', +}); diff --git a/src/pages/fastBuy/index.scss b/src/pages/fastBuy/index.scss new file mode 100644 index 0000000..96eeea3 --- /dev/null +++ b/src/pages/fastBuy/index.scss @@ -0,0 +1,6 @@ +page { + background-image: url('https://p1.meituan.net/csc/75a139bcec06745d385ec211aa313a98196174.png'); + background-size: 100% 40%; + background-repeat: no-repeat; + background-color: #F9F8F6; +} diff --git a/src/pages/fastBuy/index.vue b/src/pages/fastBuy/index.vue new file mode 100644 index 0000000..0b7b5af --- /dev/null +++ b/src/pages/fastBuy/index.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index af13b89..db03182 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -16,13 +16,19 @@ - + - + diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index bb74280..34bdf11 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -307,6 +307,11 @@ const userMenuList = ref([ url: '/pages/users/setting/index', icon: 'http://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png', }, + { + label: '关于我们', + url: '', + icon: 'http://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png', + }, ]); const clickLogin = () => { diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue index 427a953..e353967 100644 --- a/src/pages/users/order_list/index.vue +++ b/src/pages/users/order_list/index.vue @@ -121,7 +121,7 @@ const openPay = async (item: OrderList) => { // oid: item.oid, // }; Taro.navigateTo({ - url: `/pages/goods/pay/index?oid=${item.joint_oid}&bid=${item.bid}`, + url: `/pages/goods/pay/index?oid=${item.joint_oid}&bid=${item.bid}&OrderType=1`, }); }; diff --git a/src/utils/request.ts b/src/utils/request.ts index b1447bb..7185c1c 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -47,4 +47,4 @@ const request = ( }); }; -export default request; +export default request; \ No newline at end of file