From 568db438a734ed3828d71af8cd7a7fd27f42b9e6 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 11 May 2021 09:38:25 +0800
Subject: [PATCH] 完善信息和跳转

---
 packageA/pages/profile/profile.js |  9 ++++-----
 pages/togoin/togoin.js            | 59 +++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index dbf9d12..f1e2fca 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -531,10 +531,6 @@ Page({
 		if(!user) return false;
 		
 		//-- 赋予默认值 --
-		if(user['idcard']) this.data.id=user['idcard'];
-		if(user['vipname']) this.data.name=user['vipname'];
-		if(user['address']) this.data.address=user['address'];
-			
 		app.request.get(url1, {
 		  success: function(res) {
 				console.log('x-->', res.data.code, res.data.data.reg_type, res.data.data.reg_info);
@@ -567,7 +563,10 @@ Page({
 				if(res.data.code == 0) {
 					console.log('url3', res.data.data.birthday);
 					let data = res.data.data;
-				
+                    if(data['idcard']) self.data.id=data['idcard'];
+                    if(data['vipname']) self.data.name=data['vipname'];
+                    if(data['address']) self.data.address=data['address'];
+
 					if(data.birthday){
 						data.birthday= ut.formar_no_full(data.birthday);						
 					}
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 89be71a..2fd2442 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -183,28 +183,51 @@ Page({
         } else {
           return app.showWarning("授权登入失败！"+e.data.msg);
         }
-		
-		
+
 		var need_go=0; 
-		var t_user=e.data.data;
-        
+		var tuser=e.data.data;
 		wx.setStorageSync("userinfo",e.data.data);
         wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
+        //获取一下线下的真实资料
+		let url3 = '/api/weshop/users/getERPUser/';
+		url3 += os.stoid + "/" +tuser.user_id;
+		getApp().promiseGet(url3,{}).then(res=>{
+
+			if(res.data.code == 0) {
+				let t_user = res.data.data;
+				//如果有需要完善的信息没有完善，就需要跳转
+				if (!t_user['vipname'] && th.data.name_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['birthday'] && th.data.birth_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['idcard'] && th.data.idcard_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['address'] && th.data.address_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['pickup_id'] && th.data.pick_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['sex'] && th.data.sex_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['fromuser_id'] && th.data.introducer_need_go) {
+					need_go = 1;
+				}
+
+				if (need_go) {
+					getApp().goto("/packageA/pages/profile/profile");
+				} else {
+					wx.navigateBack({delta: 1})
+				}
+			}
+		})
+
 		
-		//如果有需要完善的信息没有完善，就需要跳转
-		if(!t_user['vipname'] && th.data.name_need_go){ need_go=1;}
-		if(!t_user['birthday'] && th.data.birth_need_go){ need_go=1;}
-		if(!t_user['idcard'] && th.data.idcard_need_go){ need_go=1;}
-		if(!t_user['address'] && th.data.address_need_go){ need_go=1;}
-		if(!t_user['pickup_id'] && th.data.pick_need_go){ need_go=1;}
-		if(!t_user['sex'] && th.data.sex_need_go){ need_go=1;}
-		if(!t_user['fromuser_id'] && th.data.introducer_need_go){ need_go=1;}
-		
-		if(need_go){
-			getApp().goto("/packageA/pages/profile/profile");
-		}else{
-			wx.navigateBack({ delta: 1})
-		}
+
       
       },
       failStatus: function (t) {      
--
libgit2 0.21.4