Commit f21fbf63503b6d0a8fb37643c4555e75bce1fe68

Authored by F5VT98DI7XY4X12\Administrator
1 parent f4954d75

商品详情页的商品名称显示,以及在确认订单页 商品还在预热时,还是用普通商品价格来购买

pages/cart/cart2/cart2.js
... ... @@ -332,7 +332,7 @@ Page({
332 332  
333 333 break;
334 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 336 + "/" + gd.goods_id + "/1/" + gd.prom_id,{
337 337 success: function (tt) {
338 338 if(tt.data.code==0){
... ...
pages/goods/goodsInfo/goodsInfo.js
... ... @@ -1336,7 +1336,7 @@ Page({
1336 1336 }
1337 1337 //----已经过期-----
1338 1338 var now = ut.gettimestamp();
1339   - if (t.data.data.end_time < now) {
  1339 + if (t.data.data.end_time < now ) {
1340 1340 ee.setData({
1341 1341 prom_type: 0,isshow:1,
1342 1342 });
... ...
pages/goods/goodsInfo/goodsInfo.wxml
... ... @@ -124,9 +124,10 @@
124 124 <view class="pt_fir_title ">
125 125 <!-- 许程 商家团主页 -->
126 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 128 {{data.goods_name}}
129 129 </view>
  130 +
130 131 <view class="xc-share-frame-jieti flex" bindtap="saveImageToPhotosAlbum" style="top:0">
131 132 <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
132 133 <view class="share-font">分享</view>
... ... @@ -251,7 +252,7 @@
251 252 </view>
252 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 256 <view class="sales">销量:{{data.sales_sum}}件</view>
256 257 <view class="stock">折扣:{{data.disc}}折</view>
257 258 <view class="stock">{{categories3[0].num}}人评价</view>
... ... @@ -272,19 +273,20 @@
272 273 </view>
273 274 </view>
274 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 277 {{data.goods_name}}
277 278 </view>
278 279  
279 280 <view wx:if="{{prom_type==1}}" style='height:58rpx'></view>
280 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 284 <view class="stock">总数量:{{prom_act.goods_num}}件</view>
284 285 <view class="stock">限购:{{prom_act.buy_limit}}件</view>
285 286 <view class="sales">已购:{{prom_act.buy_num}}件</view>
286 287 </view>
287 288 </view>
  289 +
288 290 </view>
289 291 </block>
290 292 <!--许程 7.24暂时注释 -->
... ...