校验异常

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -259,7 +259,7 @@
                     var curDate = year + "-" + month + "-" + day;
 
                     if(curDate==_this.tjForm.endTime&&_this.tjForm.endTimeQuantum=='0'&&selectItems.h.value=='1'){
-                        //debugger
+                       
                         _mui.alert('开始日期必须大于结束日期');
                         return false;
                     }
@@ -300,7 +300,7 @@
                     var curDate = year + "-" + month + "-" + day;
 
                     if(curDate==_this.tjForm.startTime&&_this.tjForm.startTimeQuantum=='1'&&selectItems.h.value=='0'){
-                        //debugger
+                     
                         _mui.alert('结束日期不能小于开始日期');
                         return false;
                     }

src/projects/business/views/Master/Guest/Scan.vue

@@ -119,7 +119,7 @@
 
 			},
 			checkForm(url) {
-				debugger
+				
 				var sz=url.split("#");
 
 				var sz1=sz[1].toLowerCase();

src/projects/home/router/index.js

@@ -12,6 +12,14 @@ const routes = [
 		meta: {
 			title: '首页',
 		}
+	},
+	{
+		path: '/master',
+		name: 'Home',
+		component: () => import('../views/Home.vue'),
+		meta: {
+			title: '首页',
+		}
 	},
 		//切换
 			{

src/projects/home/views/Home.vue

@@ -24,10 +24,18 @@
 			asynCallBack() {
 				//登录状态判断
 				if (this.person_popedom) {
-					let project = Dictionaries.getProject(this.person_popedom.sceneId);
-					setTimeout(function() {
-						window.location.href = '../' + project + '/#/master';
-					}, 1000);
+					 let project = Dictionaries.getProject(this.person_popedom.sceneId);
+					// setTimeout(function() {
+					// 	window.location.href = '../' + project + '/#/master';
+					// }, 1000);
+				
+					
+					this.$router.push({
+											name: 'UserLogin',
+											query: {
+												project:project
+											}
+					})
 				} else {
 					window.location.href="http://xpgj.xiaoxinda.com/xpgj/prod/home/#/select"
 					

src/projects/home/views/Register/Business/Step2.vue

@@ -145,7 +145,8 @@
 				 "serviceCompanyName":"请选择","selectCompanyStructureList":[],
 				 "address":"","idCard":"","faceImageUrl":"","popularizePersonId":""}
 				 this.subForm.personId = this.person_data.id;
-				 this.subForm.changeCompany=1;
+				  this.subForm.changeCompany=1;
+				  this.subForm.telephone=this.person_data.phone;
 				 	this.set_register_form_data(this.subForm);
 				 
 			}else{

src/projects/home/views/Select.vue

@@ -13,9 +13,9 @@
 							<span class="mui-pull-left von-xzbb-tit">云版本</span>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-6" v-for="item,i in list">
+					<li class="mui-table-view-cell mui-media mui-col-xs-6" v-for="(item,i) in list" :key="i">
 						<a @click="loginUrl(item)">
-							<div class="mui-pull-left von-xzbb-logo"><img src="~$project/assets/img/logo_xsy01.jpg" /></div>
+							<div class="mui-pull-left von-xzbb-logo"><img :src="'https://xpgj.xiaoxinda.com/xpgj/prod/logo/'+item.logo" /></div>
 							<span class="mui-pull-left von-xzbb-tit">{{item.name}}</span>
 						</a>
 					</li>
@@ -38,10 +38,27 @@
 						name:"新生源版",
 						path1:"http://xpgj.xiaoxinda.com/xpgj/xsy/#/",
 						path2:"http://xpgj.xiaoxinda.com/xpgj/xsy-test/#/",
+						path1login:"http://xpgj.xiaoxinda.com/xpgj/xsy/#/",
+						path2login:"http://xpgj.xiaoxinda.com/xpgj/xsy-test/#/",
 						login:"user/login",
 						main:"master",
 						key:"xpgj_xsy_token",
+						logo:'logo_xsy01.jpg'
 						
+					},
+					{
+						name:"华中山鹰",
+						path1:"https://xpgj.xiaoxinda.com/xpgj/prod/home/#/",
+						path2:"https://xpgj.xiaoxinda.com/xpgj/test/home/#/",
+						
+						path1login:"https://xpgj.xiaoxinda.com/xpgj/prod/business/#/",
+						path2login:"https://xpgj.xiaoxinda.com/xpgj/test/business/#/",
+						
+						login:"user/login?sceneId=1&companyId=dc6dcd4c-cea2-41ed-93e1-10b8adf4bd54&companyName=山鹰华中纸业有限公司",
+						main:"master",
+						key:"xpgj_token",
+						logo:'logo_hzsy.png'
+						
 					}
 				]
 			}
@@ -74,9 +91,9 @@
 				var key=window.localStorage.getItem(obj.key);
 				if(key){
 					if (process.env.VUE_APP_NODE_NAME == 'production') {
-						window.location.href = obj.path1+obj.main;//正式版本
+						window.location.href = obj.path1login+obj.main;//正式版本
 					}else{
-						window.location.href = obj.path2+obj.main; //测试版本
+						window.location.href = obj.path2login+obj.main; //测试版本
 					}
 				}
 			}

src/projects/home/views/User/Login.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
+		<common @asynCallBack="asynCallBack" ></common>
 		<top-header :pageTitle="pageTitle" :leftShow="false"></top-header>
 
 		<div class="mui-content">
@@ -85,7 +85,7 @@
 				this.subForm.name = this.person_temp.name;
 				this.subForm.phone = this.person_temp.phone;
 			}
-
+			//console.log(this.$route.query.companyName)
 			if (!this.project) {
 				this.project = Dictionaries.getProject(0);
 			}
@@ -170,6 +170,7 @@
 						openId: openid,
 						telephone: this.subForm.phone,
 					}).then(response => {
+						
 						if (response.token) {
 							this.set_token(response.token);
 							if (response.personInfo.faceImageUrl) {
@@ -186,8 +187,11 @@
 								})
 							}
 						} else {
+							
 							//注册
-							this.confirmRegister();
+							this.confirmRegister();	
+							
+						 
 						}
 
 						this.isLoading = false;
@@ -203,13 +207,35 @@
 				var btnArray = ['否', '是'];
 				mui.confirm('当前用户不存在，是否立即注册？', '提示', btnArray, function(e) {
 					if (e.index == 1) {
-						_this.$router.push({
-							name: 'RegisterHome',
-							query: {
-								telephone: _this.subForm.phone,
-								project: _this.$route.query.project
-							}
-						})
+						
+						 
+						if(_this.$route.query.sceneId){
+							 
+							var obj= {"sceneId":_this.$route.query.sceneId,"sceneName":"工厂园区",
+							"personRoleId":"1","roleName":"员工","name":"",
+							"personId":"","companyId":_this.$route.query.companyId,"companyName":_this.$route.query.companyName,
+							"companyStructureId":"","serviceCompanyId":_this.$route.query.companyId,
+							"serviceCompanyName":_this.$route.query.companyName,"selectCompanyStructureList":[],
+							"telephone": _this.subForm.phone,
+							"address":"","idCard":"","faceImageUrl":"","popularizePersonId":""}
+							
+							_this.set_register_form_data(obj);
+							_this.$router.push({
+								name: 'RegisterBusinessStep4'
+							})
+							
+						}else{
+							_this.$router.push({
+								name: 'RegisterHome',
+								query: {
+									telephone: _this.subForm.phone,
+									project: _this.$route.query.project,
+								
+								}
+							})
+						}
+						
+						
 					}
 				})
 			},
@@ -225,7 +251,9 @@
 			},
 			...mapMutations({
 				set_token: types.SET_TOKEN,
-			})
+		
+				set_register_form_data: types.SET_REGISTER_FORM_DATA,
+			}),
 		},
 		mounted() {
 			document.body.style.backgroundColor = '#fff';
@@ -233,6 +261,7 @@
 		destroyed() {
 			document.body.style.backgroundColor = '';
 		},
+		
 		computed: {
 			...mapGetters({
 				openId: 'wx_openid',

src/projects/pension/views/Master/Hospital/Home.vue

@@ -102,7 +102,7 @@ export default {
     methods: {
         //右上角点击事件
         edit() {
-        debugger
+      
             this.$router.push({
                 name: "MasterHospitalArchives",
                 query: {