临时存储

 NODE_ENV = 'development'
 VUE_APP_TITLE = 'development'
-VUE_APP_BASE_URL= 'https://ow.go.qudone.com'
+VUE_APP_BASE_URL= 'http://192.168.0.109:9101'
 VUE_APP_RSA_PUBLIC_KEY = 'B5FE03847F02046C47292AF0FF2DE88977241483DD40C123046EB39CBE4C48167B120096CFF12CD16559322884A3C56FA92B07B89AB51FC8C91A75127622151DDD730DFF1F993D5A290CEAC0BBA7FC88285D8994ACBAFF50101EDE9A0925AD5DFFAFE96D53C370E9C5B37DF2F871F81C4D7CA6B7EC37FF459C07975AD9A74A95'
 VUE_APP_RSA_KEY_INDEX = '10001'
 VUE_APP_VHIS_INDEX= 'http://154.213.4.36/index.html'

@@ -296,6 +296,14 @@ input::-webkit-search-cancel-button {
   opacity: 1;
 }
 
+input::-webkit-input-placeholder {
+  color: $cGray2;
+}
+
+textarea::-webkit-input-placeholder {
+  color: $cGray2;
+}
+
 select,
 input,
 option {

@@ -257,9 +257,9 @@ module.exports = {
 		type1: {
 			title: "Retrieve password",
 			t1: "Please enter user information",
-			t1Placeholder: "Mobile no./ One Connect User Name",
+			t1Placeholder: "Mobile no./ ID no.",
 			submit: "Confirm",
-			error: "Invalid mobile no./ user name, please re-enter",
+			error: "Invalid mobile no./ ID no., please re-enter",
 		},
 		type2: {
 			title: "Retrieve password",

@@ -259,7 +259,7 @@ module.exports = {
 		type1: {
 			title: "密碼找回",
 			t1: "用戶輸入信息",
-			t1Placeholder: "手機號/一賬通用戶名/證件號",
+			t1Placeholder: "手機號/證件號",
 			submit: "確認",
 			error: "您的手機號或證件號輸入錯誤，請核對后重新輸入",
 		},

@@ -258,7 +258,7 @@ module.exports = {
 		type1: {
 			title: "密码找回",
 			t1: "用户输入信息",
-			t1Placeholder: "手机号/一账通用户名/证件号",
+			t1Placeholder: "手机号/证件号",
 			submit: "确认",
 			error: "您的手机号或证件号输入错误，请核对后重新输入",
 		},

@@ -121,7 +121,7 @@ export default {
 		onLoginHandler() {
 			if (this.$route.name == "login") {
 				return;
-			} else if (this.$route.name == "register") {
+			} else if (this.$route.name == "register" || this.$route.name == "passwordFind") {
 				this.$router.push({ path: "/login" });
 			} else {
 				let callback = this.$route.fullPath;

@@ -86,7 +86,7 @@ export default {
 		onLoginHandler() {
 			if (this.$route.name == "login") {
 				return;
-			} else if (this.$route.name == "register") {
+			} else if (this.$route.name == "register" || this.$route.name == "passwordFind") {
 				this.$router.push({ path: "/login" });
 			} else {
 				let callback = this.$route.fullPath;

@@ -13,6 +13,8 @@
 
 .overlay {
   position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
   background: rgba($color: #000000, $alpha: 0.7);

@@ -13,6 +13,8 @@
 
 .overlay {
   position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
   background: rgba($color: #000000, $alpha: 0.7);

@@ -13,6 +13,8 @@
 
 .overlay {
   position: absolute;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
   background: rgba($color: #000000, $alpha: 0.7);

@@ -37,7 +37,8 @@ export default {
 				policyNumberErr: "",
 				contactDateErr: ""
 			},
-
+			// 联系方式
+			contentMethodPlaceHolder: "",
 			modalSimpleVisiable: false,
 			modalVisiable: false,
 			targetPath: "",
@@ -166,6 +167,18 @@ export default {
 				return false;
 			}
 			return true;
+		},
+		userLogin(uinfo) {
+			if (uinfo && uinfo.hadFullInfo == "1") {
+				httpPost({ url: api.profile, sid: true }).then(res => {
+					if(res && res.fullName){
+						this.data.name = res.fullName;
+						this.data.contactMethod = res.mobileNo;
+					}
+				}).catch(err=>{
+
+				});
+			}
 		}
 	},
 	watch: {

 @import '@/styles/_support';
 
-input::-webkit-input-placeholder {
-  color: $cGray2;
-}
-
-textarea::-webkit-input-placeholder {
-  color:$cGray2;
-}
-
 .top-space {
   // height: 4.25rem;
 }

 
 <template>
 	<div>
-		<auth :model="'suggest'" ref="auth"></auth>
+		<auth :model="'suggest'" @onLogin="userLogin"  ref="auth"></auth>
     	<modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp>
 		<div class="reservation-container">
 			<!-- 顶头iterm -->
@@ -41,7 +41,7 @@
 							</div>{{contactTypeShow}}
 					</div>
 					<div class="ipt-wrap">
-						<input class="ipt mail-ipt" type="text" :class="{err : errorTips.contactMethodErr.length > 0}" v-model="data.contactMethod">
+						<input class="ipt mail-ipt" type="text" :class="{err : errorTips.contactMethodErr.length > 0}" v-model="data.contactMethod" :placeholder="contentMethodPlaceHolder">
 					</div>
 					<div class="validator" v-if="errorTips.contactMethodErr.length > 0">
 						<img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.contactMethodErr}}

@@ -141,6 +141,18 @@ export default {
 				return false;
 			}
 			return true;
+		},
+		userLogin(uinfo) {
+			if (uinfo && uinfo.hadFullInfo == "1") {
+				httpPost({ url: api.profile, sid: true }).then(res => {
+					if(res && res.fullName){
+						this.data.name = res.fullName;
+						this.data.contactMethod = res.mobileNo;
+					}
+				}).catch(err=>{
+
+				});
+			}
 		}
 	},
 	watch: {

@@ -7,14 +7,6 @@ input {
   color: #333333;
 }
 
-input::-webkit-input-placeholder {
-  color: #494949;
-}
-
-textarea::-webkit-input-placeholder {
-  color: #494949;
-}
-
 .top-space {}
 
 .reservation-container {

 
 <template>
 	<div>
-		<auth :model="'suggest'" ref="auth"></auth>
+		<auth :model="'suggest'" @onLogin="userLogin" ref="auth"></auth>
     	<modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp>
 
 		<div class="reservation-container">

@@ -58,7 +58,7 @@
 						</div>
 					</div>
 					<div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
-						<img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png">
+						<img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
 						<img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png">{{$t('login.agree')}}
 						&nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
 					</div>
@@ -124,7 +124,7 @@
 						</div>
 					</div>
 					<div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
-						<img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png">
+						<img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
 						<img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}}
 						&nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
 					</div>

@@ -286,6 +286,9 @@ export default {
 			} else {
 
 			}
+		},
+		showSuccessModel() {
+			this.showModal("", "succ");
 		}
 	},
 	watch: {
@@ -307,7 +310,9 @@ export default {
 			}
 		},
 	},
-	mounted() { },
+	mounted() {
+		window.showSuccessModelTest = this.showSuccessModel;
+	},
 	created() { },
 	components: {
 		modalComp,

@@ -150,11 +150,17 @@ export default {
 			}
 		},
         userLogout() {
+            this.$router.push({
+				path : "/"
+			});
             this.showForm = false;
         },
         userLogin(data) {
             this.showForm = true;
-        }
+		},
+		showSuccessModel(){
+			this.showModal("","succ");
+		}
 	},
 	watch: {
 		'values.oldPwd': function () {
@@ -181,6 +187,7 @@ export default {
 	},
 	mounted() { 
 		// this.showModal("success", "succ");
+		window.showSuccessModelTest = this.showSuccessModel;
 	},
 	created() { },
 	components: {

@@ -69,7 +69,7 @@
 					</div>
 
 					<div class="login-protocol pointer" @click="registerCheck.agreeProtocol = !registerCheck.agreeProtocol">
-						<img v-if="!registerCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png">
+						<img v-if="!registerCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
 						<img v-if="registerCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}}
 						&nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
 					</div>

@@ -257,12 +257,12 @@ export function throttle(func, wait, type) {
 export function contactMethodCheck(type, value) {
   if (type == 'hkmobile') {
     // return /^[5689]{1}\d{7}$/.test(value);
-    return /^\d{8}$/.test(value);
+    return /^(\\+852)?\d{8}$/.test(value);
   }
 
   if (type == 'mobile') {
     // return /^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0-9])|(18[0-9])|(19[0-9]))\d{8}$/.test(value);
-    return /^1\d{10}$/.test(value);
+    return /^(\\+86)?1\d{10}$/.test(value);
   }
 
   if (type == 'email') {