Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
fab542fb by simon
Options

默认提交

1 parent fe6170b4
Inline Side-by-side
Showing 10 changed files with 63 additions and 22 deletions
...@@ -164,6 +164,7 @@ module.exports = { ...@@ -164,6 +164,7 @@ module.exports = {
164 contactInformation: "Contact Method", 164 contactInformation: "Contact Method",
165 service: "Service Network", 165 service: "Service Network",
166 qrcode: "Official Accounts", 166 qrcode: "Official Accounts",
167 qrcodeBot: "Official WeChat Account",
167 copyright: "版權所有 © 中國平安保險（集團）股份有限公司未經許可不得復制、轉載或摘編，違者必究!" 168 copyright: "版權所有 © 中國平安保險（集團）股份有限公司未經許可不得復制、轉載或摘編，違者必究!"
168 }, 169 },
169 login: { 170 login: {
......
...@@ -166,6 +166,7 @@ module.exports = { ...@@ -166,6 +166,7 @@ module.exports = {
166 contactInformation: "聯絡方式", 166 contactInformation: "聯絡方式",
167 service: "服務網絡", 167 service: "服務網絡",
168 qrcode: "社交媒體", 168 qrcode: "社交媒體",
169 qrcodeBot: "官方公眾號",
169 copyright: "版權所有 © 中國平安保險（集團）股份有限公司未經許可不得復制、轉載或摘編，違者必究!" 170 copyright: "版權所有 © 中國平安保險（集團）股份有限公司未經許可不得復制、轉載或摘編，違者必究!"
170 }, 171 },
171 login: { 172 login: {
......
...@@ -166,6 +166,7 @@ module.exports = { ...@@ -166,6 +166,7 @@ module.exports = {
166 contactInformation: "联系方式", 166 contactInformation: "联系方式",
167 service: "服务网络", 167 service: "服务网络",
168 qrcode: "社交媒体", 168 qrcode: "社交媒体",
169 qrcodeBot: "官方公众号",
169 copyright: "版权所有 © 中国平安保险（集团）股份有限公司未经许可不得复制、转载或摘编，违者必究!" 170 copyright: "版权所有 © 中国平安保险（集团）股份有限公司未经许可不得复制、转载或摘编，违者必究!"
170 }, 171 },
171 login: { 172 login: {
......
...@@ -54,8 +54,12 @@ export default { ...@@ -54,8 +54,12 @@ export default {
54 readonly: { 54 readonly: {
55 type: Boolean, 55 type: Boolean,
56 default: false 56 default: false
57 } 57 },
58 58 // 校验日期是否合法
59 check: {
60 type: Function,
61 default: null
62 },
59 }, 63 },
60 data() { 64 data() {
61 return { 65 return {
...@@ -353,6 +357,31 @@ export default { ...@@ -353,6 +357,31 @@ export default {
353 } 357 }
354 this.dateValue = `${year}-${month}-${date}`; 358 this.dateValue = `${year}-${month}-${date}`;
355 }, 359 },
360 /**
361 * 校验并返回日期
362 * {
363 * dateValue:yyyy-MM-dd,
364 * disable:boolean true:不可用 , false,当前日期可用
365 * }
366 */
367 checkDateValue() {
368 if (this.check) {
369 let disable = false;
370 let dateValue = this.dateValue;
371 let fortmatMonthData = this.fortmatMonthData;
372 fortmatMonthData.forEach((element, idx) => {
373 let curDate = `${element.year}-${element.month}-${element.date}`;
374 if (curDate == dateValue && element.disable == true) {
375 disable = true;
376 }
377 });
378 let result = {
379 dateValue: this.dateValue,
380 disable: disable
381 }
382 this.check(result);
383 }
384 },
356 initData() { 385 initData() {
357 // 设置今天日期 386 // 设置今天日期
358 let isInit = false; 387 let isInit = false;
...@@ -396,7 +425,7 @@ export default { ...@@ -396,7 +425,7 @@ export default {
396 } 425 }
397 this.formatDate(); 426 this.formatDate();
398 }, 427 },
399 judgeLastDateValidate(val){ 428 judgeLastDateValidate(val) {
400 429
401 } 430 }
402 }, 431 },
...@@ -409,8 +438,9 @@ export default { ...@@ -409,8 +438,9 @@ export default {
409 this.dateValue = val; 438 this.dateValue = val;
410 this.initData(); 439 this.initData();
411 }, 440 },
412 dateValue(val,oldVal) { 441 dateValue(val, oldVal) {
413 this.$emit('input', val) 442 this.checkDateValue();
443 this.$emit('input', val);
414 } 444 }
415 } 445 }
416 } 446 }
......
...@@ -14,6 +14,12 @@ export default { ...@@ -14,6 +14,12 @@ export default {
14 }, 14 },
15 components: {}, 15 components: {},
16 methods: { 16 methods: {
17 onOverHandler(event) {
18 this.qrcodeVisible = true;
19 },
20 onOutHandler(event) {
21 this.qrcodeVisible = false;
22 },
17 toPage(name) { 23 toPage(name) {
18 document.documentElement.scrollTop = 0; 24 document.documentElement.scrollTop = 0;
19 document.body.scrollTop = 0; 25 document.body.scrollTop = 0;
...@@ -21,7 +27,7 @@ export default { ...@@ -21,7 +27,7 @@ export default {
21 name: name 27 name: name
22 }) 28 })
23 }, 29 },
24 toPath(path){ 30 toPath(path) {
25 document.documentElement.scrollTop = 0; 31 document.documentElement.scrollTop = 0;
26 document.body.scrollTop = 0; 32 document.body.scrollTop = 0;
27 this.$router.push({ 33 this.$router.push({
......
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
76 76
77 .qrcode-wrap { 77 .qrcode-wrap {
78 text-align: center; 78 text-align: center;
79 // position: absolute;
80 // top: 2rem;
81 margin-top: 0.3rem; 79 margin-top: 0.3rem;
80
81
82 .qrcode {
82 width: 8.416667rem; 83 width: 8.416667rem;
83 height: 8.833333rem; 84 height: 8.833333rem;
84 85 }
85 .qrcode {}
86 86
87 .c1 { 87 .c1 {
88 margin-top: 0.3rem; 88 margin-top: 0.3rem;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <div class="footer-containter "> 4 <div class="footer-containter ">
5 <div class="cont"> 5 <div class="cont">
6 <div class="logo-wrap"> 6 <div class="logo-wrap">
7 <img class="logo-img" src="@/assets/images/home/footer-logo.png" alt="中国平安人寿保险"> 7 <img class="logo-img" src="@/assets/images/home/footer-logo.png">
8 </div> 8 </div>
9 <div class="line"></div> 9 <div class="line"></div>
10 <!-- 信息 --> 10 <!-- 信息 -->
...@@ -51,15 +51,14 @@ ...@@ -51,15 +51,14 @@
51 <div class="public"> 51 <div class="public">
52 <div class="tit">{{$t('footer.qrcode')}}</div> 52 <div class="tit">{{$t('footer.qrcode')}}</div>
53 <div @click="qrcodeVisible = !qrcodeVisible" v-if="qrcodeVisible" class="qrcode-wrap"> 53 <div @click="qrcodeVisible = !qrcodeVisible" v-if="qrcodeVisible" class="qrcode-wrap">
54 <img src="@/assets/images/home/qrcode.png" alt=""> 54 <img @mouseout="onOutHandler($event)" src="@/assets/images/home/qrcode.png" alt="">
55 <div class="c1">官方公眾號</div> 55 <div class="c1">{{$t('footer.qrcodeBot')}}</div>
56 </div> 56 </div>
57 <template v-else> 57 <template v-else>
58 <img @click="qrcodeVisible = !qrcodeVisible" class="icon pointer" src="@/assets/images/home/footer-icon-1.png" alt=""> 58 <img @click="qrcodeVisible = !qrcodeVisible" @mouseover="onOverHandler($event)" @mouseout="onOutHandler($event)" class="icon pointer" src="@/assets/images/home/footer-icon-1.png" alt="">
59 <img class="icon pointer" src="@/assets/images/home/footer-icon-2.png" alt=""> 59 <img class="icon pointer" src="@/assets/images/home/footer-icon-2.png" alt="">
60 <img class="icon pointer" src="@/assets/images/home/footer-icon-3.png" alt=""> 60 <img class="icon pointer" src="@/assets/images/home/footer-icon-3.png" alt="">
61 </template> 61 </template>
62
63 </div> 62 </div>
64 63
65 </div> 64 </div>
......
...@@ -74,6 +74,10 @@ export default { ...@@ -74,6 +74,10 @@ export default {
74 } 74 }
75 }, 75 },
76 methods: { 76 methods: {
77 // 校验日期，日期变更后触发，包含点击和文本输入
78 checkDate(data){
79 console.log("checkDate data:", data);
80 },
77 showModal(content, icon) { 81 showModal(content, icon) {
78 icon = !icon || typeof icon === "undefined" ? "succ" : icon; 82 icon = !icon || typeof icon === "undefined" ? "succ" : icon;
79 this.modalIcon = icon; 83 this.modalIcon = icon;
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 </div> 84 </div>
85 <div class="ipt-wrap"> 85 <div class="ipt-wrap">
86 <!-- <input class="ipt" type="date" v-model="data.contactDate" :class="{err : errorTips.e7.length > 0}"> --> 86 <!-- <input class="ipt" type="date" v-model="data.contactDate" :class="{err : errorTips.e7.length > 0}"> -->
87 <date-picker v-model="data.contactDate"></date-picker> 87 <date-picker v-model="data.contactDate" :check="checkDate"></date-picker>
88 </div> 88 </div>
89 <div class="validator" v-if="errorTips.e7.length > 0"> 89 <div class="validator" v-if="errorTips.e7.length > 0">
90 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e7}} 90 <img src="@/assets/images/common/icon-notice.png" alt="">{{errorTips.e7}}
...@@ -110,8 +110,7 @@ ...@@ -110,8 +110,7 @@
110 <img v-else class="notice-item-icon" src="@/assets/images/reservation/check.png"> --> 110 <img v-else class="notice-item-icon" src="@/assets/images/reservation/check.png"> -->
111 111
112 <img v-if="!checked" class="notice-item-icon" src="@/assets/images/login/uncheck.png"> 112 <img v-if="!checked" class="notice-item-icon" src="@/assets/images/login/uncheck.png">
113 <img v-else class="notice-item-icon" src="@/assets/images/login/check.png"> 113 <img v-else class="notice-item-icon" src="@/assets/images/login/check.png"> &nbsp;&nbsp;&nbsp;&nbsp;{{$t('reservation.notice2')}}
114 &nbsp;&nbsp;&nbsp;&nbsp;{{$t('reservation.notice2')}}
115 </p> 114 </p>
116 </div> 115 </div>
117 116
...@@ -123,7 +122,6 @@ ...@@ -123,7 +122,6 @@
123 <img src="@/assets/images/common/icon-notice.png" alt=""> &nbsp; {{errorTips.e8}} 122 <img src="@/assets/images/common/icon-notice.png" alt=""> &nbsp; {{errorTips.e8}}
124 </div> 123 </div>
125 124
126
127 </div> 125 </div>
128 </div> 126 </div>
129 </template> 127 </template>
......
...@@ -166,9 +166,10 @@ export default { ...@@ -166,9 +166,10 @@ export default {
166 this.loading = false; 166 this.loading = false;
167 if (response.returnCode == "0") { 167 if (response.returnCode == "0") {
168 this.errorModel = 0; 168 this.errorModel = 0;
169 this.userInfo.hadFullInfo = 1; 169 let userInfo = JSON.parse(JSON.stringify(this.userInfo));
170 this.userInfo.name = this.information.lastName + this.information.firstName; 170 userInfo.hadFullInfo = 1;
171 this.$store.commit("SET_USER_INFO", this.userInfo); 171 userInfo.name = this.information.lastName + this.information.firstName;
172 this.$store.commit("SET_USER_INFO", userInfo);
172 this.loading = false; 173 this.loading = false;
173 let path = this.$route.query.c || "/"; 174 let path = this.$route.query.c || "/";
174 this.targetPath = path; 175 this.targetPath = path;
......