Merge branch 'dev_group_luo' into dev

WXD-SEASON\season
2 parents 4da76168 c35b5219
Showing 6 changed files with 62 additions and 17 deletions
components/diy_public/diy_public.js
components/diy_public/diy_public.wxml
components/diy_public/diy_public.wxss
pages/index/index/index.json
pages/index/index/index.wxml
pages/template/index.wxml
@@ -3,7 +3,7 @@
 //         default: e
 //       };
 //     }(require("../../utils/LoadMore3.js")),
-//     n = new e.default(),
+//     n = new e.default(), 
 var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
@@ -47,6 +47,7 @@ Component({
     kttypeArr:['','商家','会员','阶梯'],
     imgobj:{
       '1':"/miniapp/images/component/seckill.png",
+      '2':"/miniapp/images/component/pingd/pingd.png",
       '6':"/miniapp/images/component/pingd/pingd.png"
     },
     nav1:'/packageA/pages/goodsInfo/goodsInfo?',
@@ -84,13 +85,20 @@ Component({
   },
   ready: function () {
-    if (this.data.prom_type==6) {
+    if (this.data.prom_type==6) {   //天天拼单
       this.setData({
         prom_text:'已团',
         nav1:'/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?',
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
       })
     }
+    if (this.data.prom_type==2) {  //团购
+      this.setData({
+        prom_text:'已团',
+        nav1:'/pages/goods/goodsInfo/goodsInfo?',
+        nav2:'/pages/goods/goodsInfo/goodsInfo?'
+      })
+    }
     var g_id = this.data.object;
     this.init(g_id);
@@ -140,6 +148,12 @@ Component({
             +os.stoid+"&goodsidlist="+goodsidlist;
           }
+          if (th.data.prom_type==2) { //团购
+            gUrl="/api/weshop/goods/groupBuy/getGoodsList?store_id="
+            +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id;
+          }
+
+
           app.request.promiseGet(gUrl, {}).then(res => {
@@ -173,6 +187,16 @@ Component({
           user_id:user_id,
         }
       }
+      if (this.data.prom_type==2) { //团购
+        gUrl="/api/weshop/goods/groupBuy/page?page=1&pageSize=9"
+        req={
+          store_id:os.stoid,
+          is_end: 0,
+          is_show: 1,	  
+          user_id:user_id,
+          timetype: 2,
+        }
+      }
       getApp().request.promiseGet(gUrl,
         { isShowLoading: 1, data:req  }
@@ -389,6 +413,10 @@ Component({
       if (this.data.prom_type==6) { //天天拼单
         url="/pages/activity/pind_list/pind_list"
       }
+      if (this.data.prom_type==2) { //团购
+        url="/packageC/pages/group_list/group_list";
+      }
+
       wx.navigateTo({
         url
       });
@@ -51,7 +51,7 @@
               <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view class="clor7b">
-                    <text wx:if="{{object.seconds_num}}">{{prom_text}}<text class="clor">{{aitem.buy_num}}</text>件</text>
+                    <text class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                     <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.status==2 ? '0' : aitem.residue}}</text>件</text>
                   </view>
                   <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
@@ -97,15 +97,17 @@
                   </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; '+ (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="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>
               </view>
+        
               <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(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 class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                 <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
               </view>
+
               <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
                 <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                   <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
@@ -151,7 +153,7 @@
               </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 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.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>
               </view>
               <view class="new_item1_price clor7b" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
@@ -202,7 +204,7 @@
                   <view wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
                 </view> -->
                 <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'font-size:24rpx;'+(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 class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                   <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text>
                 </view>
                 <view class="new_item1_price clor7b" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
@@ -261,7 +263,7 @@
                 <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
                   <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
                     <view class="clor7b">
-                      <text wx:if="{{object.seconds_num}}">{{prom_text}}<text class="clor">{{aitem.buy_num}}</text>件</text>
+                      <text class="{{prom_type==2 ? 'group':'' }}"  wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                       <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.status==2 ? '0' : aitem.residue}}</text>件</text>
                     </view>
                     <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
@@ -297,13 +299,13 @@
                     </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; '+ (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="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>
                 </view>
                 <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(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 class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                   <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
                 </view>
                 <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
@@ -339,13 +341,13 @@
                     </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; '+ (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="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>
                 </view>
                 <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(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 class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                   <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
                 </view>
                 <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
@@ -438,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}}">{{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>
@@ -545,4 +545,14 @@ swiper {
   }
   .lineh24{
     line-height: 24rpx !important;
+  }
+  .group{
+    padding: 10rpx;
+    background-color:#f23030;
+    color: #fff;
+    /* margin-top: 10rpx; */
+    line-height: 28rpx;
+    border-radius: 10rpx;
+    margin-right: 10rpx;
+    opacity: .8;
   }
 \ No newline at end of file
@@ -9,7 +9,7 @@
         "searchbox":"/components/diy_searchbox/diy_searchbox",
         "shopname": "/components/diy_shopname/diy_shopname",
         "pingd_buy": "/components/diy_pingd_buy/diy_pingd_buy",
-        "div_public": "/components/diy_public/diy_public",
+        "diy_public": "/components/diy_public/diy_public",
         "title": "/components/diy_title/diy_title",
         "notice": "/components/diy_notice/diy_notice",
         "voice": "/components/diy_voice/diy_voice",
@@ -481,7 +481,7 @@
           <pingd_buy object="{{item.content}}"></pingd_buy>
         </block>
         <block wx:if="{{item.ename=='pingd_buyNew'}}">
-          <div_public object="{{item.content}}" prom_type="6"></div_public>
+          <diy_public object="{{item.content}}" prom_type="6"></diy_public>
         </block>
         <!--秒杀-->
         <block wx:if="{{item.ename=='seckill' || item.ename=='seckillNew'}}">
@@ -520,6 +520,9 @@
         <block wx:if="{{item.ename=='groupbuy'}}">
           <groupbuy object="{{item.content}}"></groupbuy>
         </block>
+        <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>
@@ -52,7 +52,7 @@
       <block wx:if="{{item.ename=='white'}}">
         <assist object="{{item.content}}"></assist>
       </block>
-      <!--图片组合-->
+      <!--图片组合--> 
       <block wx:if="{{item.ename=='picMix'}}">
         <picMax object="{{item.content}}"></picMax>
       </block>
@@ -73,7 +73,9 @@
 	  <block wx:if="{{item.ename=='groupbuy'}}">
 	       <groupbuy object="{{item.content}}"></groupbuy>
 	  </block>
-
+    <block wx:if="{{item.ename=='groupbuyNew'}}">
+        <diy_public object="{{item.content}}" prom_type="2"></diy_public>
+      </block>
     </view>
   </block>
 </view>