no message

api/person.js

@@ -7,7 +7,7 @@ let personInfo = {// 用户信息模块
   person_deleteUserBank: "/user/bank/deleteUserBank",// 解除绑定银行卡
   person_addUserBank: "/user/bank/addUserBank",// 绑定银行卡
   get_creator_tel: "/yishoudan/agency/getCreatorTel",// 获取创建人手机号(能获取到说明是创建人)
-  
+  get_infoByLogin: "/assistant/circle/agency/apply/infoByLogin",// 获取用户信息ByLogin
   
 }
 

pages/person/index.vue

@@ -31,7 +31,7 @@
 		<!-- <view class="g_mt_10" v-if="hasPermission">
 			<g-panel-poster-card :list="poastList" subhead="更多" cardType="img" titleNav="/root/merchantManagement/posterShare" :speed="1" :marginBottom="16" :num="4" cusTitle="分享海报" @clickImg="clickImg" @clickItem="handleClickNum" />
 		</view> -->
-		<view class="g_mt_10" v-if="agencyInfo.supplierAccount == 1">
+		<view class="g_mt_10" v-if="isJm">
 			<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
 				<view class="g_flex_row_start flex_center">
 					<img src="https://bocai-cms.oss-cn-beijing.aliyuncs.com/web-resource/dailibaoming/fazhandaili0610.svg" class="g_w_48 g_h_48 g_radius_50" alt="" />
@@ -66,6 +66,7 @@
 				@clickItem="goPage('/root/bind/fensi')"
 			/>
 		</view>
+		<!--  -->
 		<view class="g_mt_10 g_position_rela u-skeleton" v-if="applystatys == 1">
 			<g-panel-form-item
 				:list="[
@@ -73,7 +74,7 @@
 						icon: 'time-circle',
 						label: '申请关注',
 						result: '已提交',
-						path: ' ',
+						path: '/root/bind/applyForm?code=' + agencyCode + '&foa=1',
 						pRow: 0,
 						rpl:0,
 						fpl:0,
@@ -81,6 +82,7 @@
 						pColumn:16,
 					},
 				]"
+				@clickItem="goPaga('/root/bind/applyForm?code=' + agencyCode + '&foa=1')"
 			/>
 		</view>
 		<view class="g_mt_10" v-if="userInfo.agencyId">
@@ -246,6 +248,8 @@ export default {
 	onReady() {},
 	data() {
 		return {
+			appdatas:{},
+			agencyCode:'',
 			applystatys:null,
 			isJm:uni.getStorageSync("apply-userinfo") && uni.getStorageSync("apply-userinfo").agencyId && uni.getStorageSync("apply-userinfo").agencyId == '114827',
 			themeColor: getApp().globalData.themeColor,
@@ -343,7 +347,7 @@ export default {
 				that.setUserInfo();
 				that.getResumeInfo();
 				that.getData();
-				// that.getinfoByLogin();
+				that.getinfoByLogin();
 			});
 		} else {
 			that.pageSpeed = 1;
@@ -362,7 +366,14 @@ export default {
 			let that = this;
 			that.G.Get(that.api.get_infoByLogin + '/' + uni.getStorageSync("AGENCY_ID"), {}, (res) => {
 				console.log("getinfoByLogin", res);
-				that.applystatys = res;
+				if(res){
+					that.applystatys = res.recordStatus;
+					that.agencyCode = res.agencyCode;
+					that.appdatas = res;
+				}else{
+					that.applystatys = '';
+					that.agencyCode = '';
+				}
 			});
 		},
 		getResumeInfo() {
@@ -391,6 +402,14 @@ export default {
 			that.userInfo.teamType = userInfo.teamType;
 			console.log("that.userInfo", that.userInfo);
 		},
+		goPaga($path){
+			let that = this;
+			console.log("goPaga $path", $path);
+			uni.setStorageSync("applyfoemdata", JSON.stringify(that.appdatas));
+			uni.navigateTo({
+				url: $path,
+			});
+		},
 		goPage($path) {
 			this.G.isLogin();
 			if (this.G.isLogin()) {

root/bind/applyForm.vue

@@ -13,9 +13,9 @@
 				<div class="g_flex_row_center" style="margin:6px 0 4px;color:#333;font-size: 18px;">
 					{{ info.agencyName }}
 				</div>
-				<div style="color:#999999;font-size: 14px;">
+				<!-- <div style="color:#999999;font-size: 14px;">
-					{{ info.agencyName }}{{ info.agencyName }}{{ info.agencyName }}
+					{{ info.nickname }}
-				</div>
+				</div> -->
 			</div>
 
 			<div style="margin: 24px auto 0;width: calc(100% - 20px);">
@@ -116,7 +116,7 @@
 							hover-class="thover" 
 							@click="handleSubmit"
 				>
-					{{ info.recordStatus == 1 ? "已申请" : info.recordStatus == 2 ? "已关注" : "申请关注" }}
+					{{ info.recordStatus == 1 ? "已提交" : info.recordStatus == 2 ? "已关注" : "申请关注" }}
 				</view>
 			</view>
 		</view>
@@ -160,11 +160,12 @@ export default {
 			},
 
 			btnSpeed: -1, // -1 默认 0 按下 1请求中 2请求后
+			foa:2
 		};
 	},
 	onLoad(options) {
 		console.log("申请关注页面：", options);
-
+		let that = this;
 		if (options.scene) {
 			var sceneStr = decodeURIComponent(options.scene);
 			var sceneJson = this.G.sceneToJson(sceneStr);
@@ -177,11 +178,35 @@ export default {
 		} else {
 			this.wxCode = options.code;
 			this.form = options.form;
+			that.foa = options.foa;
+			
+			if(options.foa == 1 && uni.getStorageSync("applyfoemdata")){
+				let _datas = JSON.parse(uni.getStorageSync("applyfoemdata"));
+				if(_datas){
+					that.newForm = {
+						wxname:_datas.nickName || '微信昵称',
+						wxavatar:_datas.avatar || 'https://bocai-cms.oss-cn-beijing.aliyuncs.com/web-resource/pugongying/default.svg',
+						companyName: _datas.agencyName,
+						phone: _datas.tel,
+						remark:_datas.remark,
+					};
+					that.info.logo = _datas.logo;
+					that.info.recordStatus = 1;
+					that.info.agencyName = _datas.agencyName;
+				}
+			}else{
+				this.wxCode = options.code;
+				this.form = options.form;
+			}
 		}
 	},
 	onShow() {
 		let that = this;
-		that.init();
+		if(that.foa != 1){
+			that.init();
+		}else{
+			that.isloading = false;
+		}
 	},
 	methods: {
 		getUserInfo(e) {