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