wxd / MShopWeApp

Commit b60e1253885ee307188d4ab56f17938d72b75c98

Authored by 后端研发-苏明海
2 parents 6f485fe5 c9b20e22

Merge branch 'dev' into 'test' 

Dev

See merge request !195
Inline Side-by-side
Showing 4 changed files with 16 additions and 7 deletions
pages/activity/seckill_list/seckill_list.wxml
  View file @b60e125
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 46
47 </view> 47 </view>
48 <view class="kill-btn "> 48 <view class="kill-btn ">
49 - <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0}}" >立即开始</navigator> 49 + <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0}}" >即将开始</navigator>
50 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator> 50 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator>
51 <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator> 51 <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
52 </view> 52 </view>
pages/goods/categoryList/categoryList.js
  View file @b60e125
@@ -90,6 +90,10 @@ Page({ @@ -90,6 +90,10 @@ Page({
90 var switch_list_data = data.switch_list; 90 var switch_list_data = data.switch_list;
91 var switch_list = JSON.parse(switch_list_data); 91 var switch_list = JSON.parse(switch_list_data);
92 var is_newsgoodstype = switch_list.is_newsgoodstype; 92 var is_newsgoodstype = switch_list.is_newsgoodstype;
  93 + if (is_newsgoodstype==undefined)
  94 + {
  95 + is_newsgoodstype=0;
  96 + }
93 that.setData({ is_used_share :is_newsgoodstype}); 97 that.setData({ is_used_share :is_newsgoodstype});
94 if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } 98 if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
95 if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } 99 if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
pages/goods/goodsInfo/goodsInfo.wxml
  View file @b60e125
@@ -361,7 +361,12 @@ @@ -361,7 +361,12 @@
361 <block wx:if="prom_st>0" > 361 <block wx:if="prom_st>0" >
362 <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view> 362 <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
363 <view class="stock">限购:{{prom_act.buy_limit}}件</view> 363 <view class="stock">限购:{{prom_act.buy_limit}}件</view>
364 - <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view> 364 + <block wx:if="{{prom_st==0}}">
  365 + <view class="sales">已购:0件</view>
  366 + </block>
  367 + <block wx:else>
  368 + <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
  369 + </block>
365 </block> 370 </block>
366 371
367 <block wx:else> 372 <block wx:else>
@@ -416,7 +421,7 @@ @@ -416,7 +421,7 @@
416 <view class="circle xc-circular xc-two"></view> 421 <view class="circle xc-circular xc-two"></view>
417 </view> 422 </view>
418 423
419 - <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">领券 424 + <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
420 <text class="bg_jj"></text> 425 <text class="bg_jj"></text>
421 </view> 426 </view>
422 </view> 427 </view>
pages/goods/goodsInfo/goodsInfo.wxss
  View file @b60e125
@@ -1290,12 +1290,12 @@ left:31rpx;} @@ -1290,12 +1290,12 @@ left:31rpx;}
1290 } 1290 }
1291 .xc-coupon-fram{ 1291 .xc-coupon-fram{
1292 position: relative; 1292 position: relative;
1293 - width:180rpx; 1293 + width:200rpx;
1294 padding-top:30rpx; 1294 padding-top:30rpx;
1295 1295
1296 } 1296 }
1297 .xc-coupon-fram .xc-coupon{ 1297 .xc-coupon-fram .xc-coupon{
1298 - width:145rpx ; 1298 + width:175rpx ;
1299 height: 40rpx; 1299 height: 40rpx;
1300 line-height: 40rpx; 1300 line-height: 40rpx;
1301 background-color:#d60021 ; 1301 background-color:#d60021 ;
@@ -1317,11 +1317,11 @@ left:31rpx;} @@ -1317,11 +1317,11 @@ left:31rpx;}
1317 left:3rpx; 1317 left:3rpx;
1318 } 1318 }
1319 .xc-coupon-fram .xc-two{ 1319 .xc-coupon-fram .xc-two{
1320 - left: 153rpx; 1320 + left: 175rpx;
1321 } 1321 }
1322 1322
1323 .cx-obtain-coupon{ 1323 .cx-obtain-coupon{
1324 - width: 133rpx; 1324 + width: 65rpx;
1325 height: 100%; 1325 height: 100%;
1326 padding-left:15rpx; 1326 padding-left:15rpx;
1327 color: #d70025; 1327 color: #d70025;