合并解决冲突

WXD-SEASON\season
2 parents 688493b9 9582b6a2
Showing 6 changed files with 93 additions and 15 deletions
components/diy_public/diy_public.js
components/diy_public/diy_public.wxml
components/diy_public/diy_public.wxss
pages/index/index/index.wxml
pages/template/index.json
pages/template/index.wxml
@@ -50,9 +50,11 @@ Component({
       '2':"/miniapp/images/component/pingd/pingd.png",
       '6':"/miniapp/images/component/pingd/pingd.png",
       '8':"/miniapp/images/component/presale.png",
+      '9':"/miniapp/images/component/luckyactivity.png",
     },
     nav1:'/packageA/pages/goodsInfo/goodsInfo?',
     nav2:'/pages/goods/goodsInfo/goodsInfo?',
+
   },
   pageLifetimes: {
@@ -98,7 +100,7 @@ Component({
         prom_text:'已团',
         nav1:'/pages/goods/goodsInfo/goodsInfo?',
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
-      })
+      }) 
     }
     if (this.data.prom_type==8) {  //预售
       this.setData({
@@ -107,6 +109,14 @@ Component({
         nav2:'/packageC/pages/presell/goodsInfo/goodsInfo?'
       })
     }
+    if (this.data.prom_type==9) {  //幸运购
+      this.setData({
+        prom_text:'已售',
+        nav1:'/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?',
+        nav2:'/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?'
+      })
+    }
+
     var g_id = this.data.object;
     this.init(g_id);
@@ -165,6 +175,10 @@ Component({
             gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
             +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
           }
+          if (th.data.prom_type==9) { //幸运购
+            gUrl="/api/weshop/prom/luckyActivity/getGoodsList?store_id="
+            +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=1&type=1';
+          }
@@ -226,6 +240,18 @@ Component({
           pageSize:9
         }
       }
+      if (this.data.prom_type==9) { //幸运购
+        gUrl="/api/weshop/prom/luckyActivity/page"
+        req={
+          store_id:os.stoid,
+          is_end:0,
+          timetype:1,
+          // isuse:1,
+          // page:1,
+          // user_id:user_id,
+          // pageSize:9
+        }
+      }
       getApp().request.promiseGet(gUrl,
         { isShowLoading: 1, data:req  }
@@ -244,6 +270,7 @@ Component({
       let prom_type=this.data.prom_type
       goodslist.forEach(function (vy, indy) {
           if(!vy.id) vy.id=vy.prom_id;
+          if(vy.title && !vy.goods_name) vy.goods_name=vy.title;
       })
       // 判断火热，预热
@@ -279,7 +306,7 @@ Component({
       var promisies = [];
-      if (th.data.prom_type !=8) {        
+      if (th.data.prom_type !=8 && th.data.prom_type !=9) {        
         for (const key in all_array) {
           if (Object.hasOwnProperty.call(all_array, key)) {
             const val = all_array[key];           
@@ -306,6 +333,7 @@ Component({
           }; 
           // let price=all_array[i].price.toFixed(2)
           let price=all_array[i].price + ''
+          
           if (th.data.prom_type==8) { //预售
             price = all_array[i].presell_price + ''
             if (all_array[i].status ===0) {
@@ -315,8 +343,12 @@ Component({
               all_array[i].goods_num=all_array[i].presell_sumqty*1 + all_array[i].virtual_qty*1 
               all_array[i].buy_num=all_array[i].buy_goodnum + all_array[i].virtual_qty*1
             }
-
-
+          }
+          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].goods_num*1 - all_array[i].actLen*1
+            all_array[i].goods_name = all_array[i].title
           }
@@ -329,6 +361,12 @@ 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
+          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])
           }
@@ -438,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
           });
@@ -464,6 +509,9 @@ Component({
       if (this.data.prom_type==8) { //预售
         url="/packageC/pages/presell/list/list";
       }
+      if (this.data.prom_type==9) { //幸运购
+        url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList";
+      }
       wx.navigateTo({
         url
@@ -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;' : ''}}">
@@ -555,4 +555,14 @@ swiper {
     border-radius: 10rpx;
     margin-right: 10rpx;
     opacity: .8;
+  }
+  .lucky{
+    display: inline-block;
+    font-size: 24rpx;
+    padding: 0 10rpx;
+    background-color: #f23023;
+    opacity: .8;
+    color: #fff;
+    margin-right: 10rpx;
+    border-radius: 10rpx;
   }
 \ No newline at end of file
@@ -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>
@@ -530,6 +533,10 @@
         <block wx:if="{{item.ename=='luckyactivity'}}">
           <luckyGo object="{{item.content}}"></luckyGo>
         </block>
+        <block wx:if="{{item.ename=='luckyactivityNew'}}">
+          <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
+          <diy_public object="{{item.content}}" prom_type="9"></diy_public>
+        </block>
         <!-- 服务卡项 -->
         <block wx:if="{{item.ename=='servicecategory'}}">
@@ -11,6 +11,7 @@
         "searchbox":"/components/diy_searchbox/diy_searchbox",
         "shopname": "/components/diy_shopname/diy_shopname",
         "pingd_buy": "/components/diy_pingd_buy/diy_pingd_buy",
+        "luckyGo": "/components/diy_luckyGo/diy_luckyGo",
         "diy_public": "/components/diy_public/diy_public",
         "title": "/components/diy_title/diy_title",
         "notice": "/components/diy_notice/diy_notice",
@@ -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>
@@ -79,6 +82,15 @@
     <block wx:if="{{item.ename=='groupbuyNew'}}">
         <diy_public object="{{item.content}}" prom_type="2"></diy_public>
       </block>
+
+      <!-- 幸运购 -->
+    <block wx:if="{{item.ename=='luckyactivity'}}">
+          <luckyGo object="{{item.content}}"></luckyGo>
+        </block>
+        <block wx:if="{{item.ename=='luckyactivityNew'}}">
+          <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
+          <diy_public object="{{item.content}}" prom_type="9"></diy_public>
+        </block>
     </view>
   </block>
 </view>