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) + }) } }, };