From 9582b6a26ac8822b02258ea0ad0fd0c25a57ca3f Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Thu, 24 Aug 2023 14:41:26 +0800
Subject: [PATCH] 自定义组件优化

---
 components/diy_public/diy_public.js   | 19 ++++++++++++++++---
 components/diy_public/diy_public.wxml | 16 ++++++++--------
 pages/index/index/index.wxml          |  5 ++++-
 pages/template/index.wxml             |  5 ++++-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
index 0a610d8..d5494db 100644
--- a/components/diy_public/diy_public.js
+++ b/components/diy_public/diy_public.js
@@ -54,6 +54,7 @@ Component({
     },
     nav1:'/packageA/pages/goodsInfo/goodsInfo?',
     nav2:'/pages/goods/goodsInfo/goodsInfo?',
+
   },
 
   pageLifetimes: {
@@ -345,7 +346,8 @@ Component({
           }
           if (th.data.prom_type==9) {  //幸运购
             price = (all_array[i].group_price / 100) + ''
-            all_array[i].buy_num = all_array[i].group_joined
+            // all_array[i].buy_num = all_array[i].group_joined
+            all_array[i].buy_num = all_array[i].goods_num*1 - all_array[i].actLen*1
             all_array[i].goods_name = all_array[i].title
           }
 
@@ -360,7 +362,11 @@ Component({
 
           all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1
           all_array[i].residue = (all_array[i].residue >= 0) ? all_array[i].residue : 0
-          console.error(all_array[i].residue);
+          if (th.data.prom_type==9) {  //幸运购
+            all_array[i].residue= all_array[i].actLen
+          }
+
+          // console.error(all_array[i].residue);
           if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) {
             empty.push(all_array[i])
           }
@@ -470,7 +476,14 @@ Component({
               sec: '00'
             }
           }
-          var txt = "goods_array[" + j + "][" + i + "].djs";
+          let txt = "goods_array[" + j + "][" + i + "].djs";
+
+          if (!o.status && obj.day=='00' && obj.hou=='00' && obj.min=='00' && obj.sec=='01') {
+            let t1="goods_array[" + j + "][" + i + "].status";
+            ee.setData({
+              [t1]:1
+            })
+          }
           ee.setData({
             [txt]: obj
           });
diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml
index bbadfc0..fc02b38 100644
--- a/components/diy_public/diy_public.wxml
+++ b/components/diy_public/diy_public.wxml
@@ -16,7 +16,7 @@
       <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 ':'')}}">
         <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.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+            <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
               <view class="topBox">
                 <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> -->
@@ -76,7 +76,7 @@
       <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="{{'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)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+            <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
               <view class="topBox">
                 <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> -->
@@ -130,7 +130,7 @@
       <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="{{'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)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+            <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
               <view class="topBox">
                 <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> -->
@@ -178,7 +178,7 @@
       <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="{{'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;'}}">
-            <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+            <navigator style="display: flex;" url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
               <view style="width: 33%;" class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -231,7 +231,7 @@
         <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 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+              <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -281,7 +281,7 @@
               </navigator>
             </view>
             <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)')}}">
-              <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+              <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -323,7 +323,7 @@
               </navigator>
             </view>
             <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)')}}">
-              <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+              <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -422,7 +422,7 @@
       <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 ':'')}}">
         <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;">
           <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)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id )}}" class="s1_gk_a1">
+            <navigator url="{{(prom_type==9 && aitem.residue==0) ? '' : (aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id + '&group_id=' + aitem.id ))}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index a232463..78cc564 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -484,9 +484,12 @@
           <diy_public object="{{item.content}}" prom_type="6"></diy_public>
         </block>
         <!--秒杀-->
-        <block wx:if="{{item.ename=='seckill' || item.ename=='seckillNew'}}">
+        <block wx:if="{{item.ename=='seckill'}}">
           <seckill object="{{item.content}}"></seckill>
         </block>
+        <block wx:if="{{item.ename=='seckillNew'}}">
+          <diy_public object="{{item.content}}" prom_type="1"></diy_public>
+        </block>
         <!--标题-->
         <block wx:if="{{item.ename=='title'}}">
           <title object="{{item.content}}"></title>
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 8d2a906..7be1c03 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -41,9 +41,12 @@
         <diy_public object="{{item.content}}" prom_type="6"></diy_public>
       </block>
       <!--秒杀-->
-      <block wx:if="{{item.ename=='seckill' || item.ename=='seckillNew'}}">
+      <block wx:if="{{item.ename=='seckill'}}">
         <seckill object="{{item.content}}"></seckill>
       </block>
+      <block wx:if="{{item.ename=='seckillNew'}}">
+        <diy_public object="{{item.content}}" prom_type="1"></diy_public>
+      </block>
       <!--标题-->
       <block wx:if="{{item.ename=='title'}}">
         <title object="{{item.content}}"></title>
--
libgit2 0.21.4