Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
152947c6 by simon
Options

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro 

# Conflicts:
#	src/pages/custom-service/components/policy-change-contact.js
2 parents 871e4f36 a9e38a86
Inline Side-by-side
Showing 4 changed files with 58 additions and 19 deletions
...@@ -60,14 +60,14 @@ export default { ...@@ -60,14 +60,14 @@ export default {
60 url: api.letterRecordList, 60 url: api.letterRecordList,
61 sid: true 61 sid: true
62 }).then(res => { 62 }).then(res => {
63 if (window.global.mockData) { 63 // if (window.global.mockData) {
64 res.push({ "recordId": "10", "bizNo": "P000000000000318", "letterType": "2", "printTime": "2020-05-03 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" }) 64 // res.push({ "recordId": "10", "bizNo": "P000000000000318", "letterType": "2", "printTime": "2020-05-03 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
65 res.push({ "recordId": "10", "bizNo": "P000000000000319", "letterType": "2", "printTime": "2020-05-04 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" }) 65 // res.push({ "recordId": "10", "bizNo": "P000000000000319", "letterType": "2", "printTime": "2020-05-04 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
66 res.push({ "recordId": "10", "bizNo": "P000000000000320", "letterType": "2", "printTime": "2020-05-05 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" }) 66 // res.push({ "recordId": "10", "bizNo": "P000000000000320", "letterType": "2", "printTime": "2020-05-05 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
67 res.push({ "recordId": "10", "bizNo": "P000000000000321", "letterType": "2", "printTime": "2020-05-06 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" }) 67 // res.push({ "recordId": "10", "bizNo": "P000000000000321", "letterType": "2", "printTime": "2020-05-06 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
68 res.push({ "recordId": "10", "bizNo": "P000000000000322", "letterType": "2", "printTime": "2020-05-07 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" }) 68 // res.push({ "recordId": "10", "bizNo": "P000000000000322", "letterType": "2", "printTime": "2020-05-07 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
69 res.push({ "recordId": "10", "bizNo": "P000000000000323", "letterType": "2", "printTime": "2020-05-08 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" }) 69 // res.push({ "recordId": "10", "bizNo": "P000000000000323", "letterType": "2", "printTime": "2020-05-08 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
70 } 70 // }
71 for (let index = 0; index < res.length; index++) { 71 for (let index = 0; index < res.length; index++) {
72 let letter = res[index]; 72 let letter = res[index];
73 if (letter.letterType == "2") { 73 if (letter.letterType == "2") {
......
...@@ -72,6 +72,8 @@ export default { ...@@ -72,6 +72,8 @@ export default {
72 modalIcon: "succ", 72 modalIcon: "succ",
73 modalContent: "", 73 modalContent: "",
74 74
75 lastPolicyCode: "",
76
75 // 国际号码区号列表 77 // 国际号码区号列表
76 nationsPhoneCodeList: [], 78 nationsPhoneCodeList: [],
77 // 国际地区区号 79 // 国际地区区号
...@@ -330,10 +332,13 @@ export default { ...@@ -330,10 +332,13 @@ export default {
330 // 获取省份 332 // 获取省份
331 this.provinceList = getCnProvinceList(this.$i18n.locale); 333 this.provinceList = getCnProvinceList(this.$i18n.locale);
332 334
333 if (this.dataInit) { 335 // if (this.dataInit) {
336 // return;
337 // }
338 if (this.loading) {
334 return; 339 return;
335 } 340 }
336 if (this.loading) { 341 if (!this.selectedPolicies || this.selectedPolicies.length == 0) {
337 return; 342 return;
338 } 343 }
339 // this.data = null; 344 // this.data = null;
...@@ -342,6 +347,12 @@ export default { ...@@ -342,6 +347,12 @@ export default {
342 policyId: this.selectedPolicies[0].id, 347 policyId: this.selectedPolicies[0].id,
343 policyCode: this.selectedPolicies[0].code 348 policyCode: this.selectedPolicies[0].code
344 }; 349 };
350
351 if (this.lastPolicyCode == param.policyCode) {
352 return;
353 }
354 this.lastPolicyCode = param.policyCode;
355
345 httpPost({ 356 httpPost({
346 url: api.policyContactDetailApi, 357 url: api.policyContactDetailApi,
347 data: param, 358 data: param,
...@@ -361,6 +372,7 @@ export default { ...@@ -361,6 +372,7 @@ export default {
361 } 372 }
362 }) 373 })
363 .catch(res => { 374 .catch(res => {
375 this.loading = false;
364 if (res.code == "404") { 376 if (res.code == "404") {
365 this.$refs.auth.noAuth(); 377 this.$refs.auth.noAuth();
366 } 378 }
...@@ -384,27 +396,45 @@ export default { ...@@ -384,27 +396,45 @@ export default {
384 console.error(e); 396 console.error(e);
385 } 397 }
386 }, 398 },
399 <<<<<<< HEAD
400 =======
401 uploadExcel() { },
402 // aaa(){
403 // httpPost({
404 // url: api.indexManageListApi,
405 // data: {},
406 // sid: true
407 // })
408 // .then(response => {
409 // console.log("response:", response);
410 // let ttt = JSON.parse(response[0].content);
411 // console.log("ttt:", ttt);
412 // })
413 // .catch(res => {});
414
415 // }
416 >>>>>>> a9e38a86439826c07d58866526cd05c6c9befd20
387 }, 417 },
388 watch: { 418 watch: {
389 "data.mobile": function() { 419 "data.mobile": function () {
390 this.errorTips.e1 = ""; 420 this.errorTips.e1 = "";
391 }, 421 },
392 "data.address": function() { 422 "data.address": function () {
393 this.errorTips.e2 = ""; 423 this.errorTips.e2 = "";
394 }, 424 },
395 "data.email": function() { 425 "data.email": function () {
396 this.errorTips.e3 = ""; 426 this.errorTips.e3 = "";
397 }, 427 },
398 "data.mobileAreaCode": function() { 428 "data.mobileAreaCode": function () {
399 this.errorTips.e4 = ""; 429 this.errorTips.e4 = "";
400 }, 430 },
401 "data.countryId": function() { 431 "data.countryId": function () {
402 this.errorTips.e5 = ""; 432 this.errorTips.e5 = "";
403 }, 433 },
404 "data.provinceId": function() { 434 "data.provinceId": function () {
405 this.errorTips.e6 = ""; 435 this.errorTips.e6 = "";
406 }, 436 },
407 "data.cityId": function() { 437 "data.cityId": function () {
408 this.errorTips.e7 = ""; 438 this.errorTips.e7 = "";
409 } 439 }
410 }, 440 },
...@@ -415,7 +445,7 @@ export default { ...@@ -415,7 +445,7 @@ export default {
415 this.$root.eventBus.$on("langChange", () => { 445 this.$root.eventBus.$on("langChange", () => {
416 try { 446 try {
417 this.initData(); 447 this.initData();
418 } catch (e) {} 448 } catch (e) { }
419 }); 449 });
420 } 450 }
421 }; 451 };
......
...@@ -320,7 +320,7 @@ export default { ...@@ -320,7 +320,7 @@ export default {
320 } 320 }
321 let data = { 321 let data = {
322 mobile: this.loginForm.userId, 322 mobile: this.loginForm.userId,
323 lan : this.locale 323 lan: this.locale
324 } 324 }
325 this._startTimeClick(); 325 this._startTimeClick();
326 httpPost({ 326 httpPost({
...@@ -691,6 +691,10 @@ export default { ...@@ -691,6 +691,10 @@ export default {
691 }, 691 },
692 'loginForm.otp': function () { 692 'loginForm.otp': function () {
693 this.errorTips.oe2 = ""; 693 this.errorTips.oe2 = "";
694 this.loginForm.otp = this.loginForm.otp.replace(/(^\s*)|(\s*$)/g, "");
695 if (this.loginForm.otp.length > 0) {
696 this.loginForm.otp = this.loginForm.otp.substring(0, 6);
697 }
694 }, 698 },
695 'loginForm.imageValue': function () { 699 'loginForm.imageValue': function () {
696 this.errorTips.oe3 = ""; 700 this.errorTips.oe3 = "";
......
...@@ -687,6 +687,11 @@ export default { ...@@ -687,6 +687,11 @@ export default {
687 }, 687 },
688 "registerForm.otp": function () { 688 "registerForm.otp": function () {
689 this.errorTips.p2 = ""; 689 this.errorTips.p2 = "";
690
691 this.registerForm.otp = this.registerForm.otp.replace(/(^\s*)|(\s*$)/g, "");
692 if (this.registerForm.otp.length > 0) {
693 this.registerForm.otp = this.registerForm.otp.substring(0, 6);
694 }
690 }, 695 },
691 "registerForm.imageValue": function () { 696 "registerForm.imageValue": function () {
692 this.errorTips.p3 = ""; 697 this.errorTips.p3 = "";
......