From c5b618e5ae048089a65b4d1b3401d6fd942a1938 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 4 Jul 2022 17:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9Fid=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                     |  4 +++-
 config/request.js           |  4 +++-
 order/orders/orders.vue     |  8 +++++++-
 pages/clients/clients.vue   |  8 +++++++-
 pages/index/index.vue       | 22 +++++++++++++++++-----
 pages/products/products.vue |  2 +-
 pages/teams/teams.vue       |  8 +++++++-
 7 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index 71b9db2..5ef6037 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,9 @@
 <script>
 	export default {
 		onLaunch: function() {
-			
+			uni.setEnableDebug({
+			    enableDebug: true
+			})
 		},
 		onShow: function() {
 			console.log('App Launch');
diff --git a/config/request.js b/config/request.js
index 25bb4a5..923a5ae 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,9 @@
  */
 
 export default {
-  baseURL: 'https://huorantech.cn/',
+  // baseURL: 'https://huorantech.cn/',
+  // baseURL: 'http://192.168.31.137:9000/',
+  baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 81385e8..85dc1bf 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -182,7 +182,11 @@
 					orderStatus: this.orderStatus,
 					type: this.curTab
 				}
+				uni.showLoading({
+					title: '加载中'
+				})
 				list(data).then(({ data }) => {
+					uni.hideLoading()
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = data.records
 					list.map(e => {
@@ -193,7 +197,9 @@
 					const noMore = this.list.length === data.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-				}).catch(e => {})
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			initList() {
 				this.page = 1
diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue
index 4c6e853..1853502 100644
--- a/pages/clients/clients.vue
+++ b/pages/clients/clients.vue
@@ -149,14 +149,20 @@
 					pageSize: this.pageSize,
 					type: this.curTab // 团队:1 / 个人:0
 				}
+				uni.showLoading({
+					title: '加载中'
+				})
 				all(data).then(({ data }) => {
+					uni.hideLoading()
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
 					this.page++ // 每次获取了数据后page+1
 					const noMore = this.list.length === data.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-				}).catch(e => {})
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			initList() {
 				this.page = 1
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 280097f..35530cd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -110,7 +110,8 @@
 		data() {
 			return {
 				per: true, // 是否有权限
-				teamId: uni.getStorageSync('team').teamId || '',
+				// teamId: uni.getStorageSync('team').teamId || '',
+				teamId: '',
 				list: [],
 				id: '',
 				teamList: []
@@ -133,6 +134,7 @@
 					teamId: this.teamId,
 					platformId: 4
 				}).then(({ permissionMenu }) => {
+					uni.hideLoading()
 					const auth = []
 					const generateAuth = (list, parent) => {
 						list.map(e => {
@@ -146,28 +148,36 @@
 					this.$forceUpdate()
 					this.initRole()
 				}).catch(e => {
+					uni.hideLoading()
 					uni.setStorageSync('auth', [])
 					this.initRole()
 				})
 			},
 			// 获取团队
 			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				getTeamsByAccountId().then(({ data }) => {
 					data.map(e => {
 						const n = e.partnerClassificationList
 						e.id = n.id
-						e.teamId = e.partnerClassificationId
+						e.teamId = n.isTeam == 1 ? e.partnerClassificationId : n.id
 						e.partnerClassificationName = n.partnerClassificationName
 						delete e.partnerClassificationList
 					})
 					if (data.length) {
-						// 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
-						if (!this.teamId) {
+						/**
+						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
+						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
+						 */
+						if (!this.teamId || !data.find(e => e.teamId == this.teamId)) {
 							this.teamId = data[0].teamId
 							uni.setStorageSync('team', data[0])
 						}
 					} else {
 						// 如果没有团队，则退出登录
+						uni.hideLoading()
 						uni.clearStorageSync()
 						uni.navigateTo({
 							url: '../login/login'
@@ -176,7 +186,9 @@
 					
 					this.list = data
 					this.getAuth()
-				}).catch(e => {})
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			// 团队选择回调
 			teamChange() {
diff --git a/pages/products/products.vue b/pages/products/products.vue
index f859590..a5676df 100644
--- a/pages/products/products.vue
+++ b/pages/products/products.vue
@@ -12,7 +12,7 @@
 		<ul class="list">
 			<li v-for="item in list">
 				<view class="pro-name">
-					<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
+				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
 					{{ item.productName }}
 				</view>
 				<view class="info">
diff --git a/pages/teams/teams.vue b/pages/teams/teams.vue
index 1bb68c4..59f0f3d 100644
--- a/pages/teams/teams.vue
+++ b/pages/teams/teams.vue
@@ -84,6 +84,9 @@
 			},
 			// 获取列表
 			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				teamList({
 					type: 1,
 					pageNum: this.page,
@@ -91,6 +94,7 @@
 					keyWord: this.keyword,
 					partnerClassificationId: uni.getStorageSync('team').teamId
 				}).then(({ pageList }) => {
+					uni.hideLoading()
 					const { records } = pageList 
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					this.list = this.reachBottom > 0 ? [...this.list, ...records] : records
@@ -98,7 +102,9 @@
 					const noMore = this.list.length === pageList.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-				}).catch(e => {})
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			initList() {
 				this.page = 1