From 0e622676f044a11f303555a814501fe7e4e4b436 Mon Sep 17 00:00:00 2001 From: Gao xiaosong <704041637@qq.com> Date: Sun, 17 May 2020 15:27:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=202.app=20?= =?UTF-8?q?=E6=89=93=E5=BC=80=E4=BF=83=E9=94=80=E6=9B=B4=E5=A4=9A=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=203.=E6=8B=BC=E5=9B=A2=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=8D=95=E7=8B=AC=E8=B4=AD=E4=B9=B0=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=204.=E4=BF=83=E9=94=80=E6=89=93=E5=BC=80=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=20=E4=B8=8A=E9=9D=A2=E6=9C=89=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=205.=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8E=BB=E5=8F=91=E8=B4=A7=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/wechat.js | 12 +----------- pages/activity/GroupDetails/index.vue | 2 +- pages/orderAdmin/AdminOrder/index.vue | 2 +- pages/orderAdmin/AdminOrderList/index.vue | 2 +- pages/shop/GoodsPromotion/index.vue | 4 ++-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libs/wechat.js b/libs/wechat.js index 929aabb..1ba5e05 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -14,16 +14,6 @@ export const weappPay = (option) => { sign: option.sign, timestamp: option.timestamp + '', } - console.log({ - provider: 'wxpay', - // signType: "MD5", - // timeStamp: orderInfo.timeStamp, - // nonceStr: orderInfo.noncestr, - // package: orderInfo.prepayid, - // signType: "MD5", - // paySign: orderInfo.sign, - orderInfo, - }, '发起支付') // 调用登录接口 uni.requestPayment({ provider: 'wxpay', @@ -33,7 +23,7 @@ export const weappPay = (option) => { success: (success) => { console.log(success) uni.showToast({ - title: JSON.stringify(success), icon: 'success', duration: 5000 + title: '支付成功', icon: 'success', duration: 5000 }); resolve(success) }, diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index d4974ff..a2088f6 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -218,7 +218,7 @@ export default { openAlone: function() { this.$yrouter.push({ path: "/pages/shop/GoodsCon/index", - query: { id: this.$yroute.query.id } + query: { id: this.storeInfo.productId } }); // this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId }); }, diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue index cdfa0ab..00d9450 100644 --- a/pages/orderAdmin/AdminOrder/index.vue +++ b/pages/orderAdmin/AdminOrder/index.vue @@ -197,7 +197,7 @@ export default { goGoodsDeliver(orderInfo) { this.$yrouter.push({ path: "/pages/orderAdmin/GoodsDeliver/index", - query: { id: orderInfo.orderId } + query: { oid: orderInfo.orderId } }); }, copyClipboard, diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue index bf9d82e..5c36c3e 100644 --- a/pages/orderAdmin/AdminOrderList/index.vue +++ b/pages/orderAdmin/AdminOrderList/index.vue @@ -136,7 +136,7 @@ this.$yrouter.push({ path: "/pages/orderAdmin/GoodsDeliver/index", query: { - id: item.orderId + oid: item.orderId } }); }, diff --git a/pages/shop/GoodsPromotion/index.vue b/pages/shop/GoodsPromotion/index.vue index 56a74ec..acb0f27 100644 --- a/pages/shop/GoodsPromotion/index.vue +++ b/pages/shop/GoodsPromotion/index.vue @@ -1,6 +1,6 @@