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 @@