Commit bea6c4cb95cd988ebd34ed51cf15f57715ba6dae
1 parent
51868f39
商城首页，拼单列表，秒杀列表修改
Showing
8 changed files
with
17 additions
and
17 deletions
pages/activity/pind_list/pind_list.js
| ... | ... | @@ -64,7 +64,7 @@ Page({ |
| 64 | 64 | let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); |
| 65 | 65 | let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); |
| 66 | 66 | obj = { |
| 67 | - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) | |
| 67 | + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec),hide:1 | |
| 68 | 68 | } |
| 69 | 69 | }else{ |
| 70 | 70 | //活动已结束，全部设置为'00' |
| ... | ... | @@ -105,7 +105,7 @@ Page({ |
| 105 | 105 | alllist.push(plist[i]); |
| 106 | 106 | } |
| 107 | 107 | e.data.currentPage++; |
| 108 | - console.log("拼团列表7777777777777777", alllist); | |
| 108 | + | |
| 109 | 109 | th.setData({goodlist:alllist,isshow:1}); |
| 110 | 110 | }, |
| 111 | 111 | ... | ... |
pages/activity/pind_list/pind_list.wxml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | </image> |
| 7 | 7 | |
| 8 | 8 | <view class="kill-list"> |
| 9 | - <view class="kill-item" wx:for="{{goodlist}}" > | |
| 9 | + <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide==1}}"> | |
| 10 | 10 | <navigator class="kill-pic " url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> |
| 11 | 11 | <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" |
| 12 | 12 | data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image> |
| ... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 | <text class='tui-conutdown-box'>{{item.djs.min}}</text>分 |
| 42 | 42 | <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒 |
| 43 | 43 | </view> |
| 44 | - <view class="goods-num"style="margin-top:{{type==0?'70rpx':'40rpx'}}"> | |
| 44 | + <view class="goods-num"style="margin-top:{{type==0?'42rpx':'18rpx'}}"> | |
| 45 | 45 | <view> |
| 46 | 46 | |
| 47 | 47 | <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}"> | ... | ... |
pages/activity/pind_list/pind_list.wxss
pages/activity/seckill_list/seckill_list.js
| ... | ... | @@ -58,11 +58,11 @@ Page({ |
| 58 | 58 | let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); |
| 59 | 59 | let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); |
| 60 | 60 | obj = { |
| 61 | - day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) | |
| 61 | + day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec), hide: 1 | |
| 62 | 62 | } |
| 63 | 63 | }else{ |
| 64 | 64 | //活动已结束，全部设置为'00' |
| 65 | - obj = { day: '00', hou: '00', min: '00', sec: '00' } | |
| 65 | + obj = { day: '00', hou: '00', min: '00', sec: '00' } | |
| 66 | 66 | } |
| 67 | 67 | var txt ="goodlist["+i+"].djs"; |
| 68 | 68 | th.setData({ [txt]: obj}); |
| ... | ... | @@ -80,6 +80,7 @@ Page({ |
| 80 | 80 | {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}} |
| 81 | 81 | ).then(res=>{ |
| 82 | 82 | plist=res.data.data.pageData; |
| 83 | + console.log("是什么即将开始",plist); | |
| 83 | 84 | }); |
| 84 | 85 | |
| 85 | 86 | if(plist.length<=0){ | ... | ... |
pages/activity/seckill_list/seckill_list.wxml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | |
| 7 | 7 | |
| 8 | 8 | <view class="kill-list abs seckill_list"> |
| 9 | - <view class="kill-item" wx:for="{{goodlist}}" > | |
| 9 | + <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide}}" > | |
| 10 | 10 | <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> |
| 11 | 11 | <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image> |
| 12 | 12 | <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}" |
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </view> |
| 25 | 25 | |
| 26 | 26 | </view> |
| 27 | - <view class=" ml10 fs20 " > 已抢{{item.buy_num}}件</view> | |
| 27 | + <view class=" ml10 fs20 " > 已抢{{item.buy_num}}件</view> | |
| 28 | 28 | </view> |
| 29 | 29 | |
| 30 | 30 | ... | ... |
pages/activity/seckill_list/seckill_list.wxss
pages/index/index/index.wxml
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </view> |
| 25 | 25 | <!--滚动广告--> |
| 26 | 26 | <view class="rel title-img" wx:if="{{banner}}" > |
| 27 | - <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical=""bindchange="bannerSwiperChange" > | |
| 27 | + <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical=""bindchange="bannerSwiperChange"> | |
| 28 | 28 | <swiper-item wx:for="{{banner}}" wx:key="banner"> |
| 29 | 29 | <view url="{{item.media_link}}" class="slide-image-frame"> |
| 30 | 30 | <image class="slide-image" src="{{item.ad_code}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image> |
| ... | ... | @@ -147,7 +147,7 @@ |
| 147 | 147 | <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> |
| 148 | 148 | <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image> |
| 149 | 149 | </view> |
| 150 | - <view>{{aitem.title}}</view> | |
| 150 | + <view class="ellipsis-2">{{aitem.title}}</view> | |
| 151 | 151 | <view class="red-co mar-top10"> <text class="fs20">￥</text>{{aitem.price}} |
| 152 | 152 | <text class="un_line">￥{{aitem.market_price}}</text> |
| 153 | 153 | </view> | ... | ... |
pages/index/index/index.wxss
| ... | ... | @@ -61,7 +61,7 @@ left: 10%; |
| 61 | 61 | |
| 62 | 62 | .swiper_box { |
| 63 | 63 | width: 100%; |
| 64 | - height: 380rpx; | |
| 64 | + | |
| 65 | 65 | } |
| 66 | 66 | .s_prom{ |
| 67 | 67 | width: 100%; |
| ... | ... | @@ -74,7 +74,6 @@ left: 10%; |
| 74 | 74 | |
| 75 | 75 | .slide-image{ |
| 76 | 76 | width: 100%; |
| 77 | - height: 100%; | |
| 78 | 77 | display: inline-block; |
| 79 | 78 | overflow: hidden; |
| 80 | 79 | border-radius: 14rpx; |
| ... | ... | @@ -257,11 +256,11 @@ left: 10%; |
| 257 | 256 | |
| 258 | 257 | |
| 259 | 258 | .seckill-list view { |
| 260 | - height: 45rpx; | |
| 259 | + height: 62rpx; | |
| 261 | 260 | padding: 0 10rpx; |
| 262 | - line-height: 25rpx; | |
| 261 | + line-height: 33rpx; | |
| 263 | 262 | overflow: hidden; |
| 264 | - font-size: 30rpx; | |
| 263 | + font-size: 28rpx; | |
| 265 | 264 | } |
| 266 | 265 | |
| 267 | 266 | .seckill-list view.imgview{ | ... | ... |