注册场景调整

config/project.js

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

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

@@ -29,7 +29,7 @@
 					<h5>请选择您的身份进行认证</h5>
 				</div>
 				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
-					<li v-for="(item,index) in roleList" class="mui-table-view-cell mui-media">
+					<li v-for="(item,index) in roleList" :class="'mui-table-view-cell mui-media '+(subForm.personRoleId==item.id?'mui-selected':'')">
 						<a @click="selectRole(item)" class="mui-navigate-right">
 							<div class="mui-media-object mui-pull-left">
 								<img :src="item.pic">
@@ -43,8 +43,14 @@
 					</li>
 				</ul>
 			</div>
+
+			<div v-show="subForm.companyId && subForm.personRoleId " class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary" @click="nextStep">
+					下一步
+				</button>
+			</div>
 		</div>
-		
+
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>
@@ -104,6 +110,10 @@
 					this.isLoading = false;
 
 					this.roleList = response;
+					if (response.length > 0) {
+						//选择默认角色
+						this.selectRole(response[0]);
+					}
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -120,6 +130,12 @@
 				this.subForm.personRoleId = item.id;
 				this.subForm.roleName = item.name;
 				this.set_register_form_data(this.subForm);
+				/* this.$router.push({
+					name: 'RegisterBusinessStep3'
+				}) */
+			},
+			//下一步
+			nextStep() {
 				this.$router.push({
 					name: 'RegisterBusinessStep3'
 				})

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

@@ -14,7 +14,7 @@
 						<label>您的身份</label>
 						<span v-text="subForm.roleName"></span>
 					</div>
-					<div class="mui-input-row">
+					<div v-if="companyStructureName" class="mui-input-row">
 						<label>部门</label>
 						<span v-text="companyStructureName"></span>
 					</div>

src/projects/home/views/Register/Pension/Step1.vue

@@ -47,7 +47,7 @@
 					<h5>请选择您的身份进行认证</h5>
 				</div>
 				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
-					<li v-for="(item,index) in roleList" class="mui-table-view-cell mui-media">
+					<li v-for="(item,index) in roleList" :class="'mui-table-view-cell mui-media '+(subForm.personRoleId==item.id?'mui-selected':'')">
 						<a @click="selectRole(item)" class="mui-navigate-right">
 							<div class="mui-media-object mui-pull-left">
 								<img :src="item.pic">
@@ -61,6 +61,12 @@
 					</li>
 				</ul>
 			</div>
+
+			<div v-show="roleSeleceShow" class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary" @click="nextStep">
+					下一步
+				</button>
+			</div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -127,6 +133,10 @@
 					this.isLoading = false;
 
 					this.roleList = response;
+					if (response.length > 0) {
+						//选择默认角色
+						this.selectRole(response[0]);
+					}
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -143,6 +153,12 @@
 				this.subForm.personRoleId = item.id;
 				this.subForm.roleName = item.name;
 				this.set_register_form_data(this.subForm);
+				/* this.$router.push({
+					name: 'RegisterPensionStep3'
+				}) */
+			},
+			//下一步
+			nextStep() {
 				this.$router.push({
 					name: 'RegisterPensionStep3'
 				})
@@ -199,7 +215,7 @@
 				// getter
 				get: function() {
 					if (this.subForm.sceneId == 4) {
-						if (this.subForm.serviceCompanyId !== '') {
+						if (this.subForm.serviceCompanyId !== '' && this.subForm.companyId !== '') {
 							return true;
 						} else {
 							return false;

src/projects/home/views/Register/Pension/Step4.vue

@@ -22,10 +22,10 @@
 						<label>家庭地址</label>
 						<span v-text="subForm.address"></span>
 					</div>
-					<div v-if="subForm.companyId!==0" class="mui-input-row">
+					<!-- <div v-if="subForm.companyId!==0" class="mui-input-row">
 						<label>房号</label>
 						<span v-text="companyStructureName"></span>
-					</div>
+					</div> -->
 				</form>
 			</div>
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">

src/projects/home/views/Register/Pension/step3.vue

@@ -16,7 +16,7 @@
 					</div>
 				</form>
 			</div>
-			<div v-if="subForm.sceneId=='3' || subForm.companyId" class="mui-content-padded vongi-qingjiadt vongi-editme">
+			<!-- <div v-if="subForm.sceneId=='3' || subForm.companyId" class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label v-text="companyLabel"></label>
@@ -30,12 +30,12 @@
 						</button>
 					</div>
 				</form>
-			</div>
-			<div v-if="subForm.companyId==0" class="mui-content-padded vongi-qingjiadt vongi-editme">
+			</div> -->
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
-						<label>居家养老</label>
-						<span></span>
+						<label v-text="companyLabel"></label>
+						<span v-text="subForm.companyName"></span>
 					</div>
 					<!--居家养老状态-->
 					<div class="mui-input-row">
@@ -162,7 +162,7 @@
 			},
 			//检测表单
 			checkForm() {
-				if (this.subForm.companyId !== 0) {
+				/* if (this.subForm.companyId !== 0) {
 					//设置最后一个id
 					let lastIndex = this.subForm.selectCompanyStructureList.length;
 					let lastItem = this.subForm.selectCompanyStructureList[lastIndex - 1];
@@ -183,7 +183,8 @@
 					} else {
 						return true;
 					}
-				}
+				} */
+				return true;
 			},
 			//下一步
 			nextStep() {

src/projects/home/views/Register/Residence/Step1.vue

@@ -29,7 +29,7 @@
 					<h5>请选择您的身份进行认证</h5>
 				</div>
 				<ul class="mui-table-view mui-table-view-chevron openfyy-list">
-					<li v-for="(item,index) in roleList" class="mui-table-view-cell mui-media">
+					<li v-for="(item,index) in roleList" :class="'mui-table-view-cell mui-media '+(subForm.personRoleId==item.id?'mui-selected':'')">
 						<a @click="selectRole(item)" class="mui-navigate-right" href="">
 							<div class="mui-media-object mui-pull-left">
 								<img :src="item.pic">
@@ -43,6 +43,12 @@
 					</li>
 				</ul>
 			</div>
+			
+			<div v-show="subForm.companyId && subForm.personRoleId " class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary" @click="nextStep">
+					下一步
+				</button>
+			</div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -105,6 +111,10 @@
 					this.isLoading = false;
 
 					this.roleList = response;
+					if (response.length > 0) {
+						//选择默认角色
+						this.selectRole(response[0]);
+					}
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -121,6 +131,12 @@
 				this.subForm.personRoleId = item.id;
 				this.subForm.roleName = item.name;
 				this.set_register_form_data(this.subForm);
+				/* this.$router.push({
+					name: 'RegisterResidenceStep3'
+				}) */
+			},
+			//下一步
+			nextStep() {
 				this.$router.push({
 					name: 'RegisterResidenceStep3'
 				})

src/projects/home/views/Register/Residence/Step4.vue

@@ -14,7 +14,7 @@
 						<label>您的身份</label>
 						<span v-text="subForm.roleName"></span>
 					</div>
-					<div class="mui-input-row">
+					<div v-if="companyStructureName" class="mui-input-row">
 						<label>楼栋房号</label>
 						<span v-text="companyStructureName"></span>
 					</div>