From 9cf341a11cd97ac13cf586d547d5c12dacf40738 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 29 Jun 2022 21:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=9B=A2=E9=98=9F=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                |  4 ++--
 pages/area-proxy/my-team.vue        |  3 ++-
 pages/order-manage/order-manage.vue | 10 ++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index e3a6698..ef4f81e 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,8 +13,8 @@ export default {
 				})
 				let userInfo = _this.getCurUserInfo();
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
 				// args.url = 'http://192.168.2.42:80' + args.url;
 				
 				if (!args.data) {
diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue
index e3afb0c..393d41f 100644
--- a/pages/area-proxy/my-team.vue
+++ b/pages/area-proxy/my-team.vue
@@ -133,7 +133,8 @@
 			},
 			async loadTeamPage(params = {}) {
 				params.pageNum = this.pageNum;
-				params.pageSize = this.pageSize;
+				params.pageSize = this.pageSize;
+				params.leaderId = this.curUserInfo.workerId;
 				this.$refs.loadStatusBar.showLoading();
 				try {
 					let res = await this.$request.getTeamPage(params);
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index b2da260..366ad8d 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -337,6 +337,8 @@
 		},
 		methods: {
 			async loadData() {
+				// 获取当前登录用户信息
+				this.curUserInfo = this.$request.getCurUserInfo();
 				// let myTeamInfo = await this.$api.data('myTeamInfo');
 				// this.myTeamMembers = myTeamInfo.members;
 				this.myOrders = await this.$api.data('myOrders');
@@ -358,9 +360,7 @@
 				this.loadCategoryList();
 				this.loadRegionList();
 				// 初始化指派成员
-				this.loadTeamMembers();
-				// 获取当前登录用户信息
-				this.curUserInfo = this.getCurUserInfo();
+				this.loadTeamMembers();
 			},
 			reloadMasterOrderPage(params = {}) {
 				// this.pageParams = [];
@@ -452,7 +452,9 @@
 				this.areaList.push(subSubRegionList);
 			},
 			async loadTeamMembers() {
-				let res = await this.$request.getTeamPage();
+				let res = await this.$request.getTeamPage({
+					leaderId: this.curUserInfo.workerId
+				});
 				this.myTeamMembers = res.rows;
 			},
 			bindEvent() {