From 0908a7541b67549908f8f718fdcfafbf13849bc4 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Thu, 9 Dec 2021 09:59:37 +0800
Subject: [PATCH] 幸运购参团详情修改

---
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js | 57 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index 945de95..00d494a 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -1155,9 +1155,11 @@ Page({
       var luckyGoInfo;
       var user_id = getApp().globalData.user_id;
 
+
+			
       // 邀请链接待完善
 
-      await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
+      getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
         data: {
               store_id: o.stoid,
               is_end: 0,
@@ -1168,10 +1170,8 @@ Page({
           if(res.data.code == 0) {
     
               luckyGoInfo = res.data.data.pageData[0];
-              // if(th.data.param.from == 1) {
-              // 	team_id = luckyGoInfo.team_id;
-    // }
-    
+              
+							
     
     // else {
     //   team_id = luckyGoInfo.team_id;
@@ -1216,25 +1216,38 @@ Page({
           
       });
 
-
-			// wx.removeStorageSync('team_id');
-			// 幸运购成团信息
-			await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, {
-			  data: {
-				}
-			}).then(res => {
-
-				if(res.data.code == 0) {
-          
-					team_id = res.data.data.team_id;
-					
-					th.setData({
-						team_id,
-					});
+			if(th.data.param.from == 1) {
+			  team_id = th.data.param.team_id;
+			 } else {
+				
+				// 单独获取最新的team_id;
+				await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, {
+				  data: {
+					}
+				}).then(res => {
+				
+					if(res.data.code == 0) {
+				    
+						// if(th.data.param.from == 1) {
+						//   team_id = luckyGoInfo.team_id;
+						//  } else {
+						// 	team_id = res.data.data.team_id;
+						// };
+						
+						team_id = res.data.data.team_id;
+						
+						
+						th.setData({
+							team_id,
+						});
+						
+					};
 					
-				};
+				});
 				
-      });
+			};
+			// wx.removeStorageSync('team_id');
+			
       
 			
 			// 幸运购成团成员
--
libgit2 0.21.4