调整

.env.development

@@ -6,9 +6,9 @@ VUE_APP_LOCAL_STORAGE_PREFIX=dev
 #项目缓存抬头
 VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
 
-#VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
-#VUE_APP_BACKEND_URL=http://localhost:8086/jp-housekeeper-server/
-VUE_APP_BACKEND_URL=http://47.98.231.198:8081/jp-housekeeper-server
+#VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/gaoa-server/
+#VUE_APP_BACKEND_URL=http://localhost:8086/gaoa-server/
+VUE_APP_BACKEND_URL=http://47.98.231.198:8081/gaoa-server
 
 VUE_APP_BACKEND_URL51=https://51team.xiaoxinda.com/charging-parking/
 VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/

.env.production

@@ -5,8 +5,8 @@ VUE_APP_LOCAL_STORAGE_PREFIX=prod
 
 #项目缓存抬头
 VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
-
-VUE_APP_BACKEND_URL=http://47.98.231.198:8081/jp-housekeeper-server
+VUE_APP_BACKEND_URL=http://47.98.231.198:8081/gaoa-server
+##VUE_APP_BACKEND_URL=http://47.98.231.198:8081/jp-housekeeper-server
 VUE_APP_BACKEND_URL51=https://51team.xiaoxinda.com/charging-parking/
 VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 

.env.test

@@ -5,8 +5,8 @@ VUE_APP_LOCAL_STORAGE_PREFIX=test
 
 #项目缓存抬头
 VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
+VUE_APP_BACKEND_URL=http://47.98.231.198:8081/gaoa-server
 
-VUE_APP_BACKEND_URL=http://47.98.231.198:8081/jp-housekeeper-server
 VUE_APP_BACKEND_URL51=https://51team.xiaoxinda.com/charging-parking/
 
 VUE_APP_MIRROR_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/

src/App.vue

@@ -5,6 +5,14 @@
 </template>
 
 <script>
+	window.addEventListener('resize', () => {
+		if (document.activeElement.tagName == 'INPUT') {                      
+		window.setTimeout(() => { 
+			document.activeElement.scrollIntoViewIfNeeded();            
+		}, 100);        
+	}
+	})
+	
 	import {
 		mapGetters,
 		mapMutations

src/commin.js

@@ -49,6 +49,7 @@
 				//testOpenid:"oHjCawmHqG44pqUW54iBlenaHYB8",//ys
 				testOpenid:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//zkx
 				//testOpenid:"oHjCawsxTJkxixR74OVp7aCKahj8",//ylm
+				
 				//testOpenid:"oHjCawgwCGen5k1-hAsimdEX5lZo",//sz
 				
 				
@@ -190,7 +191,10 @@
 				// }
 				if (this.projectCheckLogin) {
 					//window.location.href = '../#/master';
-					window.location.href = '#/master';
+					//window.location.href = '#/master';
+					this.$router.push({
+											name: 'Master'
+					})
 				}
 			},
 

src/utils/request.js

@@ -58,7 +58,7 @@ var BACKEND_URL = baseApiList[apiTypeIndex];
 if (process.env.VUE_APP_NODE_NAME == 'devlopment') {			
 	//BACKEND_URL = 'http://192.168.77.162:8086/jp-housekeeper-server/'
 	//baseApiList = ['http://127.0.0.1:8086/jp-housekeeper-server/']
-	//BACKEND_URL="http://192.168.33.220:8086/jp-housekeeper-server/";
+//	BACKEND_URL="http://192.168.33.220:8086/gaoa-server/";
 }
 
 // 创建axios实例

src/views-home/User/Login.vue

@@ -6,8 +6,8 @@
 		<div class="mui-content">
 			<div class="mui-content-padded">
 				<div class="vongi-login-logo" v-if="!selectCompany">
-					<img src="~@/assets/img/logo_xiaopengguanjia.png" />
-					<h2>小鹏管家</h2>
+					<img src="~@/assets/img-oa/logo.png" />
+					<h2>交建OA</h2>
 				</div>
 				<div class="vongi-login-logo" v-if="selectCompany">
 				 

src/views-home/User/Role.vue

@@ -75,9 +75,12 @@
 					id: id
 				}).then(response => {
 					this.isLoading = false;
-
+					
+					this.$router.push({
+											name: 'Master'
+					})
 					//跳转到项目主页上去
-					window.location.href = '../' + this.$route.query.project + '/#/master';
+					//window.location.href = '../' + this.$route.query.project + '/#/master';
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);

src/views-home/User/UploadPhoto.vue

@@ -158,8 +158,10 @@
 						this.isLoading = false;
 
 						//跳转到项目主页上去
-						window.location.href = '../' + this.$route.query.project + '/#/master';
-
+						//window.location.href = '../' + this.$route.query.project + '/#/master';
+						this.$router.push({
+														name: 'Master'
+								})
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -170,7 +172,10 @@
 				//如果已经有头像了则跳过这里的注册上传头像
 				if (this.person_data && this.person_data.faceImageUrl) {
 					//跳转到项目主页上去
-					window.location.href = '../' + this.$route.query.project + '/#/master';
+					this.$router.push({
+											name: 'Master'
+					})
+					//window.location.href = '../' + this.$route.query.project + '/#/master';
 				}
 			},
 		},

vue.config.js

@@ -17,7 +17,7 @@ const conf =  {
 				entry: 'src/main.js',
 				template: 'index/business/index.html',
 				filename: 'index.html',
-				title: '小鹏管家' + title,
+				title: '交建OA' + title,
 			}
 		},
 		outputDir: 'dist',