From 57b85ee5196ea2db1a1eb8d04f9dbe27041688bd Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 22 Nov 2023 13:42:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=96=E8=B4=A7=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/logistics/logisticDetil.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index c0d4fe0..b1da366 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -377,6 +377,9 @@ import { getDetil } from "@/api/logistics.js" + import { + Toast + } from "../../libs/uniApi" export default { data() { return { @@ -419,6 +422,8 @@ setTimeout(() => { uni.navigateBack() }, 2000) + }).catch((err) => { + Toast(err.msg) }) this.showPop = false From f365d7459a7e19a6103932c17987dec1239cb8d6 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 24 Nov 2023 11:46:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/topUp/topUp.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index 53154e0..9033ea6 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -152,13 +152,14 @@ }) // console.log(res1.data, res1.data.config.package.split('=')[1]); let obj = { - "appid": res1.data.appid, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致 - "noncestr": res1.data.noncestr, // 随机字符串 - "package": res1.data.package, // 固定值 - "partnerid": res1.data.partnerid, // 微信支付商户号 - "prepayid": res1.data.prepayid, // 统一下单订单号 - "timestamp": res1.data.timestamp, // 时间戳（单位：秒） - "sign": res1.data.sign + "appid": res1.data.config + .appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致 + "noncestr": res1.data.config.nonceStr, // 随机字符串 + "package": res1.data.config.package, // 固定值 + "partnerid": res1.data.config.partnerid, // 微信支付商户号 + "prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号 + "timestamp": res1.data.config.timestamp, // 时间戳（单位：秒） + "sign": res1.data.config.paySign } uni.getProvider({ From e3ed71c27b6c1088ef6acc0919f9883846d93ec2 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 24 Nov 2023 11:49:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 11 ++++++++--- api/oaUser.js | 5 +++++ config/app.js | 3 +-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/App.vue b/App.vue index 024e4d1..16e969c 100644 --- a/App.vue +++ b/App.vue @@ -4,6 +4,7 @@ // #endif import { loginShopAccount, + loginParseToken, userInfo } from "@/api/oaUser.js" export default { @@ -33,9 +34,13 @@ uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); try { - let res = await loginShopAccount({ - shop_token: info.referrerInfo?.extraData?.token - }); + let res = await loginParseToken({ + // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc" + token: info.referrerInfo?.extraData?.token + }) + // let res = await loginShopAccount({ + // shop_token: info.referrerInfo?.extraData?.token + // }); this.$store.commit('SET_USERINFO', { user: {}, token: res.data.token diff --git a/api/oaUser.js b/api/oaUser.js index 5cf351c..b742186 100644 --- a/api/oaUser.js +++ b/api/oaUser.js @@ -69,3 +69,8 @@ export const destroyAccount = (data) => oahttp.post('/user/destroy_account', dat * 商城登录 */ export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true }) + +/** + * 中台登录 + */ +export const loginParseToken = (data) => oahttp.post('/login/parseToken', data, { noAuth: true }) diff --git a/config/app.js b/config/app.js index ae60234..d42bfbc 100644 --- a/config/app.js +++ b/config/app.js @@ -2,7 +2,7 @@ let httpApiThree; let httpApi; // 总域名 let httpApiTwo; // 物流系统域名 -const env = 'local'; // 开发 +const env = 'dev'; // 开发 // const env = 'prod'; // 生产 // const env = 'prew'; // 预上线 // const env = 'local'; // 本地 @@ -19,7 +19,6 @@ switch (env) { httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 break; case 'local': - httpApi = 'http://192.168.1.20:8000' //预上线 httpApiThree = 'http://192.168.1.20:8000' //预上线 httpApiTwo = 'http://192.168.1.20:8000' //预上线 From df37262b5de320357e92695b0e7ca8cdcf21ebf3 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Sat, 25 Nov 2023 15:38:41 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=B8=85=E9=99=A4token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/modules/app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/store/modules/app.js b/store/modules/app.js index bb3aab9..122f992 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -33,6 +33,8 @@ const mutations = { state.token = null; Cache.clear('USER_INFO') Cache.clear('TOKEN') + + uni.clearStorageSync() }, UPDATE_USERINFO(state, data) { let time = res.data.result.expires_time - Cache.time(); From b09c50e18be5e8667d4237daae8e37348e48d8ba Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 27 Nov 2023 18:06:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/logistics/logisticDetil.vue | 6 +- subpkg/merchantDetails/merchantDetails.vue | 785 +++++++++++---------- 2 files changed, 399 insertions(+), 392 deletions(-) diff --git a/pages/logistics/logisticDetil.vue b/pages/logistics/logisticDetil.vue index b1da366..9d355c9 100644 --- a/pages/logistics/logisticDetil.vue +++ b/pages/logistics/logisticDetil.vue @@ -82,7 +82,7 @@ - X{{item.product_num}}{{item.goods_unit}} + X{{item.product_num}} @@ -211,7 +211,7 @@ {{item.goods_name}} - X{{item.product_num}}{{item.goods_unit}} + X{{item.product_num}} @@ -320,7 +320,7 @@ {{item.goods_name}} - X{{item.product_num}}{{item.goods_unit}} + X{{item.product_num}} diff --git a/subpkg/merchantDetails/merchantDetails.vue b/subpkg/merchantDetails/merchantDetails.vue index 7bc5a97..73753ba 100644 --- a/subpkg/merchantDetails/merchantDetails.vue +++ b/subpkg/merchantDetails/merchantDetails.vue @@ -1,424 +1,431 @@ \ No newline at end of file From 58986ff80f04e6c396122f75a92f3c9a875270f8 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 29 Nov 2023 15:14:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/logistics/deliveryDetil.vue | 2 ++ pages/oaHome/oaHome.vue | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/logistics/deliveryDetil.vue b/pages/logistics/deliveryDetil.vue index 4315930..e9b49a1 100644 --- a/pages/logistics/deliveryDetil.vue +++ b/pages/logistics/deliveryDetil.vue @@ -337,6 +337,8 @@ qrqodeFn() { + // uni.navigateBack() + // return let that = this console.log(6666) uni.scanCode({ diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index f5ecb88..ec8e508 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -315,6 +315,8 @@ // this.getUserIndex() // this.getIndexList() let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id + this.getOrderList(); + console.log("show") getAreaManagerApi({ user_id }).then(res => { @@ -335,7 +337,6 @@ this.initUserInfo(); this.showToask(); // this.initOaHomeDada(); - this.getOrderList(); //#ifdef APP-PLUS this.noticeFn(); // #endif @@ -434,6 +435,7 @@ // courier_id: 167 }); this.orderList = res.data.data; + console.log("获取列表") }, goOrderList() { uni.navigateTo({