Browse Source

1.修改支付成功提示文字

2.app 打开促销更多显示异常
3.拼团点击单独购买无法打开商品详情页面
4.促销打开更多 上面有空白区域
5.商户管理点击去发货,提示订单不存在的问题
zyh
Gao xiaosong 5 years ago
parent
commit
0e622676f0
  1. 12
      libs/wechat.js
  2. 2
      pages/activity/GroupDetails/index.vue
  3. 2
      pages/orderAdmin/AdminOrder/index.vue
  4. 2
      pages/orderAdmin/AdminOrderList/index.vue
  5. 4
      pages/shop/GoodsPromotion/index.vue

12
libs/wechat.js

@ -14,16 +14,6 @@ export const weappPay = (option) => {
sign: option.sign, sign: option.sign,
timestamp: option.timestamp + '', 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({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
@ -33,7 +23,7 @@ export const weappPay = (option) => {
success: (success) => { success: (success) => {
console.log(success) console.log(success)
uni.showToast({ uni.showToast({
title: JSON.stringify(success), icon: 'success', duration: 5000 title: '支付成功', icon: 'success', duration: 5000
}); });
resolve(success) resolve(success)
}, },

2
pages/activity/GroupDetails/index.vue

@ -218,7 +218,7 @@ export default {
openAlone: function() { openAlone: function() {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/shop/GoodsCon/index", path: "/pages/shop/GoodsCon/index",
query: { id: this.$yroute.query.id } query: { id: this.storeInfo.productId }
}); });
// this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId }); // this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId });
}, },

2
pages/orderAdmin/AdminOrder/index.vue

@ -197,7 +197,7 @@ export default {
goGoodsDeliver(orderInfo) { goGoodsDeliver(orderInfo) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/orderAdmin/GoodsDeliver/index", path: "/pages/orderAdmin/GoodsDeliver/index",
query: { id: orderInfo.orderId } query: { oid: orderInfo.orderId }
}); });
}, },
copyClipboard, copyClipboard,

2
pages/orderAdmin/AdminOrderList/index.vue

@ -136,7 +136,7 @@
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/orderAdmin/GoodsDeliver/index", path: "/pages/orderAdmin/GoodsDeliver/index",
query: { query: {
id: item.orderId oid: item.orderId
} }
}); });
}, },

4
pages/shop/GoodsPromotion/index.vue

@ -1,6 +1,6 @@
<template> <template>
<view class="quality-recommend"> <view class="quality-recommend">
<view class="slider-banner swiper"> <!-- <view class="slider-banner swiper">
<swiper indicatorDots="true" v-if="banner.length > 0"> <swiper indicatorDots="true" v-if="banner.length > 0">
<block v-for="(item, imgUrlsIndex) in imgUrls" :key="imgUrlsIndex"> <block v-for="(item, imgUrlsIndex) in imgUrls" :key="imgUrlsIndex">
<swiper-item> <swiper-item>
@ -8,7 +8,7 @@
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
</view> </view> -->
<view class="title acea-row row-center-wrapper"> <view class="title acea-row row-center-wrapper">
<view class="line"></view> <view class="line"></view>
<view class="name"> <view class="name">

Loading…
Cancel
Save