Sfoglia il codice sorgente

外部页面和互扫关联页面排除当前项目判断跳转

wgl 4 anni fa
parent
commit
43e98b58a6

+ 1 - 1
config/project.js

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

+ 6 - 1
src/components/Common.vue

@@ -31,6 +31,11 @@
 				require: false,
 				require: false,
 				default: '',
 				default: '',
 			},
 			},
+			//是否检测项目,进行跳转
+			projectCheck: {
+				require: false,
+				default: true,
+			},
 		},
 		},
 		data() {
 		data() {
 			return {}
 			return {}
@@ -136,7 +141,7 @@
 			},
 			},
 			//判断权限然后进行跳转
 			//判断权限然后进行跳转
 			projectExchange() {
 			projectExchange() {
-				if (this.person_popedom && this.person_popedom.sceneId) {
+				if (this.projectCheck && this.person_popedom && this.person_popedom.sceneId) {
 					let project = Dictionaries.getProject(this.person_popedom.sceneId);
 					let project = Dictionaries.getProject(this.person_popedom.sceneId);
 					if (projectName.name != project && ['devlopment'].indexOf(process.env.VUE_APP_NODE_NAME) == -1) {
 					if (projectName.name != project && ['devlopment'].indexOf(process.env.VUE_APP_NODE_NAME) == -1) {
 						window.location.href = '../' + project + '/#/master';
 						window.location.href = '../' + project + '/#/master';

+ 1 - 1
src/projects/home/views/Wx/About/Contact.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 		<div>
 		<div>

+ 1 - 1
src/projects/home/views/Wx/Activity/Form.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 		<div>
 		<div>

+ 1 - 1
src/projects/home/views/Wx/Activity/Info.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 		<div>
 		<div>

+ 1 - 1
src/projects/home/views/Wx/Activity/List.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 		<div>
 		<div>

+ 3 - 3
src/projects/home/views/Wx/Activity/MyList.vue

@@ -1,10 +1,10 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common @asynCallBack="asynCallBack"></common>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 
 		<div>
 		<div>
-			<img src="~$project/assets/img/kong.jpg" width="100%" style="margin-top:44px"/>
+			<img src="~$project/assets/img/kong.jpg" width="100%" style="margin-top:44px" />
 		</div>
 		</div>
 
 
 		<loading :visible="isLoading"></loading>
 		<loading :visible="isLoading"></loading>
@@ -51,7 +51,7 @@
 				openId: 'wx_openid',
 				openId: 'wx_openid',
 				token: 'token',
 				token: 'token',
 				person_data: 'person_data',
 				person_data: 'person_data',
-                person_popedom: 'person_popedom',
+				person_popedom: 'person_popedom',
 				vister_scene: 'vister_scene',
 				vister_scene: 'vister_scene',
 			})
 			})
 		}
 		}

+ 1 - 1
src/projects/pension/views/Master/User/RelationPerson.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<common ref="common" @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 		<top-header :pageTitle="pageTitle"></top-header>
 
 
 		<div class="mui-content margin60">
 		<div class="mui-content margin60">

+ 1 - 1
src/projects/pension/views/Master/User/RelationPersonRegister.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<div>
 	<div>
-		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<common ref="common" @asynCallBack="asynCallBack" :projectCheck="false"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 		<top-header :pageTitle="pageTitle"></top-header>
 
 
 		<div class="mui-content vongi-qqhm">
 		<div class="mui-content vongi-qqhm">