From 91fe5eba4b7ec46272047dd43c6401f8489f7d6e Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Sat, 6 May 2023 11:37:41 +0800
Subject: [PATCH] 秒杀组件

---
 components/diy_seckill/diy_seckill.wxml | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 components/diy_seckill/diy_seckill.wxss |   8 +++++---
 2 files changed, 228 insertions(+), 7 deletions(-)

diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index fb094aa..cc5860f 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -41,7 +41,7 @@
                     <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
                   </view>
                   <view style="color: rgb(56, 56, 56);">
-                   <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件，</text>
+                   <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
                     <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text>
                   </view>
                 </view>
@@ -79,10 +79,10 @@
                 <!-- </view> -->
               </view>
               <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>
-              <view class="new_item1_price" style="color: rgb(56, 56, 56);">
-                   <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件，</text>
+              <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;':'')}}">
+                   <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
                     <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text>
-                  </view>
+              </view>
               <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view  style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
@@ -100,6 +100,225 @@
         </block>
       </view>
     </block>
+    <!-- 一行三个 -->
+    <block wx:if="{{object.style==3}}"> 
+      <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 ':'')}}">
+        <block wx:for="{{goods_array}}">
+          <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; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
+            <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">
+              <view class="imgBox"> 
+                <!-- <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> -->
+                <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                  <!-- <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> -->
+                  <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+                </view>
+               
+                <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+              </view>
+              <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;">
+                <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
+                <!-- <view style="text-align: center;">
+                  <view>距结束时间</view> -->
+                  <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                <!-- </view> -->
+              </view>
+              <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>
+              <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;':'')}}">
+                   <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
+                    <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">20</text>件</text>
+              </view>
+              <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <view  style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                    <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:28rpx;">{{aitem.price}}</text></view>
+                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                  </view>
+                </view>
+                <view>
+                  <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 70rpx;height: 70rpx;"></image>
+                  <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>
+                </view>
+              </view>
+            </navigator>
+          </view>
+        </block>
+      </view>
+    </block>
+    <!-- 详细列表 -->
+    <block wx:if="{{object.style==4}}"> 
+      <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 ':'')}}">
+        <block wx:for="{{goods_array}}">
+          <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;'}}">
+            <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">
+              <view style="width: 50%;">
+                <view class="imgBox"> 
+                  <!-- <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> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <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> -->
+                    <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+                  </view>
+                
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+                </view>
+                <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;">
+                  <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
+                  <!-- <view style="text-align: center;">
+                    <view>距结束时间</view> -->
+                    <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                  <!-- </view> -->
+                </view>
+              </view>
+              <view style="width: 50%;display: flex;flex-wrap: wrap;">
+                <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>
+                <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;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
+                      <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">20</text>件</text>
+                </view>
+                <view class="new_item1_price" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view  style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image>
+                    <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>
+                  </view>
+                </view>
+              </view>
+            </navigator>
+          </view>
+        </block>
+      </view>
+    </block>
+    <!-- 一大一小 -->
+    <block wx:if="{{object.style==5}}"> 
+      <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 ':'')}}">
+        <block wx:for="{{goods_array}}">
+          <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+            <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;'}}">
+              <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">
+                <view class="imgBox"> 
+                  <!-- <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> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <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> -->
+                    <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+                  </view>
+                
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+                </view>
+                <view class="new_item1_time" wx:if="{{object.count_down}}">
+                  <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image>
+                  <view style="text-align: center;">
+                    <view>距结束时间</view>
+                    <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                  </view>
+                </view>
+                <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>
+                <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view class="flex" style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                    <view style="color: rgb(56, 56, 56);">
+                    <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
+                      <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 122rpx;height: 122rpx;"></image>
+                    <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>
+                  </view>
+                </view>
+              </navigator>
+            </view>           
+            <view wx:if="{{aind==1}}" 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; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+              <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">
+                <view class="imgBox"> 
+                  <!-- <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> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <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> -->
+                    <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+                  </view>
+                
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+                </view>
+                <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;">
+                  <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
+                  <!-- <view style="text-align: center;">
+                    <view>距结束时间</view> -->
+                    <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                  <!-- </view> -->
+                </view>
+                <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>
+                <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;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
+                      <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text>
+                </view>
+                <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view  style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 122rpx;height: 122rpx;"></image>
+                    <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>
+                  </view>
+                </view>
+              </navigator>
+            </view>
+            <view wx:if="{{aind==2}}"  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; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+              <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">
+                <view class="imgBox"> 
+                  <!-- <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> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <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> -->
+                    <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="./t1.png" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image>
+                  </view>
+                
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+                </view>
+                <view class="new_item1_time" wx:if="{{object.count_down}}" style="justify-content: center;">
+                  <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
+                  <!-- <view style="text-align: center;">
+                    <view>距结束时间</view> -->
+                    <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                  <!-- </view> -->
+                </view>
+                <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>
+                <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;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">已秒 <text class="clor">10</text>件</text>
+                      <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">20</text>件</text>
+                </view>
+                <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view  style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 122rpx;height: 122rpx;"></image>
+                    <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>
+                  </view>
+                </view>
+              </navigator>
+            </view>          
+          </block>
+        </block>
+      </view>
+    </block>
+
+
   </block>
   <block wx:else>
     <!--秒杀--> 
diff --git a/components/diy_seckill/diy_seckill.wxss b/components/diy_seckill/diy_seckill.wxss
index df00e70..0aea913 100644
--- a/components/diy_seckill/diy_seckill.wxss
+++ b/components/diy_seckill/diy_seckill.wxss
@@ -292,6 +292,7 @@ swiper {
 
 
 .ellipsis-2 {
+    height: 75rpx;
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
@@ -327,14 +328,15 @@ swiper {
 }
 .new_item1_goods_name{
   padding: 10rpx;
-  font-size: 28rpx;
-
+  font-size: 26rpx;
+  width: 100%;
 }
 .new_item1_price{
   display: flex;
-  padding: 10rpx;
+  padding: 0 10rpx;
   align-items: center;
   justify-content: space-between;
+  font-size: 26rpx;
 }
 .clor{
   color: rgba(196, 24, 45, 1);
--
libgit2 0.21.4