Commit b6e96511c28125f932f60af3ea14e8758ee4df15
合并秒杀
Showing
5 changed files
with
732 additions
and
112 deletions
components/diy_seckill/diy_seckill.js
... | ... | @@ -35,7 +35,10 @@ Component({ |
35 | 35 | ylp_img: "https://mshopimg.yolipai.net/", |
36 | 36 | imghost: os.imghost, |
37 | 37 | timer: null, |
38 | - user_id:0 | |
38 | + user_id:0, | |
39 | + img_width:100, | |
40 | + img_height:100, | |
41 | + swiperHeight:0 | |
39 | 42 | }, |
40 | 43 | |
41 | 44 | pageLifetimes: { |
... | ... | @@ -45,7 +48,7 @@ Component({ |
45 | 48 | var th = this; |
46 | 49 | var g_id = this.data.object; |
47 | 50 | //只有再会员登陆之后,才重新调用接口 |
48 | - | |
51 | + console.log('秒杀组件------------'); | |
49 | 52 | if(this.data.user_id!=getApp().globalData.user_id){ |
50 | 53 | this.data.user_id=getApp().globalData.user_id |
51 | 54 | this.init(g_id); |
... | ... | @@ -79,7 +82,7 @@ Component({ |
79 | 82 | customMethod: function () { }, |
80 | 83 | init: function (g_id) { |
81 | 84 | var th = this; |
82 | - | |
85 | + this.loadImg(g_id) | |
83 | 86 | getApp().getConfig2(function (e) { |
84 | 87 | var swithc_list = e.switch_list; |
85 | 88 | var sw_arr = JSON.parse(swithc_list); |
... | ... | @@ -194,23 +197,35 @@ Component({ |
194 | 197 | |
195 | 198 | |
196 | 199 | Promise.all(promisies).then(() => { |
197 | - | |
198 | 200 | // 判断活动是否结束 |
199 | 201 | for(let i in all_array){ |
200 | 202 | let item=all_array[i]; |
201 | 203 | if(newTime > item.end_time) { |
202 | 204 | all_array[i].status = 3; |
203 | - }; | |
204 | - | |
205 | + }; | |
206 | + all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1 | |
207 | + } | |
208 | + | |
209 | + var arr = new Array(); | |
210 | + if (th.data.object.style==6) { | |
211 | + //--三个三个一组--- | |
212 | + for (var i = 0; i < all_array.length; i += 2) { | |
213 | + arr.push(all_array.slice(i, i + 2)); | |
214 | + } | |
215 | + | |
216 | + }else{ | |
217 | + //--三个三个一组--- | |
218 | + for (var i = 0; i < all_array.length; i += 3) { | |
219 | + arr.push(all_array.slice(i, i + 3)); | |
220 | + } | |
221 | + } | |
222 | + | |
223 | + /*--熏染到前台--*/ | |
224 | + th.setData({ goods_array: arr }); | |
225 | + if (th.data.object.style==6) { | |
226 | + th.setSwiper_h() | |
205 | 227 | } |
206 | 228 | |
207 | - var arr = new Array(); | |
208 | - //--三个三个一组--- | |
209 | - for (var i = 0; i < all_array.length; i += 3) { | |
210 | - arr.push(all_array.slice(i, i + 3)); | |
211 | - } | |
212 | - /*--熏染到前台--*/ | |
213 | - th.setData({ goods_array: arr }); | |
214 | 229 | }); |
215 | 230 | |
216 | 231 | |
... | ... | @@ -218,7 +233,30 @@ Component({ |
218 | 233 | th.countDown2(th); |
219 | 234 | }, 1000); |
220 | 235 | }, |
221 | - | |
236 | + setSwiper_h(){ | |
237 | + var th=this | |
238 | + wx.createSelectorQuery().in(this).select('.swiper_h').boundingClientRect(rect => { | |
239 | + if (rect && rect.height) { | |
240 | + var sumHeigth=(rect.height+13)+'px' | |
241 | + th.setData({ | |
242 | + swiperHeight: sumHeigth | |
243 | + }) | |
244 | + } | |
245 | + }).exec(); | |
246 | + // const query = this.createSelectorQuery() | |
247 | + // query.select('.swiper_h').boundingClientRect() | |
248 | + // query.exec( (res)=> { | |
249 | + // console.log(res) | |
250 | + // console.log(res[0].height) | |
251 | + // console.log(res[0].height * data.t.length) | |
252 | + // let sumHeigth = res[0].height * data.t.length; | |
253 | + // console.error('组件高度'); | |
254 | + // console.log(sumHeigth); | |
255 | + // th.setData({ | |
256 | + // swiperHeight: sumHeigth | |
257 | + // }) | |
258 | + // }) | |
259 | + }, | |
222 | 260 | |
223 | 261 | |
224 | 262 | //---小于10的格式化函数---- |
... | ... | @@ -285,7 +323,28 @@ Component({ |
285 | 323 | wx.navigateTo({ |
286 | 324 | url: "/pages/activity/seckill_list/seckill_list" |
287 | 325 | }); |
326 | + }, | |
327 | + //加入购物车 | |
328 | + shoppingCart(){ | |
329 | + console.log('加入购物车'); | |
330 | + }, | |
331 | + loadImg(g_id){ | |
332 | + if (g_id.style==1) { | |
333 | + let w='' | |
334 | + switch (g_id.picture_scale) { | |
335 | + case 1: | |
336 | + w=`width:calc(100%-${g_id.page_margins*2}px);height:calc(100%-${g_id.page_margins*2}px)` | |
337 | + break; | |
338 | + | |
339 | + default: | |
340 | + break; | |
341 | + } | |
342 | + | |
343 | + | |
344 | + | |
345 | + } | |
288 | 346 | } |
347 | + | |
289 | 348 | }, |
290 | 349 | |
291 | 350 | ... | ... |
components/diy_seckill/diy_seckill.wxml
1 | 1 | <block wx:if="{{goods_array.length>0}}"> |
2 | - <!--秒杀--> | |
3 | - <view class='top' bindtap="go_to_skill"> | |
4 | - <view class="flex"> | |
5 | - <view class='t_left'></view> | |
6 | - <view class='t_ms'>秒杀</view> | |
2 | + <!--新版秒杀组件--> | |
3 | + <block wx:if="{{object.column_action_name}}"> | |
4 | + <view class='top' bindtap="go_to_skill" wx:if="{{object.column_title}}" style="{{'background-image:url('+object.column_diy_title+')'}}"> | |
5 | + <view class="flex"> | |
6 | + <view class='t_left'></view> | |
7 | + <view class='t_ms'>{{object.column_name}}</view> | |
8 | + </view> | |
9 | + <view class='right_k'> | |
10 | + <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | |
11 | + </view> | |
7 | 12 | </view> |
8 | - <view class='right_k'> | |
9 | - <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | |
13 | + <!-- 大图模式 --> | |
14 | + <block wx:if="{{object.style==1}}"> | |
15 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
16 | + <block wx:for="{{goods_array}}"> | |
17 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | |
18 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
19 | + <view class="imgBox"> | |
20 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
21 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
22 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
23 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
24 | + </view> | |
25 | + | |
26 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
27 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
28 | + </view> | |
29 | + <view style="height: 70rpx;" class="new_item1_time" wx:if="{{object.count_down}}"> | |
30 | + <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> | |
31 | + <view style="text-align: center;"> | |
32 | + <view>距结束时间</view> | |
33 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
34 | + </view> | |
35 | + </view> | |
36 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'padding:10rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
37 | + <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
38 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
39 | + <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
40 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
41 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
42 | + </view> | |
43 | + <view style="color: rgb(56, 56, 56);"> | |
44 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
45 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
46 | + </view> | |
47 | + </view> | |
48 | + <view > | |
49 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
50 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
51 | + </view> | |
52 | + </view> | |
53 | + </navigator> | |
54 | + </view> | |
55 | + </block> | |
56 | + </view> | |
57 | + </block> | |
58 | + <!-- 一行两个 --> | |
59 | + <block wx:if="{{object.style==2}}"> | |
60 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
61 | + <block wx:for="{{goods_array}}"> | |
62 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | |
63 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
64 | + <view class="imgBox"> | |
65 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
66 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
67 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
68 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
69 | + </view> | |
70 | + | |
71 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
72 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
73 | + </view> | |
74 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
75 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
76 | + <!-- <view style="text-align: center;"> | |
77 | + <view>距结束时间</view> --> | |
78 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
79 | + <!-- </view> --> | |
80 | + </view> | |
81 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
82 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
83 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
84 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
85 | + </view> | |
86 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
87 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
88 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
89 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
90 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
91 | + </view> | |
92 | + </view> | |
93 | + <view> | |
94 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
95 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
96 | + </view> | |
97 | + </view> | |
98 | + </navigator> | |
99 | + </view> | |
100 | + </block> | |
101 | + </view> | |
102 | + </block> | |
103 | + <!-- 一行三个 --> | |
104 | + <block wx:if="{{object.style==3}}"> | |
105 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
106 | + <block wx:for="{{goods_array}}"> | |
107 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}"> | |
108 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
109 | + <view class="imgBox"> | |
110 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
111 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
112 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
113 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
114 | + </view> | |
115 | + | |
116 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
117 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
118 | + </view> | |
119 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
120 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
121 | + <!-- <view style="text-align: center;"> | |
122 | + <view>距结束时间</view> --> | |
123 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
124 | + <!-- </view> --> | |
125 | + </view> | |
126 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
127 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
128 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
129 | + <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> | |
130 | + </view> | |
131 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
132 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
133 | + <view style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
134 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:28rpx;">{{aitem.price}}</text></view> | |
135 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
136 | + </view> | |
137 | + </view> | |
138 | + <view> | |
139 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 60rpx;height: 60rpx;"></image> | |
140 | + <view style="width: 90rpx;height: 50rpx;line-height: 50rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
141 | + </view> | |
142 | + </view> | |
143 | + </navigator> | |
144 | + </view> | |
145 | + </block> | |
146 | + </view> | |
147 | + </block> | |
148 | + <!-- 详细列表 --> | |
149 | + <block wx:if="{{object.style==4}}"> | |
150 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
151 | + <block wx:for="{{goods_array}}"> | |
152 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'border-top-right-radius:0;margin-bottom:'+object.product_spacing+'px;'}}"> | |
153 | + <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
154 | + <view style="width: 50%;"> | |
155 | + <view class="imgBox"> | |
156 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
157 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
158 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
159 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
160 | + </view> | |
161 | + | |
162 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
163 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
164 | + </view> | |
165 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
166 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
167 | + <!-- <view style="text-align: center;"> | |
168 | + <view>距结束时间</view> --> | |
169 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
170 | + <!-- </view> --> | |
171 | + </view> | |
172 | + </view> | |
173 | + <view style="width: 50%;display: flex;flex-wrap: wrap;padding-left: 10rpx;"> | |
174 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'font-size:28rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
175 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'font-size:28rpx;display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
176 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
177 | + <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> | |
178 | + </view> | |
179 | + <view class="new_item1_price" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
180 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
181 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
182 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
183 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
184 | + </view> | |
185 | + </view> | |
186 | + <view> | |
187 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
188 | + <view style="width: 120rpx;height: 70rpx;line-height: 70rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
189 | + </view> | |
190 | + </view> | |
191 | + </view> | |
192 | + </navigator> | |
193 | + </view> | |
194 | + </block> | |
195 | + </view> | |
196 | + </block> | |
197 | + <!-- 一大一小 --> | |
198 | + <block wx:if="{{object.style==5}}"> | |
199 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
200 | + <block wx:for="{{goods_array}}"> | |
201 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | |
202 | + <view wx:if="{{aind==0}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | |
203 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
204 | + <view class="imgBox"> | |
205 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
206 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
207 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
208 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
209 | + </view> | |
210 | + | |
211 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
212 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
213 | + </view> | |
214 | + <view style="height: 70rpx;" class="new_item1_time" wx:if="{{object.count_down}}"> | |
215 | + <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> | |
216 | + <view style="text-align: center;"> | |
217 | + <view>距结束时间</view> | |
218 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
219 | + </view> | |
220 | + </view> | |
221 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'padding:10rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
222 | + <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
223 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
224 | + <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
225 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
226 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
227 | + </view> | |
228 | + <view style="color: rgb(56, 56, 56);"> | |
229 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
230 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
231 | + </view> | |
232 | + </view> | |
233 | + <view> | |
234 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
235 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
236 | + </view> | |
237 | + </view> | |
238 | + </navigator> | |
239 | + </view> | |
240 | + <view wx:if="{{aind==1}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | |
241 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
242 | + <view class="imgBox"> | |
243 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
244 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
245 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
246 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
247 | + </view> | |
248 | + | |
249 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
250 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
251 | + </view> | |
252 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
253 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
254 | + <!-- <view style="text-align: center;"> | |
255 | + <view>距结束时间</view> --> | |
256 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
257 | + <!-- </view> --> | |
258 | + </view> | |
259 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
260 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
261 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
262 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
263 | + </view> | |
264 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
265 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
266 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
267 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
268 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
269 | + </view> | |
270 | + </view> | |
271 | + <view> | |
272 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
273 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
274 | + </view> | |
275 | + </view> | |
276 | + </navigator> | |
277 | + </view> | |
278 | + <view wx:if="{{aind==2}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | |
279 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
280 | + <view class="imgBox"> | |
281 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
282 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
283 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
284 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
285 | + </view> | |
286 | + | |
287 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
288 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
289 | + </view> | |
290 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
291 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
292 | + <!-- <view style="text-align: center;"> | |
293 | + <view>距结束时间</view> --> | |
294 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
295 | + <!-- </view> --> | |
296 | + </view> | |
297 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
298 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
299 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
300 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
301 | + </view> | |
302 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
303 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
304 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
305 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
306 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
307 | + </view> | |
308 | + </view> | |
309 | + <view> | |
310 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
311 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
312 | + </view> | |
313 | + </view> | |
314 | + </navigator> | |
315 | + </view> | |
316 | + </block> | |
317 | + </block> | |
318 | + </view> | |
319 | + </block> | |
320 | + <!-- 横向滑动 --> | |
321 | + <block wx:if="{{object.style==6}}"> | |
322 | + <!-- <swiper indicator-dots circular> --> | |
323 | + <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | |
324 | + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;"> | |
325 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | |
326 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
327 | + <view class="imgBox"> | |
328 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
329 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | |
330 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> --> | |
331 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" src="{{imghost+aitem.original_img}}"data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
332 | + </view> | |
333 | + | |
334 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | |
335 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | |
336 | + </view> | |
337 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;"> | |
338 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | |
339 | + <!-- <view style="text-align: center;"> | |
340 | + <view>距结束时间</view> --> | |
341 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | |
342 | + <!-- </view> --> | |
343 | + </view> | |
344 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | |
345 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
346 | + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text> | |
347 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | |
348 | + </view> | |
349 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | |
350 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | |
351 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | |
352 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | |
353 | + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view> | |
354 | + </view> | |
355 | + </view> | |
356 | + <view> | |
357 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | |
358 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | |
359 | + </view> | |
360 | + </view> | |
361 | + </navigator> | |
362 | + </view> | |
363 | + </swiper-item> | |
364 | + </swiper> | |
365 | + <!-- </swiper> --> | |
366 | + | |
367 | + </block> | |
368 | + | |
369 | + </block> | |
370 | + <block wx:else> | |
371 | + <!--秒杀--> | |
372 | + <view class='top' bindtap="go_to_skill"> | |
373 | + <view class="flex"> | |
374 | + <view class='t_left'></view> | |
375 | + <view class='t_ms'>秒杀</view> | |
376 | + </view> | |
377 | + <view class='right_k'> | |
378 | + <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image> | |
379 | + </view> | |
10 | 380 | </view> |
11 | - </view> | |
381 | + <!--商品展示--> | |
382 | + <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}"> | |
383 | + <view class='sp' wx:if="{{object.style==1}}"> | |
384 | + <swiper-item class="s_it" wx:for="{{goods_array}}"> | |
385 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | |
386 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1"> --> | |
387 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
388 | + <view class='one'> | |
389 | + <view class='sp_top'> | |
390 | + <view class='po'></view> | |
391 | + <block wx:if="{{aitem.status == 0}}"> | |
392 | + <view class="rob" style="justify-content: flex-start"> | |
393 | + <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span> | |
394 | + </view> | |
395 | + </block> | |
396 | + <block wx:if="{{aitem.status == 1}}"> | |
397 | + <view class="rob" style="justify-content: flex-start"> | |
398 | + <span class='s_top_kill'>火热进行</span> | |
399 | + </view> | |
400 | + </block> | |
401 | + <block wx:if="{{aitem.status == 2}}"> | |
402 | + <view class="rob" style="justify-content: flex-start"> | |
403 | + <span class='s_top_kill gray'>已抢光</span> | |
404 | + </view> | |
405 | + </block> | |
406 | + <block wx:if="{{aitem.status == 3}}"> | |
407 | + <view class="rob" style="justify-content: flex-start"> | |
408 | + <span class='s_top_kill gray'>活动已结束</span> | |
409 | + </view> | |
410 | + </block> | |
411 | + | |
412 | + | |
12 | 413 | |
13 | - <!--商品展示--> | |
14 | - <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.style==1}}"> | |
15 | - <view class='sp' wx:if="{{object.style==1}}"> | |
16 | - <swiper-item class="s_it" wx:for="{{goods_array}}"> | |
17 | - <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | |
18 | - <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1"> --> | |
19 | - <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
20 | - <view class='one'> | |
21 | - <view class='sp_top'> | |
22 | - <view class='po'></view> | |
23 | - <block wx:if="{{aitem.status == 0}}"> | |
24 | - <view class="rob" style="justify-content: flex-start"> | |
25 | - <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span> | |
414 | + <view class='clear'></view> | |
415 | + | |
416 | + <view class='s_img'> | |
417 | + <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
26 | 418 | </view> |
27 | - </block> | |
28 | - | |
29 | - <!-- <block wx:if="{{aitem.end_time<=newTime}}"> | |
30 | - <view class="rob" style="justify-content: flex-start"> | |
31 | - <span class='s_top_kill gray'>活动已结束</span> | |
32 | - </view> | |
33 | - </block> | |
34 | - <block wx:else> | |
35 | - <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}"> | |
36 | - <view class="rob" style="justify-content: flex-start"> | |
37 | - <span class='s_top_kill'>火热进行</span> | |
38 | - </view> | |
39 | - </block> | |
40 | - <block wx:if="{{aitem.goods_num<=aitem.buy_num}}"> | |
41 | - <view class="rob" style="justify-content: flex-start"> | |
42 | - <span class='s_top_kill gray'>已抢光</span> | |
43 | - </view> | |
44 | - </block> | |
45 | - </block> --> | |
46 | - | |
47 | - | |
48 | - <block wx:if="{{aitem.status == 1}}"> | |
49 | - <view class="rob" style="justify-content: flex-start"> | |
50 | - <span class='s_top_kill'>火热进行</span> | |
51 | - </view> | |
52 | - </block> | |
53 | - <block wx:if="{{aitem.status == 2}}"> | |
54 | - <view class="rob" style="justify-content: flex-start"> | |
55 | - <span class='s_top_kill gray'>已抢光</span> | |
56 | - </view> | |
57 | - </block> | |
58 | - <block wx:if="{{aitem.status == 3}}"> | |
59 | - <view class="rob" style="justify-content: flex-start"> | |
60 | - <span class='s_top_kill gray'>活动已结束</span> | |
61 | - </view> | |
62 | - </block> | |
63 | - | |
64 | - | |
65 | 419 | |
66 | - <view class='clear'></view> | |
420 | + <view class='s_foot_kill'> | |
421 | + <text>{{aitem.djs.day}}天</text> | |
422 | + <text>{{aitem.djs.hou}}时</text> | |
423 | + <text>{{aitem.djs.min}}分</text> | |
424 | + <text>{{aitem.djs.sec}}秒</text> | |
425 | + </view> | |
426 | + <view class='clear'></view> | |
67 | 427 | |
68 | - <view class='s_img'> | |
69 | - <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
70 | 428 | </view> |
71 | 429 | |
72 | - <view class='s_foot_kill'> | |
73 | - <text>{{aitem.djs.day}}天</text> | |
74 | - <text>{{aitem.djs.hou}}时</text> | |
75 | - <text>{{aitem.djs.min}}分</text> | |
76 | - <text>{{aitem.djs.sec}}秒</text> | |
430 | + <view class='sp_wz'> | |
431 | + <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view> | |
432 | + <view class='sp_jg'>¥{{aitem.price}}</view> | |
433 | + <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>¥{{aitem.market_price}}</view> | |
77 | 434 | </view> |
78 | - <view class='clear'></view> | |
79 | 435 | |
80 | 436 | </view> |
437 | + </navigator> | |
438 | + </block> | |
439 | + </swiper-item> | |
440 | + </view> | |
441 | + </swiper> | |
442 | + <view class="sp2" wx:if="{{object.style==2}}"> | |
443 | + <block wx:for="{{goods_array}}"> | |
444 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | |
445 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1"> --> | |
446 | + <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
447 | + <view class='one1'> | |
81 | 448 | |
82 | - <view class='sp_wz'> | |
83 | - <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view> | |
84 | - <view class='sp_jg'>¥{{aitem.price}}</view> | |
85 | - <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>¥{{aitem.market_price}}</view> | |
449 | + <view class="o1_img"> | |
450 | + <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
86 | 451 | </view> |
87 | 452 | |
88 | - </view> | |
89 | - </navigator> | |
90 | - </block> | |
91 | - </swiper-item> | |
92 | - </view> | |
93 | - </swiper> | |
94 | - | |
95 | - | |
96 | - | |
97 | - <view class="sp2" wx:if="{{object.style==2}}"> | |
98 | - <block wx:for="{{goods_array}}"> | |
99 | - <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | |
100 | - <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1"> --> | |
101 | - <navigator url="{{aitem.goods_type == 1 ? ('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id ) : ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id)}}" class="s1_gk_a1"> | |
102 | - <view class='one1'> | |
453 | + <view class="o1_right"> | |
454 | + <view class="sp_wzi ellipsis-2">{{aitem.title}}</view> | |
455 | + <view class="o1_sj_kill"> | |
456 | + <text>{{aitem.djs.day}}</text> 天 | |
457 | + <text>{{aitem.djs.hou}}</text> : | |
458 | + <text>{{aitem.djs.min}}</text> : | |
459 | + <text>{{aitem.djs.sec}}</text> | |
103 | 460 | |
104 | - <view class="o1_img"> | |
105 | - <image src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> | |
461 | + </view> | |
462 | + <view class="money"> | |
463 | + <view class='sp_jg'>¥{{aitem.price}}</view> | |
464 | + <!-- <view class='sp_jgx'>¥{{aitem.market_price}}</view>--> | |
465 | + </view> | |
466 | + <block wx:if="{{aitem.status == 0}}"> | |
467 | + <view class="rob"> | |
468 | + <view class="wo" style="background-color: #adadad">正在预热</view> | |
469 | + </view> | |
470 | + </block> | |
471 | + | |
472 | + <block wx:if="{{aitem.status == 3}}"> | |
473 | + <view class="rob"> | |
474 | + <view class="wo" style="background-color: #adadad">已结束</view> | |
475 | + </view> | |
476 | + </block> | |
477 | + <block wx:else> | |
478 | + <block wx:if="{{aitem.status == 1}}"> | |
479 | + <view class="rob"> | |
480 | + <view class="wo">我要抢</view> | |
106 | 481 | </view> |
482 | + </block> | |
107 | 483 | |
484 | +<<<<<<< HEAD | |
108 | 485 | <view class="o1_right"> |
109 | 486 | <view class="sp_wzi ellipsis-2">{{aitem.goods_name}}</view> |
110 | 487 | <view class="o1_sj_kill"> |
... | ... | @@ -142,15 +519,24 @@ |
142 | 519 | </view> |
143 | 520 | </block> |
144 | 521 | </block> |
522 | +======= | |
523 | + <block wx:if="{{aitem.status == 2}}"> | |
524 | + <view class="rob"> | |
525 | + <view class="wo" style="background-color: #adadad">已抢光</view> | |
526 | + </view> | |
527 | + </block> | |
528 | + </block> | |
529 | +>>>>>>> dev_component | |
145 | 530 | |
146 | 531 | |
532 | + </view> | |
147 | 533 | </view> |
148 | - </view> | |
149 | - </navigator> | |
534 | + </navigator> | |
535 | + </block> | |
150 | 536 | </block> |
151 | - </block> | |
152 | 537 | |
153 | - </view> | |
154 | - <view class='clear'></view> | |
538 | + </view> | |
539 | + <view class='clear'></view> | |
540 | + </block> | |
541 | +</block> | |
155 | 542 | |
156 | -</block> | |
157 | 543 | \ No newline at end of file | ... | ... |
components/diy_seckill/diy_seckill.wxss
... | ... | @@ -292,9 +292,184 @@ swiper { |
292 | 292 | |
293 | 293 | |
294 | 294 | .ellipsis-2 { |
295 | + height: 97rpx; | |
295 | 296 | overflow: hidden; |
296 | 297 | text-overflow: ellipsis; |
297 | 298 | display: -webkit-box; |
298 | 299 | -webkit-box-orient: vertical; |
299 | 300 | -webkit-line-clamp: 2; |
300 | -} | |
301 | 301 | \ No newline at end of file |
302 | +} | |
303 | + | |
304 | + | |
305 | +.new_item1{ | |
306 | + width: 100%; | |
307 | + overflow: hidden; | |
308 | +} | |
309 | + | |
310 | +.new_item1_image{ | |
311 | + width: 100%; | |
312 | + /* max-width: 100%; | |
313 | + max-height: 100%; */ | |
314 | +} | |
315 | +.new_item1_time{ | |
316 | + height: 60rpx; | |
317 | + background: rgba(196, 24, 45, 1); | |
318 | + color: #fff; | |
319 | + font-size: 25rpx; | |
320 | + display: flex; | |
321 | + justify-content: space-between; | |
322 | + align-items: center; | |
323 | + padding: 0rpx 30rpx; | |
324 | + | |
325 | +} | |
326 | +.new_item1_time image{ | |
327 | + width: 188rpx; | |
328 | + height: 52rpx; | |
329 | +} | |
330 | +.new_item1_goods_name{ | |
331 | + padding: 10rpx 0rpx; | |
332 | + font-size: 26rpx; | |
333 | + width: 100%; | |
334 | + box-sizing: border-box; | |
335 | +} | |
336 | +.new_item1_price{ | |
337 | + display: flex; | |
338 | + /* padding: 0 10rpx; */ | |
339 | + align-items: center; | |
340 | + justify-content: space-between; | |
341 | + font-size: 26rpx; | |
342 | +} | |
343 | +.clor{ | |
344 | + color: rgba(196, 24, 45, 1); | |
345 | +} | |
346 | +.new_item1_but{ | |
347 | + width: 130rpx; | |
348 | + height: 60rpx; | |
349 | + color: #fff; | |
350 | + background-color: rgba(196,24,45,1); | |
351 | + line-height: 60rpx; | |
352 | + text-align: center; | |
353 | + border-radius: 15rpx; | |
354 | +} | |
355 | +.new_item1_but1{ | |
356 | + border-radius: 50rpx !important; | |
357 | +} | |
358 | +.new_item1_but2{ | |
359 | + border-radius: 50rpx !important; | |
360 | + background-color: rgba(0, 0, 0, 0) !important; | |
361 | + color: rgba(196,24,45,1) !important; | |
362 | + border: 1rpx solid rgba(196,24,45,1) !important; | |
363 | +} | |
364 | +.new_item1_but3{ | |
365 | + background-color: rgba(0, 0, 0, 0) !important; | |
366 | + color: rgba(196,24,45,1) !important; | |
367 | + border: 1rpx solid rgba(196,24,45,1) !important; | |
368 | +} | |
369 | + | |
370 | + | |
371 | + | |
372 | + | |
373 | +.new_item1_box{ | |
374 | + padding-top: 17rpx; | |
375 | + width: 100%; | |
376 | + box-sizing: border-box; | |
377 | + overflow: hidden; | |
378 | +} | |
379 | + | |
380 | +.aborder{ | |
381 | + border: 1px solid #e8e8e8; | |
382 | +} | |
383 | +.bgf{ | |
384 | + background-color: #fff; | |
385 | +} | |
386 | +.boxsha{ | |
387 | + /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */ | |
388 | + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); | |
389 | +} | |
390 | +.but_radius85{ | |
391 | + border-radius:289rpx; | |
392 | +} | |
393 | +.but_radius5{ | |
394 | + border-radius:17px 17px 0 0; | |
395 | +} | |
396 | +.imgBox{ | |
397 | + position: relative; | |
398 | +} | |
399 | +.imgBox_img{ | |
400 | + position: absolute; | |
401 | + left: 0; | |
402 | + top: 22rpx; | |
403 | + width: 74rpx; | |
404 | + height: 70rpx; | |
405 | + | |
406 | +} | |
407 | + | |
408 | +.aspect_ratio1{ | |
409 | + aspect-ratio:1/1; | |
410 | +} | |
411 | +.aspect_ratio2{ | |
412 | + aspect-ratio:16/9; | |
413 | +} | |
414 | +.aspect_ratio3{ | |
415 | + aspect-ratio:3/2; | |
416 | +} | |
417 | +.aspect_ratio4{ | |
418 | + aspect-ratio:3/4; | |
419 | +} | |
420 | +.container1 { | |
421 | + position: relative; | |
422 | + width:100%; | |
423 | + padding-top: 100%; | |
424 | + overflow: hidden; | |
425 | +} | |
426 | +.container2 { | |
427 | + position: relative; | |
428 | + width:100%; | |
429 | + padding-top: 56.25%; | |
430 | + overflow: hidden; | |
431 | +} | |
432 | +.container3 { | |
433 | + position: relative; | |
434 | + width:100%; | |
435 | + padding-top: 66.67%; | |
436 | + overflow: hidden; | |
437 | +} | |
438 | +.container4 { | |
439 | + position: relative; | |
440 | + width:100%; | |
441 | + padding-top: 133.33%; | |
442 | + overflow: hidden; | |
443 | + | |
444 | +} | |
445 | + | |
446 | +.images1 { | |
447 | + display: block; | |
448 | + position: absolute; | |
449 | + width: 100%; | |
450 | + height: 100%; | |
451 | + top: 0; | |
452 | + bottom: 0; | |
453 | + left: 0; | |
454 | + right: 0; | |
455 | + object-fit: cover; | |
456 | + | |
457 | +} | |
458 | + | |
459 | +.flex2{ | |
460 | + display: flex; | |
461 | + /* align-items: center; */ | |
462 | + justify-content: space-between; | |
463 | + flex-wrap: wrap; | |
464 | + box-sizing: border-box; | |
465 | +} | |
466 | +.flex2:after { | |
467 | + content: ""; | |
468 | + width: 30%; | |
469 | + height: 0px; | |
470 | + visibility: hidden; | |
471 | + } | |
472 | + | |
473 | + .boxpad{ | |
474 | + padding:11rpx 9rpx; | |
475 | + box-sizing: border-box; | |
476 | + } | |
302 | 477 | \ No newline at end of file | ... | ... |
pages/index/index/index.wxml
... | ... | @@ -481,7 +481,7 @@ |
481 | 481 | <pingd_buy object="{{item.content}}"></pingd_buy> |
482 | 482 | </block> |
483 | 483 | <!--秒杀--> |
484 | - <block wx:if="{{item.ename=='seckill'}}"> | |
484 | + <block wx:if="{{item.ename=='seckill' || item.ename=='seckillNew'}}"> | |
485 | 485 | <seckill object="{{item.content}}"></seckill> |
486 | 486 | </block> |
487 | 487 | <!--标题--> | ... | ... |
pages/template/index.wxml
... | ... | @@ -38,7 +38,7 @@ |
38 | 38 | <pingd_buy object="{{item.content}}"></pingd_buy> |
39 | 39 | </block> |
40 | 40 | <!--秒杀--> |
41 | - <block wx:if="{{item.ename=='seckill'}}"> | |
41 | + <block wx:if="{{item.ename=='seckill' || item.ename=='seckillNew'}}"> | |
42 | 42 | <seckill object="{{item.content}}"></seckill> |
43 | 43 | </block> |
44 | 44 | <!--标题--> | ... | ... |