no message

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;

root/person/marge.vue

@@ -21,7 +21,9 @@
 		</div>
 		<!-- 申请/发起 -->
 		<view class="m-applys-obj">
-			<view class="m-aform g_flex_row_start g_h_60">
+			<view class="m-aform g_flex_row_start g_h_60"
+					  @click="openApply"
+			>
 				<view class="g_flex_none g_flex_c label">
 					<i class="iconfont icon-jia1 icon"></i>
 				</view>
@@ -30,6 +32,49 @@
 			<div class="m-alist"></div>
 		</view>
 		
+		
+		<u-popup v-model="modalApplyData.isShow" mode="center" border-radius="14" width="80%" :closeable='true'>
+			<view>
+				<view class="g_flex_c g_h_40 g_fs_16">申请合并</view>
+				<view>
+					<view>
+						<view class="g_pb_8 g_pl_20 g_c_6">手机号</view>
+						<view class="g_flex_row_start">
+							<view class="g_flex_1 g_flex_column_center">
+								<u-input v-model="modalApplyData.tel"
+											   placeholder="请输入"
+												 type="number"
+												 maxlength="11"
+												 style="width: calc(100% - 64px); z-index: 0;background-color: #ededed;border-radius: 6px;margin: 0 auto;padding: 0 16px;"
+								></u-input>
+							</view>
+							<view class="g_flex_none g_flex_column_center g_mr_16">
+								<g-button type='primary' size='mini' btnText='查询' @clickBtn='handleSearch'></g-button>
+							</view>
+						</view>
+					</view>
+					<view>
+						<view class="g_pt_12 g_pb_8 g_pl_20 g_c_6">备注</view>
+						<textarea class="weui-input g_flex_1 g_fs_16"
+											placeholder="请输入备注" 
+											v-model="modalApplyData.desp" 
+											placeholder-style="color:#999" 
+											auto-height 
+											style="min-height: 137px; width: calc(100% - 64px); z-index: 0;background-color: #ededed;border-radius: 6px;padding: 16px;margin: 0 auto;"
+						></textarea>
+					</view>
+					<view class="g_flex_row_center g_p_16">
+						<view class="g_flex_row_center" style="width: 50%;">
+							<g-button type='default' class="g_w_all" size='small' btnText='取消' @clickBtn='modalApplyData.isShow = false'></g-button>
+						</view>
+						<view class="g_flex_row_center" style="width: 50%;">
+							<g-button type='primary' size='small' btnText='提交'></g-button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		
 	</view>
 </template>
 
@@ -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)
+			})
 		}
 	},
 };