Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
35af58f3 by joe
Options

部分修改备份

1 parent 26117ad8
Inline Side-by-side
Showing 14 changed files with 54 additions and 23 deletions
...@@ -222,9 +222,9 @@ module.exports = { ...@@ -222,9 +222,9 @@ module.exports = {
222 protocol: "《平安一賬通會員服務協議》", 222 protocol: "《平安一賬通會員服務協議》",
223 register: "點擊註冊", 223 register: "點擊註冊",
224 newPassword: "新密碼", 224 newPassword: "新密碼",
225 newPasswordPlaceholder: "輸入登錄密碼", 225 newPasswordPlaceholder: "請輸入新密碼",
226 newPasswordSure: "確認密碼", 226 newPasswordSure: "確認密碼",
227 newPasswordSurePlaceholder: "輸入登錄密碼", 227 newPasswordSurePlaceholder: "請再次輸入新密碼",
228 sure: "確認", 228 sure: "確認",
229 tips: { 229 tips: {
230 e1: "手機號不正確，請輸入正確的手機號", 230 e1: "手機號不正確，請輸入正確的手機號",
......
...@@ -224,9 +224,9 @@ module.exports = { ...@@ -224,9 +224,9 @@ module.exports = {
224 protocol: "《平安一账通会员服务协议》", 224 protocol: "《平安一账通会员服务协议》",
225 register: "点击注册", 225 register: "点击注册",
226 newPassword: "新密码", 226 newPassword: "新密码",
227 newPasswordPlaceholder: "输入登录密码", 227 newPasswordPlaceholder: "请输入新密码",
228 newPasswordSure: "确认密码", 228 newPasswordSure: "确认密码",
229 newPasswordSurePlaceholder: "输入登录密码", 229 newPasswordSurePlaceholder: "请再次输入新密码",
230 sure: "确认", 230 sure: "确认",
231 tips: { 231 tips: {
232 e1: "手机号不正确，请输入正确的手机号", 232 e1: "手机号不正确，请输入正确的手机号",
......
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 this.loginHandler(); 109 this.loginHandler();
110 break; 110 break;
111 case "gotoVHIS": 111 case "gotoVHIS":
112 gotoVHIS(this.locale); 112 gotoVHIS(this.$i18n.locale);
113 break; 113 break;
114 } 114 }
115 } 115 }
......
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
74 this.loginHandler(); 74 this.loginHandler();
75 break; 75 break;
76 case "gotoVHIS": 76 case "gotoVHIS":
77 gotoVHIS(this.locale); 77 gotoVHIS(this.$i18n.locale);
78 break; 78 break;
79 } 79 }
80 } 80 }
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <div class="data-line"> 28 <div class="data-line">
29 <div class="cell1"> 29 <div class="cell1">
30 <div class="label">{{$t('customService.insuranceQuery.t2n3')}}</div> 30 <div class="label">{{$t('customService.insuranceQuery.t2n3')}}</div>
31 <div class="label">{{dataForm.activeDate}}</div> 31 <div class="label">{{dataForm.activeDate?dataForm.activeDate.split(" ")[0]:""}}</div>
32 </div> 32 </div>
33 <div class="separator-v"></div> 33 <div class="separator-v"></div>
34 <div class="cell1"> 34 <div class="cell1">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 <div class="data-line"> 52 <div class="data-line">
53 <div class="cell1"> 53 <div class="cell1">
54 <div class="label">{{$t('customService.insuranceQuery.t2n7')}}</div> 54 <div class="label">{{$t('customService.insuranceQuery.t2n7')}}</div>
55 <div class="label">{{dataForm.insuredBirthday}}</div> 55 <div class="label">{{dataForm.insuredBirthday?dataForm.insuredBirthday.split(" ")[0]:""}}</div>
56 </div> 56 </div>
57 <div class="separator-v"></div> 57 <div class="separator-v"></div>
58 <div class="cell1"> 58 <div class="cell1">
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 <div class="data-line"> 87 <div class="data-line">
88 <div class="cell1"> 88 <div class="cell1">
89 <div class="label">{{$t('customService.insuranceQuery.t3n3')}}</div> 89 <div class="label">{{$t('customService.insuranceQuery.t3n3')}}</div>
90 <div class="label">{{dataForm.clientBirthday}}</div> 90 <div class="label">{{dataForm.clientBirthday?dataForm.clientBirthday.split(" ")[0]:""}}</div>
91 </div> 91 </div>
92 <div class="separator-v"></div> 92 <div class="separator-v"></div>
93 <div class="cell1"> 93 <div class="cell1">
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
219 <div class="data-line"> 219 <div class="data-line">
220 <div class="td w2">{{item.paidPeriod}}</div> 220 <div class="td w2">{{item.paidPeriod}}</div>
221 <div class="td w2">{{item.payType}}</div> 221 <div class="td w2">{{item.payType}}</div>
222 <div class="td w2">{{item.receiptDate}}</div> 222 <div class="td w2">{{item.receiptDate?item.receiptDate.split(" ")[0]:""}}</div>
223 <div class="td w2">{{toMoneyCode(dataForm.moneyCode)}}{{item.totalPremium}}</div> 223 <div class="td w2">{{toMoneyCode(dataForm.moneyCode)}}{{item.totalPremium}}</div>
224 </div> 224 </div>
225 <div class="separator-h" v-if="index < dataForm.pandupList.length - 1"></div> 225 <div class="separator-h" v-if="index < dataForm.pandupList.length - 1"></div>
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
36 <div class="td w2">{{item.insuredName}}</div> 36 <div class="td w2">{{item.insuredName}}</div>
37 <div class="td w1">{{item.productName}}</div> 37 <div class="td w1">{{item.productName}}</div>
38 <div class="td w2">{{item.moneyCode}}{{item.amount}}</div> 38 <div class="td w2">{{item.moneyCode}}{{item.amount}}</div>
39 <div class="td w2">{{item.expireAt}}</div> 39 <div class="td w2">{{item.expireAt?item.expireAt.split(" ")[0]:""}}</div>
40 <div class="td w2">{{item.guaranteeAge}}</div> 40 <div class="td w2">{{item.guaranteeAge?item.guaranteeAge.split(" ")[0]:""}}</div>
41 </div> 41 </div>
42 <div class="separator-h" v-if="index < myPolicyList.length - 1 && index < maxShow - 1"></div> 42 <div class="separator-h" v-if="index < myPolicyList.length - 1 && index < maxShow - 1"></div>
43 </template> 43 </template>
......
...@@ -12,6 +12,10 @@ import Auth from '@components/auth/auth.vue'; ...@@ -12,6 +12,10 @@ import Auth from '@components/auth/auth.vue';
12 import modalComp from '@/components/modal-comp/modal-comp.vue'; 12 import modalComp from '@/components/modal-comp/modal-comp.vue';
13 import modalSimpleComp from '@/components/modal-simple-comp/modal-simple-comp.vue'; 13 import modalSimpleComp from '@/components/modal-simple-comp/modal-simple-comp.vue';
14 import DatePicker from '@/components/date-picker/date-picker.vue' 14 import DatePicker from '@/components/date-picker/date-picker.vue'
15 import Vue from 'vue';
16 import { Loading } from 'vant';
17 Vue.use(Loading);
18
15 19
16 export default { 20 export default {
17 data() { 21 data() {
...@@ -103,6 +107,9 @@ export default { ...@@ -103,6 +107,9 @@ export default {
103 initData() { 107 initData() {
104 httpPost({ url: api.profile, sid: true }).then(content => { 108 httpPost({ url: api.profile, sid: true }).then(content => {
105 this.information = content; 109 this.information = content;
110 if(content && content.birthDate){
111 this.birthDate = content.birthDate;
112 }
106 }) 113 })
107 }, 114 },
108 onUpdateHandler() { 115 onUpdateHandler() {
...@@ -263,7 +270,9 @@ export default { ...@@ -263,7 +270,9 @@ export default {
263 } 270 }
264 }, 271 },
265 userLogout() { 272 userLogout() {
266 this.showForm = false; 273 this.$router.push({
274 path : "/"
275 });
267 }, 276 },
268 userLogin(data) { 277 userLogin(data) {
269 this.showForm = true; 278 this.showForm = true;
......
...@@ -101,7 +101,10 @@ ...@@ -101,7 +101,10 @@
101 101
102 </div> 102 </div>
103 <div class="login-btn-wrap"> 103 <div class="login-btn-wrap">
104 <div @click="onUpdateHandler()" class="login-submit pointer" :class="{disabled: submitBtnDisabled}">{{$t('infomationImprove.submit')}}</div> 104 <div @click="onUpdateHandler()" class="login-submit pointer flex-center" :class="{disabled: submitBtnDisabled}">
105 <van-loading v-if="loading" />
106 <span>{{$t('infomationImprove.submit')}}</span>
107 </div>
105 </div> 108 </div>
106 </template> 109 </template>
107 </div> 110 </div>
......
...@@ -113,6 +113,11 @@ export default { ...@@ -113,6 +113,11 @@ export default {
113 let b4 = !this.values.token; 113 let b4 = !this.values.token;
114 let b5 = this.values.vcodeuuid && !this.loginForm.imageValue; 114 let b5 = this.values.vcodeuuid && !this.loginForm.imageValue;
115 return b1 || b2 || b3 || b4 || b5; 115 return b1 || b2 || b3 || b4 || b5;
116 },
117 submitDisabled() {
118 let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false;
119 let b2 = this.values.passwordRepeat != this.values.password ? true : false;
120 return b1 || b2;
116 } 121 }
117 }, 122 },
118 methods: { 123 methods: {
...@@ -278,9 +283,16 @@ export default { ...@@ -278,9 +283,16 @@ export default {
278 // 这个是用户OTP验证成功后没有账号导致 283 // 这个是用户OTP验证成功后没有账号导致
279 this.type = 3; 284 this.type = 3;
280 break; 285 break;
286 case "COMMON_ERROR_009":
287 this.errorTips.p5 = response.returnMsg;
288 break;
281 default: 289 default:
282 this.errorTips.e2 = this.i18n.login.tips.e5; 290 if (this.type == 3) {
283 this.errorTips.oe2 = this.i18n.login.tips.e5; 291 this.errorTips.p5 = response.returnMsg;
292 } else {
293 this.errorTips.e2 = this.i18n.login.tips.e5;
294 this.errorTips.oe2 = this.i18n.login.tips.e5;
295 }
284 // this.showModal(this.i18n.login.tips.e5, "info"); 296 // this.showModal(this.i18n.login.tips.e5, "info");
285 break; 297 break;
286 } 298 }
...@@ -496,11 +508,15 @@ export default { ...@@ -496,11 +508,15 @@ export default {
496 mobileNo: this.loginForm.mobileNo, 508 mobileNo: this.loginForm.mobileNo,
497 loginPwd: passwordEncrypt(this.values.password) 509 loginPwd: passwordEncrypt(this.values.password)
498 }; 510 };
511 this.loading = true;
499 httpPost({ 512 httpPost({
500 url: api.otpRegisterAndLogin, 513 url: api.otpRegisterAndLogin,
501 data: data 514 data: data
502 }).then(response => { 515 }).then(response => {
516 this.loading = false;
503 this._handlerLoginResponse(response); 517 this._handlerLoginResponse(response);
518 }).catch(e => {
519 this.loading = false;
504 }) 520 })
505 } 521 }
506 }, 522 },
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 padding-left: 1rem; 91 padding-left: 1rem;
92 92
93 .check { 93 .check {
94 height: 1rem; 94 height: 1.3rem;
95 margin-right: .6rem; 95 margin-right: .6rem;
96 } 96 }
97 97
......
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </div> 169 </div>
170 </div> 170 </div>
171 </div> 171 </div>
172 <div @click="onRegisterHandler()" class="login-submit pointer flex-center"> 172 <div @click="onRegisterHandler()" class="login-submit pointer flex-center" :class="{disabled: submitDisabled}">
173 <van-loading v-if="loading" /> 173 <van-loading v-if="loading" />
174 <span>{{$t('register.sure')}}</span> 174 <span>{{$t('register.sure')}}</span>
175 </div> 175 </div>
......
...@@ -22,7 +22,10 @@ export default { ...@@ -22,7 +22,10 @@ export default {
22 }, 22 },
23 toReservation() { 23 toReservation() {
24 this.$router.push({ 24 this.$router.push({
25 path: "/reservation" 25 path: "/custom/service",
26 query: {
27 q: "m6"
28 }
26 }); 29 });
27 } 30 }
28 }, 31 },
......
...@@ -85,8 +85,8 @@ export default { ...@@ -85,8 +85,8 @@ export default {
85 return b1 || b2 || b3 || b4; 85 return b1 || b2 || b3 || b4;
86 }, 86 },
87 submitDisabled() { 87 submitDisabled() {
88 let b1 = !this.values.password ? true : false; 88 let b1 = !this.values.password || this.checkPassword(this.values.password) ? true : false;
89 let b2 = !this.values.passwordRepeat ? true : false; 89 let b2 = this.values.passwordRepeat != this.values.password ? true : false;
90 return b1 || b2; 90 return b1 || b2;
91 } 91 }
92 }, 92 },
......
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
77 </div> 77 </div>
78 <!-- 输入密码 --> 78 <!-- 输入密码 -->
79 <div v-if="type == 2" class="login"> 79 <div v-if="type == 2" class="login">
80 <div class="login-tit"> 80 <!-- <div class="login-tit">
81 <img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png"> 81 <img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
82 <img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png"> 82 <img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
83 <img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png"> 83 <img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
84 </div> 84 </div> -->
85 <div class="login-tit2">{{$t('register.title2')}}</div> 85 <div class="login-tit2">{{$t('register.title2')}}</div>
86 <div class="gird-g form"> 86 <div class="gird-g form">
87 <div class="pure-u-1 form-item"> 87 <div class="pure-u-1 form-item">
......