部分修改备份

@@ -222,9 +222,9 @@ module.exports = {
 		protocol: "《平安一賬通會員服務協議》",
 		register: "點擊註冊",
 		newPassword: "新密碼",
-		newPasswordPlaceholder: "輸入登錄密碼",
+		newPasswordPlaceholder: "請輸入新密碼",
 		newPasswordSure: "確認密碼",
-		newPasswordSurePlaceholder: "輸入登錄密碼",
+		newPasswordSurePlaceholder: "請再次輸入新密碼",
 		sure: "確認",
 		tips: {
 			e1: "手機號不正確，請輸入正確的手機號",

@@ -224,9 +224,9 @@ module.exports = {
 		protocol: "《平安一账通会员服务协议》",
 		register: "点击注册",
 		newPassword: "新密码",
-		newPasswordPlaceholder: "输入登录密码",
+		newPasswordPlaceholder: "请输入新密码",
 		newPasswordSure: "确认密码",
-		newPasswordSurePlaceholder: "输入登录密码",
+		newPasswordSurePlaceholder: "请再次输入新密码",
 		sure: "确认",
 		tips: {
 			e1: "手机号不正确，请输入正确的手机号",

@@ -109,7 +109,7 @@ export default {
 								this.loginHandler();
 								break;
 							case "gotoVHIS":
-								gotoVHIS(this.locale);
+								gotoVHIS(this.$i18n.locale);
 								break;
 						}
 					}

@@ -74,7 +74,7 @@ export default {
 							this.loginHandler();
 							break;
 						case "gotoVHIS":
-							gotoVHIS(this.locale);
+							gotoVHIS(this.$i18n.locale);
 							break;
 					}
 				}

@@ -28,7 +28,7 @@
 						<div class="data-line">
 							<div class="cell1">
 								<div class="label">{{$t('customService.insuranceQuery.t2n3')}}</div>
-								<div class="label">{{dataForm.activeDate}}</div>
+								<div class="label">{{dataForm.activeDate?dataForm.activeDate.split(" ")[0]:""}}</div>
 							</div>
 							<div class="separator-v"></div>
 							<div class="cell1">
@@ -52,7 +52,7 @@
 						<div class="data-line">
 							<div class="cell1">
 								<div class="label">{{$t('customService.insuranceQuery.t2n7')}}</div>
-								<div class="label">{{dataForm.insuredBirthday}}</div>
+								<div class="label">{{dataForm.insuredBirthday?dataForm.insuredBirthday.split(" ")[0]:""}}</div>
 							</div>
 							<div class="separator-v"></div>
 							<div class="cell1">
@@ -87,7 +87,7 @@
 						<div class="data-line">
 							<div class="cell1">
 								<div class="label">{{$t('customService.insuranceQuery.t3n3')}}</div>
-								<div class="label">{{dataForm.clientBirthday}}</div>
+								<div class="label">{{dataForm.clientBirthday?dataForm.clientBirthday.split(" ")[0]:""}}</div>
 							</div>
 							<div class="separator-v"></div>
 							<div class="cell1">
@@ -219,7 +219,7 @@
 							<div class="data-line">
 								<div class="td w2">{{item.paidPeriod}}</div>
 								<div class="td w2">{{item.payType}}</div>
-								<div class="td w2">{{item.receiptDate}}</div>
+								<div class="td w2">{{item.receiptDate?item.receiptDate.split(" ")[0]:""}}</div>
 								<div class="td w2">{{toMoneyCode(dataForm.moneyCode)}}{{item.totalPremium}}</div>
 							</div>
 							<div class="separator-h" v-if="index < dataForm.pandupList.length - 1"></div>

@@ -36,8 +36,8 @@
                 <div class="td w2">{{item.insuredName}}</div>
                 <div class="td w1">{{item.productName}}</div>
                 <div class="td w2">{{item.moneyCode}}{{item.amount}}</div>
-                <div class="td w2">{{item.expireAt}}</div>
-                <div class="td w2">{{item.guaranteeAge}}</div>
+                <div class="td w2">{{item.expireAt?item.expireAt.split(" ")[0]:""}}</div>
+                <div class="td w2">{{item.guaranteeAge?item.guaranteeAge.split(" ")[0]:""}}</div>
               </div>
               <div class="separator-h" v-if="index < myPolicyList.length - 1 && index < maxShow - 1"></div>
             </template>

@@ -12,6 +12,10 @@ import Auth from '@components/auth/auth.vue';
 import modalComp from '@/components/modal-comp/modal-comp.vue';
 import modalSimpleComp from '@/components/modal-simple-comp/modal-simple-comp.vue';
 import DatePicker from '@/components/date-picker/date-picker.vue'
+import Vue from 'vue';
+import { Loading } from 'vant';
+Vue.use(Loading);
+
 
 export default {
 	data() {
@@ -103,6 +107,9 @@ export default {
 		initData() {
 			httpPost({ url: api.profile, sid: true }).then(content => {
 				this.information = content;
+				if(content && content.birthDate){
+					this.birthDate = content.birthDate;
+				}
 			})
 		},
 		onUpdateHandler() {
@@ -263,7 +270,9 @@ export default {
 			}
 		},
 		userLogout() {
-			this.showForm = false;
+			this.$router.push({
+				path : "/"
+			});
 		},
 		userLogin(data) {
 			this.showForm = true;

@@ -101,7 +101,10 @@
 
 			</div>
 			<div class="login-btn-wrap">
-				<div @click="onUpdateHandler()" class="login-submit pointer" :class="{disabled: submitBtnDisabled}">{{$t('infomationImprove.submit')}}</div>
+				<div @click="onUpdateHandler()" class="login-submit pointer flex-center" :class="{disabled: submitBtnDisabled}">
+					<van-loading v-if="loading" />
+					<span>{{$t('infomationImprove.submit')}}</span>
+				</div>
 			</div>
 		  </template>
         </div>

@@ -113,6 +113,11 @@ export default {
 			let b4 = !this.values.token;
 			let b5 = this.values.vcodeuuid && !this.loginForm.imageValue;
 			return b1 || b2 || b3 || b4 || b5;
+		},
+		submitDisabled() {
+			let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false;
+			let b2 = this.values.passwordRepeat != this.values.password ? true : false;
+			return b1 || b2;
 		}
 	},
 	methods: {
@@ -278,9 +283,16 @@ export default {
 					// 这个是用户OTP验证成功后没有账号导致
 					this.type = 3;
 					break;
+				case "COMMON_ERROR_009":
+					this.errorTips.p5 = response.returnMsg;
+					break;
 				default:
-					this.errorTips.e2 = this.i18n.login.tips.e5;
-					this.errorTips.oe2 = this.i18n.login.tips.e5;
+					if (this.type == 3) {
+						this.errorTips.p5 = response.returnMsg;
+					} else {
+						this.errorTips.e2 = this.i18n.login.tips.e5;
+						this.errorTips.oe2 = this.i18n.login.tips.e5;
+					}
 					// this.showModal(this.i18n.login.tips.e5, "info");
 					break;
 			}
@@ -496,11 +508,15 @@ export default {
 					mobileNo: this.loginForm.mobileNo,
 					loginPwd: passwordEncrypt(this.values.password)
 				};
+				this.loading = true;
 				httpPost({
 					url: api.otpRegisterAndLogin,
 					data: data
 				}).then(response => {
+					this.loading = false;
 					this._handlerLoginResponse(response);
+				}).catch(e => {
+					this.loading = false;
 				})
 			}
 		},

@@ -91,7 +91,7 @@
     padding-left: 1rem;
 
     .check {
-      height: 1rem;
+      height: 1.3rem;
       margin-right: .6rem;
     }
 

@@ -169,7 +169,7 @@
 							</div>
 						</div>
 					</div>
-					<div @click="onRegisterHandler()" class="login-submit pointer flex-center">
+					<div @click="onRegisterHandler()" class="login-submit pointer flex-center" :class="{disabled: submitDisabled}">
 						<van-loading v-if="loading" />
 						<span>{{$t('register.sure')}}</span>
 					</div>

@@ -22,7 +22,10 @@ export default {
 		},
 		toReservation() {
 			this.$router.push({
-				path: "/reservation"
+				path: "/custom/service",
+				query: {
+					q: "m6"
+				}
 			});
 		}
 	},

@@ -85,8 +85,8 @@ export default {
 			return b1 || b2 || b3 || b4;
 		},
 		submitDisabled() {
-			let b1 = !this.values.password ? true : false;
-			let b2 = !this.values.passwordRepeat ? true : false;
+			let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false;
+			let b2 = this.values.passwordRepeat != this.values.password ? true : false;
 			return b1 || b2;
 		}
 	},

@@ -77,11 +77,11 @@
 				</div>
 				<!-- 输入密码 -->
 				<div v-if="type == 2" class="login">
-					<div class="login-tit">
+					<!-- <div class="login-tit">
 						<img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
 						<img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
 						<img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
-					</div>
+					</div> -->
 					<div class="login-tit2">{{$t('register.title2')}}</div>
 					<div class="gird-g form">
 						<div class="pure-u-1 form-item">