diff --git a/common/js/request.js b/common/js/request.js
index f2e1c7c..5d0e1c8 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -3,21 +3,28 @@ import globalData from '@/common/js/globalData.js';
export default {
address: 'https://www.opsoul.com',
// 异步接口拦截
- addInterceptor() {
+ addInterceptor() {
+ let _this = this;
uni.addInterceptor('request', {
- invoke(args) {
+ invoke(args) {
+ let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
- args.url = 'https://www.opsoul.com' + args.url;
+ // args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
- // args.url = 'http://10.45.111.215:80' + args.url;
- if (args.data) {
- args.data.deptId = globalData.deptId;
- args.data.from = globalData.from;
+ args.url = 'http://10.45.137.214:80' + args.url;
+ if (!args.data) {
+ args.data = {}
}
- if (args.header) {
- args.header.deptId = globalData.deptId;
- args.header.from = globalData.from;
- }
+ args.data.deptId = globalData.deptId;
+ args.data.from = globalData.from;
+ if (!args.data.workerId) {
+ args.data.workerId = userInfo.workerId;
+ }
+ if (!args.header) {
+ args.header = {}
+ }
+ args.header.deptId = globalData.deptId;
+ args.header.from = globalData.from;
// console.log("停止触发");
// return false;
},
@@ -280,5 +287,29 @@ export default {
data: params
})
return res[1].data;
+ },
+ async addTeam(params = {}) {
+ let res = await uni.request({
+ url: '/worker/team/addTeam',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
+ async getTeamPage(params = {}) {
+ let res = await uni.request({
+ url: '/worker/team/getTeamList',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
+ },
+ async updateWorker(params = {}) {
+ let res = await uni.request({
+ url: '/worker/update',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
}
}
diff --git a/components/custom-bar/load-status-bar.vue b/components/custom-bar/load-status-bar.vue
new file mode 100644
index 0000000..bbcc14e
--- /dev/null
+++ b/components/custom-bar/load-status-bar.vue
@@ -0,0 +1,44 @@
+
+
+
+
+ 查看更多
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/area-proxy/modal/invite-master.vue b/pages/area-proxy/modal/invite-master.vue
new file mode 100644
index 0000000..5f2ccdf
--- /dev/null
+++ b/pages/area-proxy/modal/invite-master.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+ 邀请
+
+
+
+
+
+
+ 团队成员师傅ID:
+
+
+
+ 成员师傅备注:
+
+
+
+
+ 取消
+ 邀请
+
+
+
+
+
+
+
+
diff --git a/pages/area-proxy/modal/set-take-rate.vue b/pages/area-proxy/modal/set-take-rate.vue
new file mode 100644
index 0000000..5f11ef6
--- /dev/null
+++ b/pages/area-proxy/modal/set-take-rate.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+ 设置扣点
+
+
+
+
+
+ 设置区域代理扣点可按百分比扣取或金额扣取的方式(建议二选一进行申请)
+
+ 扣点:
+
+ %
+
+
+ 金额:
+
+ 元
+
+
+
+ 取消
+ 提交申请
+
+
+
+
+
+
+
+
diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue
index 30fa018..517dd69 100644
--- a/pages/area-proxy/my-team.vue
+++ b/pages/area-proxy/my-team.vue
@@ -6,18 +6,18 @@
我的团队
-
+
+ :style="'background-image:url(' + member.workerLogoUrl + ');min-width: 64rpx'">
{{member.name}}
-
-
+
@@ -25,66 +25,50 @@
@click="hideEditInput">
-
- {{member.noteName}}
+
+ {{member.workerName}}
-
+
-
-
-
-
- 设置扣点
- (扣点:{{myTeamInfo.takeRate}}%)
-
- 邀请团队
+
+
+
+
+
+ 设置扣点
+ (扣点:{{curUserInfo.leaderTeamRate}}%)
+
+ 邀请团队
-
-
-
-
- 设置扣点
-
-
-
-
-
- 设置区域代理扣点可按百分比扣取或金额扣取的方式(建议二选一进行申请)
-
- 扣点:
-
- %
-
-
- 金额:
-
- 元
-
-
-
- 取消
- 提交申请
-
-
-
+
+
-