- 
Status changed to merged 
- 
mentioned in commit d5e96672888ae087a7b7d8fc4cc119001aaca253 
Showing
3 changed files
pages/cart/cart2/cart2.js
| @@ -332,10 +332,10 @@ Page({ | @@ -332,10 +332,10 @@ Page({ | ||
| 332 | 332 | ||
| 333 | break; | 333 | break; | 
| 334 | case 1: //---秒杀----- | 334 | case 1: //---秒杀----- | 
| 335 | - getApp().request.get("/api/weshop/activitylist/getGoodsPrice/"+gd.store_id | 335 | + getApp().request.get("/api/weshop/activitylist/getSJGoodsPrice/"+gd.store_id | 
| 336 | + "/" + gd.goods_id + "/1/" + gd.prom_id,{ | 336 | + "/" + gd.goods_id + "/1/" + gd.prom_id,{ | 
| 337 | success: function (tt) { | 337 | success: function (tt) { | 
| 338 | - if(t.data.code==0){ | 338 | + if(tt.data.code==0){ | 
| 339 | t.data.data.shop_price=tt.data.data.prom_price; | 339 | t.data.data.shop_price=tt.data.data.prom_price; | 
| 340 | }else{ | 340 | }else{ | 
| 341 | t.data.data.prom_id = 0; t.data.data.prom_type = 0; | 341 | t.data.data.prom_id = 0; t.data.data.prom_type = 0; | 
pages/goods/goodsInfo/goodsInfo.js
| @@ -1336,7 +1336,7 @@ Page({ | @@ -1336,7 +1336,7 @@ Page({ | ||
| 1336 | } | 1336 | } | 
| 1337 | //----已经过期----- | 1337 | //----已经过期----- | 
| 1338 | var now = ut.gettimestamp(); | 1338 | var now = ut.gettimestamp(); | 
| 1339 | - if (t.data.data.end_time < now) { | 1339 | + if (t.data.data.end_time < now ) { | 
| 1340 | ee.setData({ | 1340 | ee.setData({ | 
| 1341 | prom_type: 0,isshow:1, | 1341 | prom_type: 0,isshow:1, | 
| 1342 | }); | 1342 | }); | 
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -124,9 +124,10 @@ | @@ -124,9 +124,10 @@ | ||
| 124 | <view class="pt_fir_title "> | 124 | <view class="pt_fir_title "> | 
| 125 | <!-- 许程 商家团主页 --> | 125 | <!-- 许程 商家团主页 --> | 
| 126 | <view class="xc-goods-explain flex-vertical-between"> | 126 | <view class="xc-goods-explain flex-vertical-between"> | 
| 127 | - <view class="xc-explain fs32 ellipsis-2" wx:if="{{data.prom_type!=0}}"> | 127 | + <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}"> | 
| 128 | {{data.goods_name}} | 128 | {{data.goods_name}} | 
| 129 | </view> | 129 | </view> | 
| 130 | + | ||
| 130 | <view class="xc-share-frame-jieti flex" bindtap="saveImageToPhotosAlbum" style="top:0"> | 131 | <view class="xc-share-frame-jieti flex" bindtap="saveImageToPhotosAlbum" style="top:0"> | 
| 131 | <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> | 132 | <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> | 
| 132 | <view class="share-font">分享</view> | 133 | <view class="share-font">分享</view> | 
| @@ -251,7 +252,7 @@ | @@ -251,7 +252,7 @@ | ||
| 251 | </view> | 252 | </view> | 
| 252 | </view> | 253 | </view> | 
| 253 | 254 | ||
| 254 | - <view class="goods-num" wx:if="{{data.prom_type!=1}}"> | 255 | + <view class="goods-num" wx:if="{{prom_type!=1}}"> | 
| 255 | <view class="sales">销量:{{data.sales_sum}}件</view> | 256 | <view class="sales">销量:{{data.sales_sum}}件</view> | 
| 256 | <view class="stock">折扣:{{data.disc}}折</view> | 257 | <view class="stock">折扣:{{data.disc}}折</view> | 
| 257 | <view class="stock">{{categories3[0].num}}人评价</view> | 258 | <view class="stock">{{categories3[0].num}}人评价</view> | 
| @@ -272,19 +273,20 @@ | @@ -272,19 +273,20 @@ | ||
| 272 | </view> | 273 | </view> | 
| 273 | </view> | 274 | </view> | 
| 274 | <view style='height:42rpx'></view> | 275 | <view style='height:42rpx'></view> | 
| 275 | - <view class="xc-explain fs32 ellipsis-2" wx:if="{{data.prom_type!=0}}"> | 276 | + <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}"> | 
| 276 | {{data.goods_name}} | 277 | {{data.goods_name}} | 
| 277 | </view> | 278 | </view> | 
| 278 | 279 | ||
| 279 | <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> | 280 | <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> | 
| 280 | <!-- 许程 7.24 暂时注释 --> | 281 | <!-- 许程 7.24 暂时注释 --> | 
| 281 | - <view wx:if="{{prom_type!=1}}"> | ||
| 282 | - <view class="goods-num" wx:if="{{data.prom_type==1}}"> | 282 | + <view wx:if="{{prom_type==1}}"> | 
| 283 | + <view class="goods-num" wx:if="{{prom_type==1}}"> | ||
| 283 | <view class="stock">总数量:{{prom_act.goods_num}}件</view> | 284 | <view class="stock">总数量:{{prom_act.goods_num}}件</view> | 
| 284 | <view class="stock">限购:{{prom_act.buy_limit}}件</view> | 285 | <view class="stock">限购:{{prom_act.buy_limit}}件</view> | 
| 285 | <view class="sales">已购:{{prom_act.buy_num}}件</view> | 286 | <view class="sales">已购:{{prom_act.buy_num}}件</view> | 
| 286 | </view> | 287 | </view> | 
| 287 | </view> | 288 | </view> | 
| 289 | + | ||
| 288 | </view> | 290 | </view> | 
| 289 | </block> | 291 | </block> | 
| 290 | <!--许程 7.24暂时注释 --> | 292 | <!--许程 7.24暂时注释 --> | 
