From db20f6e08e9a5746e239ec12625799bbbc35c50c Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 10 Apr 2021 17:26:17 +0800
Subject: [PATCH] 分享成为下线的判读，分享人一定要是分销商、 首页分享的bug修复

---
 pages/cart/cart2/cart2.js           | 24 ++++++++++++++++++++----
 pages/cart/cart2_inte/cart2_inte.js | 12 ++++++++++--
 pages/cart/cart2_pt/cart2_pt.js     | 12 ++++++++++--
 pages/index/index/index.js          |  6 ++++--
 pages/togoin/togoin.js              | 15 ++++++++++++---
 5 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 05a0883..fbedc65 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1798,8 +1798,16 @@ Page({
       }
 	  
 	  //老会员成为分销下线需要的参数
-	  if(getApp().globalData.first_leader){
-		  item.first_leader=parseInt(getApp().globalData.first_leader);
+	  if(getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader){	  	 
+		  		 //判断一下分享人是不是分享商
+		  		 await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{
+		  			 if(res.data.code==0){
+		  				  var user= res.data.data;
+		  				  if(user.is_distribut==1){
+		  					  	item.first_leader=parseInt(getApp().globalData.first_leader);
+		  				  }
+		  			 }
+		  		 })			  	  	
 	  }
 	  
       var goods={
@@ -2002,8 +2010,16 @@ Page({
                item.order_prom_list=order_prom_list;
 		 
 	      //老会员成为分销下线需要的参数
-	      if(getApp().globalData.first_leader){
-	    	 item.first_leader=parseInt(getApp().globalData.first_leader);
+	      if(getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader){
+			//判断一下分享人是不是分享商
+			await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{
+				 if(res.data.code==0){
+					  var user= res.data.data;
+					  if(user.is_distribut==1){
+							item.first_leader=parseInt(getApp().globalData.first_leader);
+					  }
+				 }
+			})		
 	      }		 	
 			   
 
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index 3708bec..a84df74 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -623,8 +623,16 @@ Page({
       }
 	  
 	  //老会员成为分销下线需要的参数
-	  if(getApp().globalData.first_leader){
-	  	 item.first_leader=parseInt(getApp().globalData.first_leader);
+	  if(getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader){
+	  	//判断一下分享人是不是分享商
+	  	await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{
+			 if(res.data.code==0){
+				  var user= res.data.data;
+				  if(user.is_distribut==1){
+						item.first_leader=parseInt(getApp().globalData.first_leader);
+				  }
+			 }
+	  	})		
 	  }
 	  
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index efb5da2..533dac2 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -525,8 +525,16 @@ Page({
            item.is_zsorder=th.data.kt_type+1;         //开团类型
        }
 	   //老会员成为分销下线需要的参数
-	   if(getApp().globalData.first_leader){
-	   	   item.first_leader= parseInt(getApp().globalData.first_leader);
+	   if(getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader){
+	   	   //判断一下分享人是不是分享商
+	   	   await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{
+				 if(res.data.code==0){
+					  var user= res.data.data;
+					  if(user.is_distribut==1){
+							item.first_leader=parseInt(getApp().globalData.first_leader);
+					  }
+				 }
+	   	   })		
 	   }
 	   
        if(th.data.qh!='')
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 4488c7d..1e400bb 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -584,8 +584,10 @@ Page({
   },
   onShareAppMessage: function(e) {  
 	var url="/pages/index/index/index";
-	if(getApp().globalData.user_id){
-	  url+="&first_leader="+getApp().globalData.user_id;
+	var userInfo=getApp().globalData.userInfo;
+	//是分销商才带
+	if(userInfo && userInfo['is_distribut']==1){
+	  url+="?first_leader="+userInfo.user_id;
 	}  		
 	console.log("---首页---分享--");
 	console.log(url);  	
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index bcd7d5c..2f0f65b 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -1,6 +1,7 @@
 var t = require("../../utils/common.js"); 
-var app=getApp();
+const app=getApp();
 var os = app.globalData.setting;
+var regeneratorRuntime = require('../../utils/runtime.js');
 
 Page({
   data: {
@@ -119,7 +120,7 @@ Page({
 	  this.setData({show_bind:1})
   },
   
-  save_the_data:function (r,e,sessionKey,openid) {
+  save_the_data: async function (r,e,sessionKey,openid) {
     var app=getApp(),a=app,th=this;
     var dd = {
       oauth: "miniapp",
@@ -135,7 +136,15 @@ Page({
     };
   	 //--如果有邀请人的时候--
   	 if(th.data.first_leader){
-  	 	dd.first_leader=th.data.first_leader;
+		 //判断一下分享人是不是分享商
+		 await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+th.data.first_leader,{}).then(res=>{
+			 if(res.data.code==0){
+				  var user= res.data.data;
+				  if(user.is_distribut==1){
+					  	dd.first_leader=th.data.first_leader;
+				  }
+			 }
+		 })		 
   	 }	 
 	 //-- 导购会员ID --
 	 if(getApp().globalData.guide_id){
--
libgit2 0.21.4