替换

src/projects/business/views/Master/Home.vue

@@ -10,7 +10,13 @@
 						<img :src="person_data?(person_data.faceImageUrl+'?x-oss-process=image/resize,h_50,m_lfit'):''">
 					</div>
 					<div class="mui-media-body">
-						<h3 v-if="person_data">{{person_data.name}}</h3>
+						<h3 v-if="person_data">{{person_data.name}}
+						<template v-if="person_popedom&&person_popedom.parentCompanyId=='dc6dcd4c-cea2-41ed-93e1-10b8adf4bd54'">
+							<!-- 定制化部分 -->
+							{{person_data.position3?"|"+person_data.position3:""}}
+						</template>
+						
+						</h3>
 						<p class='mui-ellipsis' v-text="person_popedom?(person_popedom.job?person_popedom.job:person_popedom.personRoleName):''"></p>
 					</div>
 				</div>
@@ -207,7 +213,7 @@
 					
 			        if(!bannerTipsTime||bannerTipsTime!=time){
 						
-			        	if (this.bannerTipsList.length > 0) {
+			        	if (this.bannerTipsList&&this.bannerTipsList.length > 0) {
 			        	 			
 			        	    this.bannerTipsVisible = true;
 			        	    var x = Math.floor(Math.random() * this.bannerTipsList.length);
@@ -327,8 +333,9 @@
 				}
 			},
 			asynCallBack(bl) {
-				
+				this.isLoading = false;
 				if(!bl){
+					this.getBannerTipsInfo()
 					//获取用户角色列表
 					this.getRoleList();
 					//获取最新二条通知消息
@@ -349,7 +356,7 @@
 				bounce: true //是否启用回弹
 			});
 	
-			this.getBannerTipsInfo()
+			this.isLoading = true;
 			
 			
 		},

src/projects/home/views/Home.vue

@@ -37,7 +37,19 @@
 											}
 					})
 				} else {
-					window.location.href="http://xpgj.xiaoxinda.com/xpgj/prod/home/#/select"
+					if (process.env.VUE_APP_NODE_NAME == 'production') {
+						window.location.href="http://xpgj.xiaoxinda.com/xpgj/prod/home/#/select"
+						
+ 					}else  if (process.env.VUE_APP_NODE_NAME == 'test') {
+						window.location.href="http://xpgj.xiaoxinda.com/xpgj/test/home/#/select"
+						
+					}
+					else{
+						 this.$router.push({
+						 						name: 'Select',
+						 					
+						 					})
+					}
 					
 					// this.$router.push({
 					// 						name: 'Select',