From b0255891052d7e29ef30d1258dc497ee87cf2988 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Mon, 31 Jul 2023 16:12:51 +0800
Subject: [PATCH] 团购

---
 components/diy_public/diy_public.js | 29 ++++++++++++++++++++++++++++-
 pages/template/index.wxml           |  4 +++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js
index ce4cdce..efa995f 100644
--- a/components/diy_public/diy_public.js
+++ b/components/diy_public/diy_public.js
@@ -84,13 +84,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 +147,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 +186,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 +412,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
       });
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 5ac9144..5b163fa 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -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>
--
libgit2 0.21.4