Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
fdd9b48f by joe
Options

临时存储

1 parent 42756bf9
Inline Side-by-side
Showing 23 changed files with 69 additions and 34 deletions
1 NODE_ENV = 'development' 1 NODE_ENV = 'development'
2 VUE_APP_TITLE = 'development' 2 VUE_APP_TITLE = 'development'
3 VUE_APP_BASE_URL= 'https://ow.go.qudone.com' 3 VUE_APP_BASE_URL= 'http://192.168.0.109:9101'
4 VUE_APP_RSA_PUBLIC_KEY = 'B5FE03847F02046C47292AF0FF2DE88977241483DD40C123046EB39CBE4C48167B120096CFF12CD16559322884A3C56FA92B07B89AB51FC8C91A75127622151DDD730DFF1F993D5A290CEAC0BBA7FC88285D8994ACBAFF50101EDE9A0925AD5DFFAFE96D53C370E9C5B37DF2F871F81C4D7CA6B7EC37FF459C07975AD9A74A95' 4 VUE_APP_RSA_PUBLIC_KEY = 'B5FE03847F02046C47292AF0FF2DE88977241483DD40C123046EB39CBE4C48167B120096CFF12CD16559322884A3C56FA92B07B89AB51FC8C91A75127622151DDD730DFF1F993D5A290CEAC0BBA7FC88285D8994ACBAFF50101EDE9A0925AD5DFFAFE96D53C370E9C5B37DF2F871F81C4D7CA6B7EC37FF459C07975AD9A74A95'
5 VUE_APP_RSA_KEY_INDEX = '10001' 5 VUE_APP_RSA_KEY_INDEX = '10001'
6 VUE_APP_VHIS_INDEX= 'http://154.213.4.36/index.html' 6 VUE_APP_VHIS_INDEX= 'http://154.213.4.36/index.html'
......
...@@ -296,6 +296,14 @@ input::-webkit-search-cancel-button { ...@@ -296,6 +296,14 @@ input::-webkit-search-cancel-button {
296 opacity: 1; 296 opacity: 1;
297 } 297 }
298 298
299 input::-webkit-input-placeholder {
300 color: $cGray2;
301 }
302
303 textarea::-webkit-input-placeholder {
304 color: $cGray2;
305 }
306
299 select, 307 select,
300 input, 308 input,
301 option { 309 option {
......

431 Bytes | W: | H:

1.14 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -257,9 +257,9 @@ module.exports = { ...@@ -257,9 +257,9 @@ module.exports = {
257 type1: { 257 type1: {
258 title: "Retrieve password", 258 title: "Retrieve password",
259 t1: "Please enter user information", 259 t1: "Please enter user information",
260 t1Placeholder: "Mobile no./ One Connect User Name", 260 t1Placeholder: "Mobile no./ ID no.",
261 submit: "Confirm", 261 submit: "Confirm",
262 error: "Invalid mobile no./ user name, please re-enter", 262 error: "Invalid mobile no./ ID no., please re-enter",
263 }, 263 },
264 type2: { 264 type2: {
265 title: "Retrieve password", 265 title: "Retrieve password",
......
...@@ -259,7 +259,7 @@ module.exports = { ...@@ -259,7 +259,7 @@ module.exports = {
259 type1: { 259 type1: {
260 title: "密碼找回", 260 title: "密碼找回",
261 t1: "用戶輸入信息", 261 t1: "用戶輸入信息",
262 t1Placeholder: "手機號/一賬通用戶名/證件號", 262 t1Placeholder: "手機號/證件號",
263 submit: "確認", 263 submit: "確認",
264 error: "您的手機號或證件號輸入錯誤，請核對后重新輸入", 264 error: "您的手機號或證件號輸入錯誤，請核對后重新輸入",
265 }, 265 },
......
...@@ -258,7 +258,7 @@ module.exports = { ...@@ -258,7 +258,7 @@ module.exports = {
258 type1: { 258 type1: {
259 title: "密码找回", 259 title: "密码找回",
260 t1: "用户输入信息", 260 t1: "用户输入信息",
261 t1Placeholder: "手机号/一账通用户名/证件号", 261 t1Placeholder: "手机号/证件号",
262 submit: "确认", 262 submit: "确认",
263 error: "您的手机号或证件号输入错误，请核对后重新输入", 263 error: "您的手机号或证件号输入错误，请核对后重新输入",
264 }, 264 },
......
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
121 onLoginHandler() { 121 onLoginHandler() {
122 if (this.$route.name == "login") { 122 if (this.$route.name == "login") {
123 return; 123 return;
124 } else if (this.$route.name == "register") { 124 } else if (this.$route.name == "register" || this.$route.name == "passwordFind") {
125 this.$router.push({ path: "/login" }); 125 this.$router.push({ path: "/login" });
126 } else { 126 } else {
127 let callback = this.$route.fullPath; 127 let callback = this.$route.fullPath;
......
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
86 onLoginHandler() { 86 onLoginHandler() {
87 if (this.$route.name == "login") { 87 if (this.$route.name == "login") {
88 return; 88 return;
89 } else if (this.$route.name == "register") { 89 } else if (this.$route.name == "register" || this.$route.name == "passwordFind") {
90 this.$router.push({ path: "/login" }); 90 this.$router.push({ path: "/login" });
91 } else { 91 } else {
92 let callback = this.$route.fullPath; 92 let callback = this.$route.fullPath;
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
13 13
14 .overlay { 14 .overlay {
15 position: absolute; 15 position: absolute;
16 top: 0;
17 left: 0;
16 width: 100%; 18 width: 100%;
17 height: 100%; 19 height: 100%;
18 background: rgba($color: #000000, $alpha: 0.7); 20 background: rgba($color: #000000, $alpha: 0.7);
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
13 13
14 .overlay { 14 .overlay {
15 position: absolute; 15 position: absolute;
16 top: 0;
17 left: 0;
16 width: 100%; 18 width: 100%;
17 height: 100%; 19 height: 100%;
18 background: rgba($color: #000000, $alpha: 0.7); 20 background: rgba($color: #000000, $alpha: 0.7);
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
13 13
14 .overlay { 14 .overlay {
15 position: absolute; 15 position: absolute;
16 top: 0;
17 left: 0;
16 width: 100%; 18 width: 100%;
17 height: 100%; 19 height: 100%;
18 background: rgba($color: #000000, $alpha: 0.7); 20 background: rgba($color: #000000, $alpha: 0.7);
......
...@@ -37,7 +37,8 @@ export default { ...@@ -37,7 +37,8 @@ export default {
37 policyNumberErr: "", 37 policyNumberErr: "",
38 contactDateErr: "" 38 contactDateErr: ""
39 }, 39 },
40 40 // 联系方式
41 contentMethodPlaceHolder: "",
41 modalSimpleVisiable: false, 42 modalSimpleVisiable: false,
42 modalVisiable: false, 43 modalVisiable: false,
43 targetPath: "", 44 targetPath: "",
...@@ -166,6 +167,18 @@ export default { ...@@ -166,6 +167,18 @@ export default {
166 return false; 167 return false;
167 } 168 }
168 return true; 169 return true;
170 },
171 userLogin(uinfo) {
172 if (uinfo && uinfo.hadFullInfo == "1") {
173 httpPost({ url: api.profile, sid: true }).then(res => {
174 if(res && res.fullName){
175 this.data.name = res.fullName;
176 this.data.contactMethod = res.mobileNo;
177 }
178 }).catch(err=>{
179
180 });
181 }
169 } 182 }
170 }, 183 },
171 watch: { 184 watch: {
......
1 @import '@/styles/_support'; 1 @import '@/styles/_support';
2 2
3 input::-webkit-input-placeholder {
4 color: $cGray2;
5 }
6
7 textarea::-webkit-input-placeholder {
8 color:$cGray2;
9 }
10
11 .top-space { 3 .top-space {
12 // height: 4.25rem; 4 // height: 4.25rem;
13 } 5 }
......
1 1
2 <template> 2 <template>
3 <div> 3 <div>
4 <auth :model="'suggest'" ref="auth"></auth> 4 <auth :model="'suggest'" @onLogin="userLogin" ref="auth"></auth>
5 <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp> 5 <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp>
6 <div class="reservation-container"> 6 <div class="reservation-container">
7 <!-- 顶头iterm --> 7 <!-- 顶头iterm -->
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </div>{{contactTypeShow}} 41 </div>{{contactTypeShow}}
42 </div> 42 </div>
43 <div class="ipt-wrap"> 43 <div class="ipt-wrap">
44 <input class="ipt mail-ipt" type="text" :class="{err : errorTips.contactMethodErr.length > 0}" v-model="data.contactMethod"> 44 <input class="ipt mail-ipt" type="text" :class="{err : errorTips.contactMethodErr.length > 0}" v-model="data.contactMethod" :placeholder="contentMethodPlaceHolder">
45 </div> 45 </div>
46 <div class="validator" v-if="errorTips.contactMethodErr.length > 0"> 46 <div class="validator" v-if="errorTips.contactMethodErr.length > 0">
47 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.contactMethodErr}} 47 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.contactMethodErr}}
......
...@@ -141,6 +141,18 @@ export default { ...@@ -141,6 +141,18 @@ export default {
141 return false; 141 return false;
142 } 142 }
143 return true; 143 return true;
144 },
145 userLogin(uinfo) {
146 if (uinfo && uinfo.hadFullInfo == "1") {
147 httpPost({ url: api.profile, sid: true }).then(res => {
148 if(res && res.fullName){
149 this.data.name = res.fullName;
150 this.data.contactMethod = res.mobileNo;
151 }
152 }).catch(err=>{
153
154 });
155 }
144 } 156 }
145 }, 157 },
146 watch: { 158 watch: {
......
...@@ -7,14 +7,6 @@ input { ...@@ -7,14 +7,6 @@ input {
7 color: #333333; 7 color: #333333;
8 } 8 }
9 9
10 input::-webkit-input-placeholder {
11 color: #494949;
12 }
13
14 textarea::-webkit-input-placeholder {
15 color: #494949;
16 }
17
18 .top-space {} 10 .top-space {}
19 11
20 .reservation-container { 12 .reservation-container {
......
1 1
2 <template> 2 <template>
3 <div> 3 <div>
4 <auth :model="'suggest'" ref="auth"></auth> 4 <auth :model="'suggest'" @onLogin="userLogin" ref="auth"></auth>
5 <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp> 5 <modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp>
6 6
7 <div class="reservation-container"> 7 <div class="reservation-container">
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 </div> 58 </div>
59 </div> 59 </div>
60 <div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol"> 60 <div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
61 <img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png"> 61 <img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
62 <img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png">{{$t('login.agree')}} 62 <img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png">{{$t('login.agree')}}
63 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span> 63 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
64 </div> 64 </div>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 </div> 124 </div>
125 </div> 125 </div>
126 <div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol"> 126 <div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
127 <img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png"> 127 <img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
128 <img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}} 128 <img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}}
129 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span> 129 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
130 </div> 130 </div>
......
...@@ -286,6 +286,9 @@ export default { ...@@ -286,6 +286,9 @@ export default {
286 } else { 286 } else {
287 287
288 } 288 }
289 },
290 showSuccessModel() {
291 this.showModal("", "succ");
289 } 292 }
290 }, 293 },
291 watch: { 294 watch: {
...@@ -307,7 +310,9 @@ export default { ...@@ -307,7 +310,9 @@ export default {
307 } 310 }
308 }, 311 },
309 }, 312 },
310 mounted() { }, 313 mounted() {
314 window.showSuccessModelTest = this.showSuccessModel;
315 },
311 created() { }, 316 created() { },
312 components: { 317 components: {
313 modalComp, 318 modalComp,
......
...@@ -150,11 +150,17 @@ export default { ...@@ -150,11 +150,17 @@ export default {
150 } 150 }
151 }, 151 },
152 userLogout() { 152 userLogout() {
153 this.$router.push({
154 path : "/"
155 });
153 this.showForm = false; 156 this.showForm = false;
154 }, 157 },
155 userLogin(data) { 158 userLogin(data) {
156 this.showForm = true; 159 this.showForm = true;
157 } 160 },
161 showSuccessModel(){
162 this.showModal("","succ");
163 }
158 }, 164 },
159 watch: { 165 watch: {
160 'values.oldPwd': function () { 166 'values.oldPwd': function () {
...@@ -181,6 +187,7 @@ export default { ...@@ -181,6 +187,7 @@ export default {
181 }, 187 },
182 mounted() { 188 mounted() {
183 // this.showModal("success", "succ"); 189 // this.showModal("success", "succ");
190 window.showSuccessModelTest = this.showSuccessModel;
184 }, 191 },
185 created() { }, 192 created() { },
186 components: { 193 components: {
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </div> 69 </div>
70 70
71 <div class="login-protocol pointer" @click="registerCheck.agreeProtocol = !registerCheck.agreeProtocol"> 71 <div class="login-protocol pointer" @click="registerCheck.agreeProtocol = !registerCheck.agreeProtocol">
72 <img v-if="!registerCheck.agreeProtocol" class="check" src="@/assets/images/login/un-check.png"> 72 <img v-if="!registerCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
73 <img v-if="registerCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}} 73 <img v-if="registerCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}}
74 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span> 74 &nbsp;<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
75 </div> 75 </div>
......
...@@ -257,12 +257,12 @@ export function throttle(func, wait, type) { ...@@ -257,12 +257,12 @@ export function throttle(func, wait, type) {
257 export function contactMethodCheck(type, value) { 257 export function contactMethodCheck(type, value) {
258 if (type == 'hkmobile') { 258 if (type == 'hkmobile') {
259 // return /^[5689]{1}\d{7}$/.test(value); 259 // return /^[5689]{1}\d{7}$/.test(value);
260 return /^\d{8}$/.test(value); 260 return /^(\\+852)?\d{8}$/.test(value);
261 } 261 }
262 262
263 if (type == 'mobile') { 263 if (type == 'mobile') {
264 // 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); 264 // 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);
265 return /^1\d{10}$/.test(value); 265 return /^(\\+86)?1\d{10}$/.test(value);
266 } 266 }
267 267
268 if (type == 'email') { 268 if (type == 'email') {
......