1 participants
-
Status changed to merged
-
mentioned in commit 5c616ee06820ade93a433fbe6915eed671cf2630
-
2。 组合购的因房间号的bug的优化
Showing
3 changed files
packageA/pages/myGift/myGift.js
| @@ -35,6 +35,7 @@ Page({ | @@ -35,6 +35,7 @@ Page({ | ||
| 35 | 35 | ||
| 36 | if(index == 0) { | 36 | if(index == 0) { |
| 37 | url = '/api/weshop/libao/libaoForm/page'; | 37 | url = '/api/weshop/libao/libaoForm/page'; |
| 38 | + data.timetype=1; | ||
| 38 | } else if(index == 1) { | 39 | } else if(index == 1) { |
| 39 | url = '/api/weshop/libao/libaoFormvip/page'; | 40 | url = '/api/weshop/libao/libaoFormvip/page'; |
| 40 | }; | 41 | }; |
| @@ -88,6 +89,7 @@ Page({ | @@ -88,6 +89,7 @@ Page({ | ||
| 88 | 89 | ||
| 89 | if(index == 0) { | 90 | if(index == 0) { |
| 90 | url = '/api/weshop/libao/libaoForm/page'; | 91 | url = '/api/weshop/libao/libaoForm/page'; |
| 92 | + data.timetype=1; | ||
| 91 | } else if(index == 1) { | 93 | } else if(index == 1) { |
| 92 | url = '/api/weshop/libao/libaoFormvip/page'; | 94 | url = '/api/weshop/libao/libaoFormvip/page'; |
| 93 | }; | 95 | }; |
| @@ -125,17 +127,21 @@ Page({ | @@ -125,17 +127,21 @@ Page({ | ||
| 125 | 127 | ||
| 126 | var url=""; | 128 | var url=""; |
| 127 | var index=this.data.currentIndex; | 129 | var index=this.data.currentIndex; |
| 130 | + | ||
| 131 | + var req_data={ | ||
| 132 | + store_id: app.globalData.setting.stoid, | ||
| 133 | + user_id: app.globalData.user_id, | ||
| 134 | + } | ||
| 135 | + | ||
| 128 | if(index == 0) { | 136 | if(index == 0) { |
| 129 | url = '/api/weshop/libao/libaoForm/page'; | 137 | url = '/api/weshop/libao/libaoForm/page'; |
| 138 | + req_data.timetype=1; | ||
| 130 | } else if(index == 1) { | 139 | } else if(index == 1) { |
| 131 | url = '/api/weshop/libao/libaoFormvip/page'; | 140 | url = '/api/weshop/libao/libaoFormvip/page'; |
| 132 | }; | 141 | }; |
| 133 | 142 | ||
| 134 | 143 | ||
| 135 | - this.scrollToLower(url, { | ||
| 136 | - store_id: app.globalData.setting.stoid, | ||
| 137 | - user_id: app.globalData.user_id, | ||
| 138 | - }); | 144 | + this.scrollToLower(url, req_data); |
| 139 | }, | 145 | }, |
| 140 | 146 | ||
| 141 | /** | 147 | /** |
packageA/pages/myGiftDetails/myGiftDetails.wxml
| @@ -86,9 +86,9 @@ | @@ -86,9 +86,9 @@ | ||
| 86 | <block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx"> | 86 | <block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx"> |
| 87 | <view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)"> | 87 | <view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)"> |
| 88 | <view class="flex fs28 fir_view"> | 88 | <view class="flex fs28 fir_view"> |
| 89 | - <view>满{{item.condition}}使用</view> | 89 | + <view>满{{item.condition?item.condition:'0.00'}}使用</view> |
| 90 | <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view> | 90 | <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view> |
| 91 | - <view wx:else class="fs8" style="text-align: right">￥{{item.money}}</view> | 91 | + <view wx:else class="fs8" style="text-align: center; width: 140rpx">￥{{filter.toFix(item.money,2)}}</view> |
| 92 | </view> | 92 | </view> |
| 93 | 93 | ||
| 94 | 94 |
packageB/pages/zuhegou/index/index.js
| @@ -938,7 +938,7 @@ Page({ | @@ -938,7 +938,7 @@ Page({ | ||
| 938 | 938 | ||
| 939 | //让商品带上房间号 | 939 | //让商品带上房间号 |
| 940 | if (th.data.sys_switch.is_skuroom_id == 1) { | 940 | if (th.data.sys_switch.is_skuroom_id == 1) { |
| 941 | - if (th.data.data.goods_id == getApp().globalData.room_goods_id) { | 941 | + if (th.data.sele_g.goods_id == getApp().globalData.room_goods_id) { |
| 942 | newd.room_id = getApp().globalData.room_id; | 942 | newd.room_id = getApp().globalData.room_id; |
| 943 | } | 943 | } |
| 944 | } else { | 944 | } else { |