From 15b7e3d94ce35ec612840ef294b9151c2279b13f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 9 Sep 2023 21:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BD=A3=EF=BC=9A=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                           |  5 ++--
 api/trade/brokerage.js            |  7 +++++
 components/login_mobile/index.vue |  7 -----
 pages/users/app_login/index.vue   |  2 +-
 pages/users/login/index.vue       | 50 +++++++++++++------------------
 5 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/App.vue b/App.vue
index dc6be859..5f6e0dab 100644
--- a/App.vue
+++ b/App.vue
@@ -81,7 +81,7 @@
 			let snsapiBase = 'snsapi_base';
 			let urlData = location.pathname + location.search;
 			if (!that.$store.getters.isLogin && Auth.isWeixin()) {
-				const { code, state, scope } = option.query;
+				const { code, } = option.query;
 				if (code && code != uni.getStorageSync('snsapiCode')
           && location.pathname.indexOf('/pages/users/wechat_login/index') === -1) {
 					// 存储静默授权code
@@ -89,8 +89,7 @@
 					let spread = that.globalData.spid ? that.globalData.spid : 0;
 					Auth.auth(code, that.$Cache.get('spread'))
 						.then(res => {
-							uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query
-								.back_url)));
+							uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query.back_url)));
 							if (res.type === 'register') {
 								this.$Cache.set('snsapiKey', res.key);
 							}
diff --git a/api/trade/brokerage.js b/api/trade/brokerage.js
index 27b33788..bd344a37 100644
--- a/api/trade/brokerage.js
+++ b/api/trade/brokerage.js
@@ -5,6 +5,13 @@ export function getBrokerageUser() {
   return request.get('app-api/trade/brokerage-user/get');
 }
 
+// 获得个人分销信息
+export function bindBrokerageUser(bindUserId) {
+  return request.put('app-api/trade/brokerage-user/bind', {
+    bindUserId
+  });
+}
+
 // 获得个人分销统计
 export function getBrokerageUserSummary() {
   return request.get('app-api/trade/brokerage-user/get-summary');
diff --git a/components/login_mobile/index.vue b/components/login_mobile/index.vue
index 94886b06..76f054cb 100644
--- a/components/login_mobile/index.vue
+++ b/components/login_mobile/index.vue
@@ -17,19 +17,13 @@
 <script>
 	const app = getApp();
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import Routine from '@/libs/routine';
 	import {mapGetters} from "vuex";
 	import {
-		loginMobile,
 		registerVerify,
 		getCodeApi,
 		getUserInfo,
 		phoneSilenceAuth,
-		phoneWxSilenceAuth
 	} from "@/api/user";
-	import {
-		bindingPhone
-	} from '@/api/api.js'
 	import {
 		getUserPhone,
 		iosBinding
@@ -173,7 +167,6 @@
 				phoneSilenceAuth({
 					code: code,
 					spid: app.globalData.spid,
-					spread: app.globalData.code,
 					phone: this.account,
 					captcha: this.codeNum
 				}).then(res => {
diff --git a/pages/users/app_login/index.vue b/pages/users/app_login/index.vue
index e769e640..0e3a486f 100644
--- a/pages/users/app_login/index.vue
+++ b/pages/users/app_login/index.vue
@@ -119,10 +119,10 @@
 			// #ifdef MP
 			phoneSilenceAuth(code) {
 				let self = this
+        // TODO @芋艿：貌似这里没做
 				phoneSilenceAuth({
 					code: code,
 					spid: app.globalData.spid,
-					spread: app.globalData.code,
 					phone: this.account,
 					captcha: this.codeNum
 				}).then(res => {
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index b9d4a8f2..dce551a0 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -57,12 +57,13 @@
 </template>
 <script>
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import { loginMobile, registerVerify, getUserInfo } from "@/api/user";
+	import { loginMobile, registerVerify } from "@/api/user";
 	import * as AuthApi from "@/api/member/auth";
 	import * as UserApi from "@/api/member/user";
 	import { appAuth, appleLogin } from "@/api/public";
 	const BACK_URL = "login_back_url";
-	export default {
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
+  export default {
 		name: "Login",
 		mixins: [sendVerifyCode],
 		data: function() {
@@ -299,14 +300,13 @@
         AuthApi.login({
           mobile: this.account,
           password: this.password,
-          spread: this.$Cache.get("spread") // TODO 芋艿：后续接入
         }).then(({ data }) => {
-          // debugger
           // TODO 芋艿：refreshToken 机制
           this.$store.commit("LOGIN", {
             'token': data.accessToken
           });
           this.getUserInfo(data);
+          this.bindBrokerUser();
         }).catch(e => {
           this.$util.Tips({
             title: e
@@ -315,32 +315,24 @@
 			},
 			getUserInfo(data) {
         this.$store.commit("SETUID", data.userId);
-        // TODO 芋艿：换成自己的先
-        if (true) {
-          UserApi.getUserInfo().then(res => {
-            this.$store.commit("UPDATE_USERINFO", res.data);
-            // 调回登录前页面
-            let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
-            if (backUrl.indexOf('/pages/users/login/index') !== -1) {
-              backUrl = '/pages/index/index';
-            }
-            uni.reLaunch({
-              url: backUrl
-            });
-          })
-        } else {
-          getUserInfo().then(res => {
-            this.$store.commit("UPDATE_USERINFO", res.data);
-            let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
-            if (backUrl.indexOf('/pages/users/login/index') !== -1) {
-              backUrl = '/pages/index/index';
-            }
-            uni.reLaunch({
-              url: backUrl
-            });
-          })
+        UserApi.getUserInfo().then(res => {
+          this.$store.commit("UPDATE_USERINFO", res.data);
+          // 调回登录前页面
+          let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
+          if (backUrl.indexOf('/pages/users/login/index') !== -1) {
+            backUrl = '/pages/index/index';
+          }
+          uni.reLaunch({
+            url: backUrl
+          });
+        })
+			},
+      bindBrokerUser() {
+        const spread = this.$Cache.get("spread");
+        if (spread > 0) {
+          BrokerageAPI.bindBrokerageUser(spread)
         }
-			}
+      }
 		}
 	};
 </script>