From 1a078c7ea1b7c12c8a5f0c4ca1ad88e753f715be Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 22 Aug 2023 15:21:03 +0800
Subject: [PATCH] 自定义组件

---
 components/diy_public/diy_public.js   | 43 +++++++++++++++++++++++++++++++++++++++----
 components/diy_public/diy_public.wxml | 50 +++++++++++++++++++++++++-------------------------
 components/diy_public/diy_public.wxss | 10 ++++++++++
 pages/index/index/index.wxml          |  4 ++++
 pages/template/index.json             |  1 +
 pages/template/index.wxml             |  9 +++++++++
 6 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
index 2eadc60..0a610d8 100644
--- a/components/diy_public/diy_public.js
+++ b/components/diy_public/diy_public.js
@@ -50,6 +50,7 @@ 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?',
@@ -98,7 +99,7 @@ Component({
         prom_text:'已团',
         nav1:'/pages/goods/goodsInfo/goodsInfo?',
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
-      })
+      }) 
     }
     if (this.data.prom_type==8) {  //预售
       this.setData({
@@ -107,6 +108,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 +174,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 +239,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 +269,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 +305,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 +332,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 +342,11 @@ 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].goods_name = all_array[i].title
           }
 
 
@@ -329,6 +359,8 @@ 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 (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) {
             empty.push(all_array[i])
           }
@@ -464,6 +496,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
diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml
index 5b6d0bf..bbadfc0 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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+            <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">
               <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> -->
@@ -43,7 +43,7 @@
                   </view>
                 </block>
               </view>
-              <view class="ellipsis-2n 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="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
               <view class="buy_box pricefs28" style="{{(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                 <view class="mgr10" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                 <view wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -57,7 +57,7 @@
                   <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                     <view class="clor" >
                       <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text>
-                      <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.shop_price || aitem.market_price}}</text>
+                      <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price || aitem.shop_price }}</text>
                     </view>
                   </view>
                 </view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+            <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">
               <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> -->
@@ -97,7 +97,7 @@
                   </view>
                 </block>
               </view>
-              <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (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="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
               <view class="buy_box fs24" style="{{'margin-bottom:10rpx;'+(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                 <view class="mgr10 lineh24" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                 <view class="lineh24" wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -112,7 +112,7 @@
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                     <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></view>
-                    <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.shop_price || aitem.market_price}}</view>
+                    <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price || aitem.shop_price }}</view>
                   </view>
                 </view>
                 <view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+            <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">
               <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> -->
@@ -151,7 +151,7 @@
                   </view>
                 </block>
               </view>
-              <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (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="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
               <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
                 <text  wx:if="{{object.seconds_num}}">{{prom_text}}<text class="clor">{{aitem.buy_num}}</text>件</text>
                 <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
@@ -160,7 +160,7 @@
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                     <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></view>
-                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.shop_price || aitem.market_price}}</view>
+                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price || aitem.shop_price }}</view>
                   </view>
                 </view>
                 <view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+            <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">
               <view style="width: 33%;" class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -198,7 +198,7 @@
                 </block>
               </view>
               <view style="{{'width: 67%;display: flex;flex-wrap: wrap;padding-left: 10rpx;' + (object.text_align==2 ? 'justify-content:center;' :'' )}}">
-                <view class="ellipsis-2 new_item1_goods_name" style="{{'font-size:28rpx;height:100rpx;'+(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="ellipsis-2 new_item1_goods_name" style="{{'font-size:28rpx;height:100rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
                 <!-- <view class="buy_box fs24" style="{{'margin-bottom:10rpx;' +(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                   <view class="mgr10" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                   <view wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -210,7 +210,7 @@
                 <view class="new_item1_price clor7b" 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: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
-                      <view class="clor" style="margin-right: 5rpx;" ><text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text><text style="color: #7b7b7b;margin-left: 5rpx;" wx:if="{{object.wholesale_price}}">￥{{aitem.shop_price || aitem.market_price}}</text></view>
+                      <view class="clor" style="margin-right: 5rpx;" ><text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text><text style="color: #7b7b7b;margin-left: 5rpx;" wx:if="{{object.wholesale_price}}">￥{{aitem.market_price || aitem.shop_price }}</text></view>
 
                     </view>
                   </view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+              <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">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -255,7 +255,7 @@
                     </view>
                   </block>
                 </view>
-                <view class="ellipsis-2n 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="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
                 <view class="buy_box pricefs28" style="{{(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                   <view class="mgr10" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                   <view wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -269,7 +269,7 @@
                     <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                       <view class="clor" >
                         <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text>
-                        <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.shop_price || aitem.market_price}}</text>
+                        <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price || aitem.shop_price }}</text>
                       </view>
                     </view>
                   </view>
@@ -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  ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+              <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">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -299,7 +299,7 @@
                     </view>
                   </block>
                 </view>
-                <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (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="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
                 <view class="buy_box fs24" style="{{'margin-bottom:10rpx;' +(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                   <view class="mgr10 lineh24" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                   <view class="lineh24" wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -312,7 +312,7 @@
                   <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                     <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                       <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></view>
-                      <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.shop_price || aitem.market_price}}</view>
+                      <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price || aitem.shop_price }}</view>
                     </view>
                   </view>
                   <view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+              <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">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -341,7 +341,7 @@
                     </view>
                   </block>
                 </view>
-                <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (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="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
                 <view class="buy_box fs24" style="{{'margin-bottom:10rpx;' +(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                   <view class="mgr10 lineh24" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                   <view class="lineh24" wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
@@ -354,7 +354,7 @@
                   <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                     <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                       <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></view>
-                      <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.shop_price || aitem.market_price}}</view>
+                      <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price || aitem.shop_price }}</view>
                     </view>
                   </view>
                   <view>
@@ -401,7 +401,7 @@
                 <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.shop_price || aitem.market_price}}</view>
+                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price || aitem.shop_price }}</view>
                   </view>
                 </view>
                 <view>
@@ -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 ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
+            <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">
               <view class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -440,7 +440,7 @@
                   </view>
                 </block>
               </view>
-              <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;'  + (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="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;'  + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}"><text class="lucky" wx:if="{{prom_type==9}}">{{aitem.group_num}}人团</text>{{aitem.goods_name}}</view>
               <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
                 <text wx:if="{{object.seconds_num}}">{{prom_text}}<text class="clor">{{aitem.buy_num}}</text>件</text>
                 <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
@@ -449,7 +449,7 @@
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
                     <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></view>
-                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.shop_price || aitem.market_price}}</view>
+                    <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price || aitem.shop_price }}</view>
                   </view>
                 </view>
                 <view>
diff --git a/components/diy_public/diy_public.wxss b/components/diy_public/diy_public.wxss
index abdb465..f0c1894 100644
--- a/components/diy_public/diy_public.wxss
+++ b/components/diy_public/diy_public.wxss
@@ -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
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 15aa246..a232463 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -530,6 +530,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'}}">
diff --git a/pages/template/index.json b/pages/template/index.json
index 42bc7a2..10882a3 100644
--- a/pages/template/index.json
+++ b/pages/template/index.json
@@ -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",
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 4071247..8d2a906 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -79,6 +79,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>
--
libgit2 0.21.4