Commit f5a18a2b00a70e8ffdc45873e7381a969b254062

Authored by 前端开发-罗建龙
1 parent 645d2b9d

优化秒杀组件

components/diy_seckill/diy_seckill.js
... ... @@ -198,21 +198,35 @@ Component({
198 198  
199 199 Promise.all(promisies).then(() => {
200 200 // 判断活动是否结束
  201 + let empty=[]
201 202 for(let i in all_array){
202 203 let item=all_array[i];
203 204 if(newTime > item.end_time) {
204 205 all_array[i].status = 3;
205 206 };
  207 + let price=all_array[i].price.toFixed(2)
  208 + let priceArr = price.split(".")
  209 + all_array[i].price_n = priceArr[0]
  210 + all_array[i].price_xs = priceArr[1]
  211 +
206 212 all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1
  213 + if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) {
  214 + empty.push(all_array[i])
  215 + }
  216 + }
  217 +
  218 + //控制已售罄是否显示
  219 + if (!th.data.object.hide_sold_out_items) {
  220 + all_array=empty
207 221 }
208 222  
  223 +
209 224 var arr = new Array();
210   - if (th.data.object.style==6) {
  225 + if (th.data.object.style==7) {
211 226 //--三个三个一组---
212 227 for (var i = 0; i < all_array.length; i += 2) {
213 228 arr.push(all_array.slice(i, i + 2));
214 229 }
215   -
216 230 }else{
217 231 //--三个三个一组---
218 232 for (var i = 0; i < all_array.length; i += 3) {
... ... @@ -220,6 +234,8 @@ Component({
220 234 }
221 235 }
222 236  
  237 + console.log('渲染数据----------');
  238 + console.error(arr);
223 239 /*--熏染到前台--*/
224 240 th.setData({ goods_array: arr });
225 241 if (th.data.object.style==6) {
... ...
components/diy_seckill/diy_seckill.wxml
1 1 <block wx:if="{{goods_array.length>0}}">
2   - <!--新版秒杀组件-->
  2 + <!--新版秒杀组件-->
3 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">
  4 + <view class='top' bindtap="go_to_skill" wx:if="{{object.column_title}}" style="{{'background-image:url('+object.column_diy_title+')'+';background-size:100%;padding:0rpx;border-bottom:0rpx;'}}">
  5 + <view class="flex" wx:if="{{!object.column_diy_title}}">
6 6 <view class='t_left'></view>
7   - <view class='t_ms'>{{object.column_name}}</view>
  7 + <view class='t_ms n_t_ms'>{{object.column_name}}</view>
8 8 </view>
9   - <view class='right_k'>
10   - <image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
  9 + <view class='right_k' wx:if="{{!object.column_diy_title}}">
  10 + 更多<image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
11 11 </view>
12 12 </view>
13 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 ':'')}}">
  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 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;'}}">
  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.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
18 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">
  19 + <view class="imgBox">
20 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 21 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
22 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>
  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 24 </view>
25   -
  25 +
26 26 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
27 27 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
28 28 </view>
29   - <view style="height: 70rpx;padding: 0 30rpx; " 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>
  29 + <block wx:if="{{object.count_down}}">
  30 + <view wx:if="{{aitem.residue==0 || aitem.status==2}}" style="height: 70rpx;line-height: 70rpx;color: #fff;background-color:rgb(166,166,166);text-align: center;">
  31 + 已售罄
34 32 </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>
  33 + <view wx:else style="{{'height: 70rpx;padding: 10rpx 30rpx;background:'+ object.countdown_background_color}}" class="new_item1_time">
  34 + <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image>
  35 + <view style="text-align: center;">
  36 + <view wx:if="{{aitem.status == 1}}">距结束时间</view>
  37 + <view wx:if="{{aitem.status == 0}}">距开始时间</view>
  38 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  39 + <!-- <view>30天21:59:40</view> -->
  40 + </view>
  41 + </view>
  42 + </block>
  43 + <view class="ellipsis-2n 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 44 <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
38 45 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
  46 + <view style="color: rgb(56, 56, 56);">
  47 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  48 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.status==2 ? '0' : aitem.residue}}</text>件</text>
  49 + </view>
39 50 <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>
  51 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
41 52 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
42 53 </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 54 </view>
48   - <view >
  55 + <view>
49 56 <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>
  57 + <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 58 </view>
52 59 </view>
53 60 </navigator>
... ... @@ -56,43 +63,44 @@
56 63 </view>
57 64 </block>
58 65 <!-- 一行两个 -->
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 ':'')}}">
  66 + <block wx:if="{{object.style==2}}">
  67 + <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 68 <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)')}}">
  69 + <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 ':'')+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
63 70 <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">
  71 + <view class="imgBox">
65 72 <!-- <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 73 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
67 74 <!-- <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>
  75 + <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>
69 76 </view>
70   -
  77 +
71 78 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
72 79 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
73 80 </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> -->
  81 + <block wx:if="{{object.count_down}}">
  82 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  83 + <view>已售罄</view>
  84 + </view>
  85 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
78 86 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
79   - <!-- </view> -->
80   - </view>
  87 + </view>
  88 + </block>
81 89 <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>
  90 + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
  91 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  92 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
85 93 </view>
86   - <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
  94 + <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
87 95 <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>
  96 + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  97 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
90 98 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
91 99 </view>
92 100 </view>
93 101 <view>
94 102 <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>
  103 + <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 104 </view>
97 105 </view>
98 106 </navigator>
... ... @@ -101,43 +109,47 @@
101 109 </view>
102 110 </block>
103 111 <!-- 一行三个 -->
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 ':'')}}">
  112 + <block wx:if="{{object.style==3}}">
  113 + <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 114 <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)')}}">
  115 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
108 116 <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">
  117 + <view class="imgBox">
110 118 <!-- <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 119 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
112 120 <!-- <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>
  121 + <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>
114 122 </view>
115   -
  123 +
116 124 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
117 125 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
118 126 </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> -->
  127 + <!-- <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
123 128 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
124   - <!-- </view> -->
125   - </view>
  129 + </view> -->
  130 + <block wx:if="{{object.count_down}}">
  131 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  132 + <view>已售罄</view>
  133 + </view>
  134 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  135 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  136 + </view>
  137 + </block>
126 138 <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 139 <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>
  140 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  141 + <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
130 142 </view>
131 143 <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
132 144 <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>
  145 + <view style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  146 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs28">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
135 147 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
136 148 </view>
137 149 </view>
138 150 <view>
139 151 <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>
  152 + <!-- <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 153 </view>
142 154 </view>
143 155 </navigator>
... ... @@ -146,46 +158,50 @@
146 158 </view>
147 159 </block>
148 160 <!-- 详细列表 -->
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 ':'')}}">
  161 + <block wx:if="{{object.style==4}}">
  162 + <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 163 <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;'}}">
  164 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
153 165 <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 166 <view style="width: 50%;">
155   - <view class="imgBox">
  167 + <view class="imgBox">
156 168 <!-- <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 169 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
158 170 <!-- <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>
  171 + <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>
160 172 </view>
161   -
  173 +
162 174 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
163 175 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
164 176 </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> -->
  177 + <!-- <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
169 178 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
170   - <!-- </view> -->
171   - </view>
  179 + </view> -->
  180 + <block wx:if="{{object.count_down}}">
  181 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  182 + <view>已售罄</view>
  183 + </view>
  184 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  185 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  186 + </view>
  187 + </block>
172 188 </view>
173   - <view style="width: 50%;display: flex;flex-wrap: wrap;padding-left: 10rpx;">
  189 + <view style="{{'width: 50%;display: flex;flex-wrap: wrap;padding-left: 10rpx;' + (object.text_align==2 ? 'justify-content:center;' :'' )}}">
174 190 <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 191 <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>
  192 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  193 + <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
178 194 </view>
179 195 <view class="new_item1_price" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
180 196 <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>
  197 + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  198 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
183 199 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
184 200 </view>
185 201 </view>
186 202 <view>
187 203 <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>
  204 + <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 205 </view>
190 206 </view>
191 207 </view>
... ... @@ -195,180 +211,254 @@
195 211 </view>
196 212 </block>
197 213 <!-- 一大一小 -->
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 ':'')}}">
  214 + <block wx:if="{{object.style==5}}">
  215 + <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 216 <block wx:for="{{goods_array}}">
201 217 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
202 218 <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">
  219 + <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">
  220 + <view class="imgBox">
205 221 <!-- <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 222 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
207 223 <!-- <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>
  224 + <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 225 </view>
210   -
  226 +
211 227 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
212 228 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
213 229 </view>
214   - <view style="height: 70rpx; padding: 0 30rpx;" class="new_item1_time" wx:if="{{object.count_down}}">
  230 + <!-- <view style="{{'height: 70rpx; padding: 10rpx 30rpx;background:'+object.countdown_background_color}}" class="new_item1_time" wx:if="{{object.count_down}}">
215 231 <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image>
216 232 <view style="text-align: center;">
217 233 <view>距结束时间</view>
218 234 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
219 235 </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>
  236 + </view> -->
  237 + <block wx:if="{{object.count_down}}">
  238 + <view wx:if="{{aitem.residue==0 || aitem.status==2}}" style="height: 70rpx;line-height: 70rpx;color: #fff;background-color:rgb(166,166,166);text-align: center;">
  239 + 已售罄
  240 + </view>
  241 + <view wx:else style="{{'height: 70rpx;padding: 10rpx 30rpx;background:'+ object.countdown_background_color}}" class="new_item1_time">
  242 + <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image>
  243 + <view style="text-align: center;">
  244 + <view wx:if="{{aitem.status == 1}}">距结束时间</view>
  245 + <view wx:if="{{aitem.status == 0}}">距开始时间</view>
  246 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  247 + <!-- <view>30天21:59:40</view> -->
  248 + </view>
  249 + </view>
  250 + </block>
  251 + <view class="ellipsis-2n 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 252 <view class="new_item1_price" style="{{'padding:0 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
223 253 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
  254 + <view style="color: rgb(56, 56, 56);">
  255 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  256 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{ aitem.status==2 ? '0' : aitem.residue}}</text>件</text>
  257 + </view>
224 258 <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>
  259 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
226 260 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
227 261 </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 262 </view>
233 263 <view>
234 264 <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>
  265 + <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 266 </view>
237 267 </view>
238 268 </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)')}}">
  269 + </view>
  270 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
241 271 <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">
  272 + <view class="imgBox">
243 273 <!-- <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 274 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
245 275 <!-- <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>
  276 + <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>
247 277 </view>
248   -
  278 +
249 279 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
250 280 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
251 281 </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> -->
  282 + <!-- <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
256 283 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
257   - <!-- </view> -->
258   - </view>
  284 + </view> -->
  285 + <block wx:if="{{object.count_down}}">
  286 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  287 + <view>已售罄</view>
  288 + </view>
  289 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  290 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  291 + </view>
  292 + </block>
259 293 <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 294 <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>
  295 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  296 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
263 297 </view>
264 298 <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
265 299 <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>
  300 + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  301 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
268 302 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
269 303 </view>
270 304 </view>
271 305 <view>
272 306 <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>
  307 + <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 308 </view>
275 309 </view>
276 310 </navigator>
277 311 </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)')}}">
  312 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
279 313 <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">
  314 + <view class="imgBox">
281 315 <!-- <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 316 <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
283 317 <!-- <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>
  318 + <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>
285 319 </view>
286   -
  320 +
287 321 <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
288 322 <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
289 323 </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> -->
  324 + <!-- <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
294 325 <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
295   - <!-- </view> -->
296   - </view>
  326 + </view> -->
  327 + <block wx:if="{{object.count_down}}">
  328 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  329 + <view>已售罄</view>
  330 + </view>
  331 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  332 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  333 + </view>
  334 + </block>
297 335 <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 336 <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>
  337 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  338 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
301 339 </view>
302 340 <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
303 341 <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>
  342 + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  343 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs42">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
306 344 <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
307 345 </view>
308 346 </view>
309 347 <view>
310 348 <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>
  349 + <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 350 </view>
313 351 </view>
314 352 </navigator>
315   - </view>
  353 + </view>
316 354 </block>
317 355 </block>
318 356 </view>
319 357 </block>
320   - <!-- 横向滑动 -->
321   - <block wx:if="{{object.style==6}}">
  358 + <!-- 横向滑动 2个-->
  359 + <block wx:if="{{object.style==7}}">
322 360 <!-- <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>
  361 + <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 ':'')}}">
  362 + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;">
  363 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
  364 + <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">
  365 + <view class="imgBox">
  366 + <!-- <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> -->
  367 + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
  368 + <!-- <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> -->
  369 + <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>
336 370 </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;">
  371 +
  372 + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
  373 + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
  374 + </view>
  375 + <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  376 + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
  377 + <!-- <view style="text-align: center;">
340 378 <view>距结束时间</view> -->
341   - <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
342   - <!-- </view> -->
  379 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  380 + <!-- </view> -->
  381 + </view>
  382 + <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>
  383 + <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;':'')}}">
  384 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  385 + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
  386 + </view>
  387 + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
  388 + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
  389 + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  390 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
  391 + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
  392 + </view>
343 393 </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>
  394 + <view>
  395 + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image>
  396 + <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>
348 397 </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>
  398 + </view>
  399 + </navigator>
  400 + </view>
  401 + </swiper-item>
  402 + </swiper>
  403 + <!-- </swiper> -->
  404 +
  405 + </block>
  406 + <!-- 横向滑动 3个-->
  407 + <block wx:if="{{object.style==6}}">
  408 + <!-- <swiper indicator-dots circular> -->
  409 + <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 ':'')}}">
  410 + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;">
  411 + <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 ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
  412 + <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">
  413 + <view class="imgBox">
  414 + <!-- <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> -->
  415 + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
  416 + <!-- <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> -->
  417 + <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>
  418 + </view>
  419 +
  420 + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
  421 + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
  422 + </view>
  423 + <!-- <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  424 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  425 + </view> -->
  426 + <block wx:if="{{object.count_down}}">
  427 + <view wx:if="{{aitem.residue==0}}" class="new_item1_time" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
  428 + <view>已售罄</view>
  429 + </view>
  430 + <view wx:else class="new_item1_time" style="{{'justify-content: center;background:'+object.countdown_background_color}}">
  431 + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
  432 + </view>
  433 + </block>
  434 + <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>
  435 + <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;':'')}}">
  436 + <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">{{aitem.buy_num}}</text>件</text>
  437 + <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
  438 + </view>
  439 + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
  440 + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
  441 + <view style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
  442 + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">¥<text class="pricefs28">{{aitem.price_n}}</text>.{{aitem.price_xs}}</view>
  443 + <view wx:if="{{object.wholesale_price}}">¥{{aitem.market_price}}</view>
359 444 </view>
360 445 </view>
361   - </navigator>
362   - </view>
363   - </swiper-item>
364   - </swiper>
  446 + <view>
  447 + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 60rpx;height: 60rpx;"></image>
  448 + <!-- <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> -->
  449 + </view>
  450 + </view>
  451 + </navigator>
  452 + </view>
  453 + </swiper-item>
  454 + </swiper>
365 455 <!-- </swiper> -->
366 456  
367 457 </block>
368 458  
369 459 </block>
370 460 <block wx:else>
371   - <!--秒杀-->
  461 + <!--秒杀-->
372 462 <view class='top' bindtap="go_to_skill">
373 463 <view class="flex">
374 464 <view class='t_left'></view>
... ... @@ -392,24 +482,24 @@
392 482 <view class="rob" style="justify-content: flex-start">
393 483 <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
394 484 </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   -
  485 + </block>
  486 + <block wx:if="{{aitem.status == 1}}">
  487 + <view class="rob" style="justify-content: flex-start">
  488 + <span class='s_top_kill'>火热进行</span>
  489 + </view>
  490 + </block>
  491 + <block wx:if="{{aitem.status == 2}}">
  492 + <view class="rob" style="justify-content: flex-start">
  493 + <span class='s_top_kill gray'>已抢光</span>
  494 + </view>
  495 + </block>
  496 + <block wx:if="{{aitem.status == 3}}">
  497 + <view class="rob" style="justify-content: flex-start">
  498 + <span class='s_top_kill gray'>活动已结束</span>
  499 + </view>
  500 + </block>
  501 +
  502 +
413 503  
414 504 <view class='clear'></view>
415 505  
... ... @@ -430,7 +520,7 @@
430 520 <view class='sp_wz'>
431 521 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
432 522 <view class='sp_jg'>¥{{aitem.price}}</view>
433   - <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>¥{{aitem.market_price}}</view>
  523 + <view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>¥{{aitem.market_price}}</view>
434 524 </view>
435 525  
436 526 </view>
... ... @@ -461,32 +551,32 @@
461 551 </view>
462 552 <view class="money">
463 553 <view class='sp_jg'>¥{{aitem.price}}</view>
464   - <!-- <view class='sp_jgx'>¥{{aitem.market_price}}</view>-->
  554 + <!-- <view class='sp_jgx'>¥{{aitem.market_price}}</view>-->
465 555 </view>
466 556 <block wx:if="{{aitem.status == 0}}">
467 557 <view class="rob">
468 558 <view class="wo" style="background-color: #adadad">正在预热</view>
469 559 </view>
470 560 </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>
481   - </view>
482   - </block>
483 561  
484   - <block wx:if="{{aitem.status == 2}}">
485   - <view class="rob">
486   - <view class="wo" style="background-color: #adadad">已抢光</view>
487   - </view>
488   - </block>
489   - </block>
  562 + <block wx:if="{{aitem.status == 3}}">
  563 + <view class="rob">
  564 + <view class="wo" style="background-color: #adadad">已结束</view>
  565 + </view>
  566 + </block>
  567 + <block wx:else>
  568 + <block wx:if="{{aitem.status == 1}}">
  569 + <view class="rob">
  570 + <view class="wo">我要抢</view>
  571 + </view>
  572 + </block>
  573 +
  574 + <block wx:if="{{aitem.status == 2}}">
  575 + <view class="rob">
  576 + <view class="wo" style="background-color: #adadad">已抢光</view>
  577 + </view>
  578 + </block>
  579 + </block>
490 580  
491 581  
492 582 </view>
... ... @@ -498,5 +588,4 @@
498 588 </view>
499 589 <view class='clear'></view>
500 590 </block>
501   -</block>
502   -
  591 +</block>
503 592 \ No newline at end of file
... ...
components/diy_seckill/diy_seckill.wxss
... ... @@ -32,7 +32,7 @@ swiper {
32 32 }
33 33  
34 34 .right_k {
35   - width: 30rpx;
  35 + width: 93rpx;
36 36 }
37 37 .right_k image{
38 38 width: 30rpx;
... ... @@ -44,7 +44,9 @@ swiper {
44 44 background: #c4182e;
45 45 margin-right: 10rpx;
46 46 }
47   -
  47 +.n_t_ms{
  48 + color:rgba(196, 24, 45, 1);
  49 +}
48 50  
49 51 .sp {
50 52 min-height: 300rpx;
... ... @@ -292,6 +294,7 @@ swiper {
292 294  
293 295  
294 296 .ellipsis-2 {
  297 +
295 298 height: 97rpx;
296 299 overflow: hidden;
297 300 text-overflow: ellipsis;
... ... @@ -299,8 +302,18 @@ swiper {
299 302 -webkit-box-orient: vertical;
300 303 -webkit-line-clamp: 2;
301 304 }
302   -
303   -
  305 +.ellipsis-2n {
  306 +
  307 + /* height: 97rpx; */
  308 + overflow: hidden;
  309 + text-overflow: ellipsis;
  310 + display: -webkit-box;
  311 + -webkit-box-orient: vertical;
  312 + -webkit-line-clamp: 2;
  313 +}
  314 +.pdlf10{
  315 + padding: 0 10rpx;
  316 +}
304 317 .new_item1{
305 318 width: 100%;
306 319 overflow: hidden;
... ... @@ -328,7 +341,7 @@ swiper {
328 341 height: 52rpx;
329 342 }
330 343 .new_item1_goods_name{
331   - padding: 10rpx 0rpx;
  344 + padding: 10rpx;
332 345 font-size: 26rpx;
333 346 width: 100%;
334 347 box-sizing: border-box;
... ... @@ -339,6 +352,7 @@ swiper {
339 352 align-items: center;
340 353 justify-content: space-between;
341 354 font-size: 26rpx;
  355 + padding: 0 10rpx;
342 356 }
343 357 .clor{
344 358 color: rgba(196, 24, 45, 1);
... ... @@ -371,7 +385,7 @@ swiper {
371 385  
372 386  
373 387 .new_item1_box{
374   - padding-top: 17rpx;
  388 + /* padding-top: 17rpx; */
375 389 width: 100%;
376 390 box-sizing: border-box;
377 391 overflow: hidden;
... ... @@ -391,7 +405,7 @@ swiper {
391 405 border-radius:289rpx;
392 406 }
393 407 .but_radius5{
394   - border-radius:17px 17px 0 0;
  408 + border-radius:17px;
395 409 }
396 410 .imgBox{
397 411 position: relative;
... ... @@ -399,7 +413,7 @@ swiper {
399 413 .imgBox_img{
400 414 position: absolute;
401 415 left: 0;
402   - top: 22rpx;
  416 + top: 0;
403 417 width: 74rpx;
404 418 height: 70rpx;
405 419  
... ... @@ -471,6 +485,12 @@ swiper {
471 485 }
472 486  
473 487 .boxpad{
474   - padding:11rpx 9rpx;
  488 + /* padding:11rpx 9rpx; */
475 489 box-sizing: border-box;
  490 + }
  491 + .pricefs28{
  492 + font-size: 28rpx !important;
  493 + }
  494 + .pricefs42{
  495 + font-size: 42rpx !important;
476 496 }
477 497 \ No newline at end of file
... ...