长者关联修改

config/project.js

@@ -1 +1 @@
-exports.name = 'home'
+exports.name = 'pension'

src/projects/pension/router/master.js

@@ -261,13 +261,13 @@ const routesMaster = [
 						name: 'MasterUserMyCode',
 						component: () => import('../views/Master/User/MyCode.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '我的二维码',
 							mode: true
 						}
 					},
-					//关联长者,未注册第一步,入口页
+					//关联长者,未注册第一步
 					{
 						path: 'relationPersonRegister',
 						name: 'MasterUserRelationPersonRegister',
@@ -276,7 +276,6 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '关联长者,未注册第一步',
-							mode: true
 						}
 					},
 					//关联长者,已注册
@@ -285,9 +284,10 @@ const routesMaster = [
 						name: 'MasterUserRelationPerson',
 						component: () => import('../views/Master/User/RelationPerson.vue'),
 						meta: {
-							requireAuth: false,
+							requireAuth: true,
 							role: [],
 							title: '关联长者,已注册',
+							mode: true
 						}
 					},
 				],

src/projects/pension/views/Master/User/RelationPersonRegister.vue

@@ -44,6 +44,7 @@
 		checkPhone,
 	} from '$project/utils'
 	import * as types from '$project/store/mutation-types'
+	import * as WxJsApi from '$project/utils/wxJsApi'
 	export default {
 		name: 'MasterUserRelationPersonRegister',
 		components: {
@@ -68,8 +69,22 @@
 				isSendMsg: false,
 			}
 		},
-		created() {},
+		created() {
+			if (this.person_data) {
+				//如果用户存在直接调用扫码功能
+				this.subForm.name = this.person_data.name;
+				this.subForm.telephone = this.person_data.phone;
+				//调用扫一扫
+				WxJsApi.getWxConfig().then(res => {
+					this.scanCode();
+				});
+			}
+		},
 		methods: {
+			//微信扫二维码
+			scanCode() {
+				WxJsApi.scanQRCode(2);
+			},
 			//发送验证码
 			sendMsg() {
 				if (!this.isSendMsg) {
@@ -144,13 +159,7 @@
 					})
 				}
 			},
-			asynCallBack() {
-				if (this.person_data) {
-					this.$router.push({
-						name: 'MasterUserRelationPerson'
-					})
-				}
-			},
+			asynCallBack() {},
 			...mapMutations({
 				set_old_relation_form_data: types.SET_OLD_RELATION_FORM_DATA,
 			})

src/utils/wxJsApi.js

@@ -6,7 +6,7 @@ import * as API_Common from '$project/apis/common'
 export function getWxConfig(jsApiList) {
 	var jsApiList = jsApiList || ['chooseImage', 'getLocalImgData', 'scanQRCode'];
 	let promise = (jsApiList => {
-		new Promise((resolve, reject) => {
+		return new Promise((resolve, reject) => {
 			console.log(jsApiList);
 			API_WeiXin.getConfig().then(response => {
 				var wxconfig = response.wxConfig;