From 6f4e743eab94da4cca87ab050a166729b4822da6 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Thu, 7 Sep 2023 18:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E7=9A=84=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E5=88=87=E6=8D=A2=E3=80=81=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/updateTabBar.js                           |  8 ++++----
 pages/home/home.vue                                 |  5 ++++-
 pages/list/team.vue                                 |  2 ++
 pages/ucenter/invite/invite.vue                     | 10 +++++++++-
 pages/ucenter/ucenter.vue                           | 13 +++++++------
 .../uni-id-pages/pages/login/login-withpwd.vue      |  8 ++++----
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/common/js/updateTabBar.js b/common/js/updateTabBar.js
index a78ed51..2cb17fe 100644
--- a/common/js/updateTabBar.js
+++ b/common/js/updateTabBar.js
@@ -18,10 +18,6 @@ export default {
 		})
 	},
 	changeAgent(){
-		uni.setTabBarItem({
-			index:1,
-			visible: true
-		})
 		uni.setTabBarItem({
 			index:0,
 			visible: false
@@ -34,6 +30,10 @@ export default {
 			index:3,
 			visible: false
 		})
+		uni.setTabBarItem({
+			index:1,
+			visible: true
+		})
 	},
 	changebackground(){
 		uni.setTabBarItem({
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 838ee76..9f8cd99 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -103,7 +103,7 @@
 <script>
 	import * as echarts from 'echarts';
 	import API from '@/common/js/api.js'
-	// import updateTabBar from '@/common/js/updateTabBar.js'
+	import updateTabBar from '@/common/js/updateTabBar.js'
 	export default {
 		data() {
 			return {
@@ -161,6 +161,9 @@
 		onShow() {
 			if(this.userType=='user'){
 				this.getAwardRecords();
+				updateTabBar.changeUser();
+			}else if(this.userType=='background'){
+				updateTabBar.changebackground();
 			}
 			
 		},
diff --git a/pages/list/team.vue b/pages/list/team.vue
index f73666e..189ae1c 100644
--- a/pages/list/team.vue
+++ b/pages/list/team.vue
@@ -50,6 +50,7 @@
 </template>
 
 <script>
+	import updateTabBar from '@/common/js/updateTabBar.js'
 	import API from '@/common/js/api.js'
 	export default {
 		data(){
@@ -132,6 +133,7 @@
 		},
 		onLoad() {
 			this.getDataList();
+			updateTabBar.changeAgent();
 		},
 		onReachBottom() {
 			if(!this.noMore){
diff --git a/pages/ucenter/invite/invite.vue b/pages/ucenter/invite/invite.vue
index 1dbdf9f..5684586 100644
--- a/pages/ucenter/invite/invite.vue
+++ b/pages/ucenter/invite/invite.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="invitePage">
-			<view class="invite_code">999987</view>
+			<view class="invite_code">{{Invite_code}}</view>
 		</view>
 		<view class="about" v-if="0">
 			<view class="box">
@@ -25,6 +25,7 @@
 	</view>
 </template>
 <script>
+	import API from '@/common/js/api.js'
 	export default {
 		computed: {
 			uniStarterConfig() {
@@ -35,6 +36,7 @@
 			return {
 				about: {},
 				code: "",
+				Invite_code: '',
 				isIos: "",
 				showMask: false,
 				downloadUrl: {
@@ -44,6 +46,7 @@
 			};
 		},
 		created() {
+			this.getDatas();
 			this.about = this.uniStarterConfig.about
 			this.downloadUrl = this.uniStarterConfig.download
 			this.year = (new Date).getFullYear()
@@ -63,6 +66,11 @@
 			document.getElementsByTagName("body")[0].style = ""
 		},
 		methods: {
+			getDatas(){
+				API.request('/agentTeam/getAgentInviteCode', {}, res=>{
+					this.Invite_code = res.data.code;
+				})
+			},
 			download() {
 				if (this.code) {
 					uni.setClipboardData({
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 941da16..50f0293 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -5,7 +5,7 @@
 		</view>
 		<!-- <uni-sign-in ref="signIn"></uni-sign-in> -->
 		<view class="userInfo">
-			<cloud-image width="120rpx" height="120rpx" v-if="hasLogin&&userInfo.avatar" :src="userInfo.avatar"></cloud-image>
+			<cloud-image width="120rpx" height="120rpx" style="margin-right: 8px;border-radius: 50%;overflow: hidden;" v-if="hasLogin&&userInfo.avatar" :src="userInfo.avatar"></cloud-image>
 			
 			<view v-else class="defaultAvatarUrl"></view>
 			
@@ -310,7 +310,8 @@
 						"radius": "100%" // 边框圆角，支持百分比
 					}
 				},
-				showRecharge: true
+				showRecharge: true,
+				userInfo: {},
 			}
 		},
 		onLoad() {
@@ -341,9 +342,9 @@
 			// }
 		},
 		computed: {
-			userInfo() {
-				return store.userInfo
-			},
+			// userInfo() {
+			// 	return store.userInfo
+			// },
 			hasLogin(){
 				return uni.getStorageSync('user_token');
 				// return store.hasLogin
@@ -563,7 +564,7 @@
 			},
 			getUserInfo(){
 				API.request('/user/userInfo', {}, res=>{
-					this.userInfo = res.data.userInfo;
+					this.userInfo = res.data.data;
 				})
 			},
 			getAdminUserInfo(){
diff --git a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
index 4a77ad6..f5d97b7 100644
--- a/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withpwd.vue
@@ -157,7 +157,6 @@
 				// }
 				
 				if(this.userType=='user'){
-					updateTabBar.changeUser();
 					API.login(data, res=>{
 						console.log(res);
 						// this.loginSuccess()
@@ -170,6 +169,7 @@
 						accounts.push(this.username);
 						uni.setStorageSync('accounts', accounts);
 						uni.setStorageSync('userType', 'user');
+						// updateTabBar.changeUser();
 						setTimeout(()=>{
 							uni.switchTab({
 								url:'/pages/home/home'
@@ -179,7 +179,6 @@
 				}
 				
 				if(this.userType=='agent'){
-					updateTabBar.changeAgent();
 					API.request('/passport/agentLogin', {
 						phone: this.username,
 						password: this.password
@@ -190,16 +189,16 @@
 						})
 						uni.setStorageSync('user_token', res.data.token);
 						uni.setStorageSync('userType', 'agent');
+						// updateTabBar.changeAgent();
 						setTimeout(()=>{
 							uni.switchTab({
-								url:'/pages/home/home'
+								url:'/pages/list/team'
 							})
 						}, 1500)
 					}, fail=>{}, false)
 				}
 				
 				if(this.userType=='background'){
-					updateTabBar.changebackground();
 					API.request('/passport/adminLogin', {
 						account_number: this.username,
 						password: this.password
@@ -210,6 +209,7 @@
 						})
 						uni.setStorageSync('user_token', res.data.token);
 						uni.setStorageSync('userType', 'background');
+						// updateTabBar.changebackground();
 						setTimeout(()=>{
 							uni.switchTab({
 								url:'/pages/home/home'