From 564c5e00f9538c4cc15f3e46f4004dd5d858f214 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Sat, 8 Jan 2022 11:27:31 +0800
Subject: [PATCH] 拼单分享

---
 pages/goods/goodsInfo/goodsInfo.js      |  2 +-
 pages/team/team_show/team_show.js       | 27 ++++++++++++++++++++++++++-
 pages/team/team_success/team_success.js | 36 ++----------------------------------
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index c6b12d9..101635a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3439,7 +3439,7 @@ Page({
                 return false
               }
 
-              await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{
+              await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2",{
                 data:{
                   store_id: os.stoid,
                   is_end: 0,
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 4e3f654..110ef29 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -433,11 +433,36 @@ Page({
     //获取活动表的信息根据活动team_id
     await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + teamgroup.team_id, {
       data: {}
-    }).then(res => {
+    }).then(async res => {
+      var flag=null;
       if (res.data.code == 0) {
         teamlist = res.data.data;
         goods_id = res.data.data.goods_id;
 
+        await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{
+          data:{
+            store_id: os.stoid,
+            is_end: 0,
+            is_show: 1,
+            user_id: getApp().globalData.user_id,
+            pageSize:1000
+          }
+        }).then(res=>{
+          let pd_list=res.data.data.pageData;
+          if(res.data.code==0 && pd_list.length>0){
+            flag =pd_list.some(pd=>{
+                return pd.goods_id==teamlist['goods_id']
+            })
+          }
+        })
+        if(!flag){
+          wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000});
+            // setTimeout(function () {
+                ut.wx_back();
+            // }, 2000)
+            return false;
+        }
+
         //----------查看阶梯团------------
         if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined) {
           var ct_rylist = JSON.parse(teamlist.ct_rylist);
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index a14f4ae..39da0c5 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -182,40 +182,8 @@ Page({
     //获取活动表的信息根据活动pt_prom_id
     await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, {
       data: { }
-    }).then(async res => {
-      var flag=null;
-      if (res.data.code==0){
-         teamlist = res.data.data;
-        this.setData({teamlist: teamlist});
-         //获取当前时间,并且判断剩余时间
-         var nt = ut.gettimestamp();
-         teamlist.status = 0;
-
-         await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{
-          data:{
-            store_id: os.stoid,
-            is_end: 0,
-            is_show: 1,
-            user_id: getApp().globalData.user_id,
-            pageSize:1000
-          }
-        }).then(res=>{
-          let pd_list=res.data.data.pageData;
-          if(res.data.code==0 && pd_list.length>0){
-            flag =pd_list.some(pd=>{
-                return pd.goods_id==teamlist['goods_id']
-            })
-          }
-        })
-        if(!flag){
-          wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000});
-            setTimeout(function () {
-                ut.wx_back();
-            }, 2000)
-            return false;
-        }
+    }).then(res => {
          if (nt >= teamlist.start_time) teamlist.status = 1;
-
           goods_id = res.data.data.goods_id;
           id = res.data.data.id;
           share_img = ee.data.imageurl + res.data.data.share_imgurl;
@@ -856,7 +824,7 @@ Page({
         if(th.data.teamlist.share_title){
             share_title=th.data.teamlist.share_title;
         }
-
+        console.log(url,3000);
         return {
             path:url,
             title: share_title,
--
libgit2 0.21.4