From 569ff3cd1c8f762d81ec4e92fefcdd55b180c94a Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 09:59:04 +0800 Subject: [PATCH 01/10] no message --- pages.json | 9 +++++++++ root/person/marge.vue | 8 ++++++++ root/person/orderEdit.vue | 20 +++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 root/person/marge.vue diff --git a/pages.json b/pages.json index a89dde2..3cfe834 100644 --- a/pages.json +++ b/pages.json @@ -97,6 +97,15 @@ { // 个人中心二级页面 "root": "root/person", "pages": [ + { + "path": "marge", + "style": { + "navigationBarTitleText": "合并团队", + "backgroundColor": "#ededed", + "backgroundColorTop": "#ededed", + "backgroundColorBottom": "#ededed" + } + }, { "path": "todayData", "style": { diff --git a/root/person/marge.vue b/root/person/marge.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/root/person/marge.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/root/person/orderEdit.vue b/root/person/orderEdit.vue index 13c0451..12304bd 100644 --- a/root/person/orderEdit.vue +++ b/root/person/orderEdit.vue @@ -17,6 +17,20 @@ @clickItem="teamSet" /> + + + @@ -341,7 +355,11 @@ export default { // }); // } }, - + goMarge(){ + uni.navigateTo({ + url:'/root/person/marge' + }) + }, teamSet() { this.teamSetShow = true; }, From c51434c9f6feae40af9335f82c7fb776e77a7a34 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 10:33:13 +0800 Subject: [PATCH 02/10] no message --- api/person.js | 1 + root/person/marge.vue | 66 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/api/person.js b/api/person.js index bf6db5f..6be0fdd 100644 --- a/api/person.js +++ b/api/person.js @@ -2,6 +2,7 @@ let personInfo = {// 用户信息模块 merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据 person_feedback: "/daotian/feedback/add",// 反馈与建议 person_feedbackList: "/daotian/feedback/list",// 反馈与建议 + person_marge: "/yishoudan/agency/merge/get",// 获取合并记录 } export default personInfo; \ No newline at end of file diff --git a/root/person/marge.vue b/root/person/marge.vue index 02409e3..5fa7ab1 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -1,8 +1,70 @@ - \ No newline at end of file + From ca8c48e7bccedd8ec44010f1723920a7b6dfbaed Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 14:34:01 +0800 Subject: [PATCH 03/10] no message --- root/person/marge.vue | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 5fa7ab1..e8015ba 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -14,6 +14,22 @@ height="76" > + + +
+ +
+ + + + + + + 申请合并 + +
+ + @@ -67,4 +83,25 @@ export default { }; - + From b374e281749984d196e650d41e76364f31d7d7be Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 16:28:53 +0800 Subject: [PATCH 04/10] no message --- api/person.js | 4 ++- root/person/marge.vue | 80 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/api/person.js b/api/person.js index 6be0fdd..3e32ae9 100644 --- a/api/person.js +++ b/api/person.js @@ -2,7 +2,9 @@ let personInfo = {// 用户信息模块 merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据 person_feedback: "/daotian/feedback/add",// 反馈与建议 person_feedbackList: "/daotian/feedback/list",// 反馈与建议 - person_marge: "/yishoudan/agency/merge/get",// 获取合并记录 + + person_getMargeRecord: "/yishoudan/agency/merge/get",// 获取合并记录 + person_getGroup:'/yishoudan/agency/getAgencyByAdminTel',// 根据管理员手机号查团队 } export default personInfo; \ No newline at end of file diff --git a/root/person/marge.vue b/root/person/marge.vue index e8015ba..3642dde 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -21,7 +21,9 @@ - + @@ -30,6 +32,49 @@
+ + + + 申请合并 + + + 手机号 + + + + + + + + + + + 备注 + + + + + + + + + + + + + + @@ -58,6 +103,13 @@ export default { }, ], menuActive: 0, + + modalApplyData:{ + isShow:false, + tel:'', + desp:'', + result:[] + } }; }, onShow() { @@ -70,7 +122,7 @@ export default { params = { } - that.G.Get(that.api.person_marge,params,(res)=>{ + that.G.Get(that.api.person_getMargeRecord,params,(res)=>{ console.log('合并记录：',res); }) }, @@ -78,6 +130,30 @@ export default { console.log(e) let that = this; that.menuActive = e; + }, + openApply(){ + let that = this; + that.modalApplyData = { + isShow:true, + tel:'', + desp:'', + result:[], + } + }, + handleSearch(){ + let that = this; + if(!that.modalApplyData.tel){ + uni.showToast({ + icon:'none', + title:'请输入手机号' + }) + return false; + } + that.G.Get(that.api.person_getGroup,{ + tel:that.modalApplyData.tel + },(res)=>{ + console.log('团队res',res) + }) } }, }; From 415cf43c50ea99b22fdcb34a52f7b1b7d7302256 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 16:36:02 +0800 Subject: [PATCH 05/10] no message --- root/person/marge.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/root/person/marge.vue b/root/person/marge.vue index 3642dde..09bb4f9 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -33,8 +33,8 @@ - - + + 申请合并 @@ -71,6 +71,7 @@ + From 3ad1d07510e3928e380174394b12ef3fc1871a95 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Thu, 7 Aug 2025 17:10:18 +0800 Subject: [PATCH 06/10] no message --- api/person.js | 4 ++++ root/person/marge.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/api/person.js b/api/person.js index 3e32ae9..d1b0271 100644 --- a/api/person.js +++ b/api/person.js @@ -5,6 +5,10 @@ let personInfo = {// 用户信息模块 person_getMargeRecord: "/yishoudan/agency/merge/get",// 获取合并记录 person_getGroup:'/yishoudan/agency/getAgencyByAdminTel',// 根据管理员手机号查团队 + person_addApply:'/yishoudan/agency/merge/add',// 申请合并 + person_applyTrue:'/yishoudan/agency/merge/agree',// 通过 + person_applyFalse:'/yishoudan/agency/reject',// 驳回 + person_applyNum:'/yishoudan/agency/merge/countApply',// 查询待处理数量 } export default personInfo; \ No newline at end of file diff --git a/root/person/marge.vue b/root/person/marge.vue index 09bb4f9..ea77991 100644 --- a/root/person/marge.vue +++ b/root/person/marge.vue @@ -53,6 +53,21 @@ + + + + {{item.agencyName || '-'}} + + + 备注