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() {