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 {
url: api.letterRecordList,
sid: true
}).then(res => {
if (window.global.mockData) {
res.push({ "recordId": "10", "bizNo": "P000000000000318", "letterType": "2", "printTime": "2020-05-03 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
res.push({ "recordId": "10", "bizNo": "P000000000000319", "letterType": "2", "printTime": "2020-05-04 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
res.push({ "recordId": "10", "bizNo": "P000000000000320", "letterType": "2", "printTime": "2020-05-05 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
res.push({ "recordId": "10", "bizNo": "P000000000000321", "letterType": "2", "printTime": "2020-05-06 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
res.push({ "recordId": "10", "bizNo": "P000000000000322", "letterType": "2", "printTime": "2020-05-07 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
res.push({ "recordId": "10", "bizNo": "P000000000000323", "letterType": "2", "printTime": "2020-05-08 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
}
// if (window.global.mockData) {
// res.push({ "recordId": "10", "bizNo": "P000000000000318", "letterType": "2", "printTime": "2020-05-03 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
// res.push({ "recordId": "10", "bizNo": "P000000000000319", "letterType": "2", "printTime": "2020-05-04 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "N" })
// res.push({ "recordId": "10", "bizNo": "P000000000000320", "letterType": "2", "printTime": "2020-05-05 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// res.push({ "recordId": "10", "bizNo": "P000000000000321", "letterType": "2", "printTime": "2020-05-06 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// res.push({ "recordId": "10", "bizNo": "P000000000000322", "letterType": "2", "printTime": "2020-05-07 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// res.push({ "recordId": "10", "bizNo": "P000000000000323", "letterType": "2", "printTime": "2020-05-08 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// }
for (let index = 0; index < res.length; index++) {
let letter = res[index];
if (letter.letterType == "2") {
......
......@@ -72,6 +72,8 @@ export default {
modalIcon: "succ",
modalContent: "",
lastPolicyCode: "",
// 国际号码区号列表
nationsPhoneCodeList: [],
// 国际地区区号
......@@ -330,10 +332,13 @@ export default {
// 获取省份
this.provinceList = getCnProvinceList(this.$i18n.locale);
if (this.dataInit) {
// if (this.dataInit) {
// return;
// }
if (this.loading) {
return;
}
if (this.loading) {
if (!this.selectedPolicies || this.selectedPolicies.length == 0) {
return;
}
// this.data = null;
......@@ -342,6 +347,12 @@ export default {
policyId: this.selectedPolicies[0].id,
policyCode: this.selectedPolicies[0].code
};
if (this.lastPolicyCode == param.policyCode) {
return;
}
this.lastPolicyCode = param.policyCode;
httpPost({
url: api.policyContactDetailApi,
data: param,
......@@ -361,6 +372,7 @@ export default {
}
})
.catch(res => {
this.loading = false;
if (res.code == "404") {
this.$refs.auth.noAuth();
}
......@@ -384,27 +396,45 @@ export default {
console.error(e);
}
},
<<<<<<< HEAD
=======
uploadExcel() { },
// aaa(){
// httpPost({
// url: api.indexManageListApi,
// data: {},
// sid: true
// })
// .then(response => {
// console.log("response:", response);
// let ttt = JSON.parse(response[0].content);
// console.log("ttt:", ttt);
// })
// .catch(res => {});
// }
>>>>>>> a9e38a86439826c07d58866526cd05c6c9befd20
},
watch: {
"data.mobile": function() {
"data.mobile": function () {
this.errorTips.e1 = "";
},
"data.address": function() {
"data.address": function () {
this.errorTips.e2 = "";
},
"data.email": function() {
"data.email": function () {
this.errorTips.e3 = "";
},
"data.mobileAreaCode": function() {
"data.mobileAreaCode": function () {
this.errorTips.e4 = "";
},
"data.countryId": function() {
"data.countryId": function () {
this.errorTips.e5 = "";
},
"data.provinceId": function() {
"data.provinceId": function () {
this.errorTips.e6 = "";
},
"data.cityId": function() {
"data.cityId": function () {
this.errorTips.e7 = "";
}
},
......@@ -415,7 +445,7 @@ export default {
this.$root.eventBus.$on("langChange", () => {
try {
this.initData();
} catch (e) {}
} catch (e) { }
});
}
};
......
......@@ -320,7 +320,7 @@ export default {
}
let data = {
mobile: this.loginForm.userId,
lan : this.locale
lan: this.locale
}
this._startTimeClick();
httpPost({
......@@ -691,6 +691,10 @@ export default {
},
'loginForm.otp': function () {
this.errorTips.oe2 = "";
this.loginForm.otp = this.loginForm.otp.replace(/(^\s*)|(\s*$)/g, "");
if (this.loginForm.otp.length > 0) {
this.loginForm.otp = this.loginForm.otp.substring(0, 6);
}
},
'loginForm.imageValue': function () {
this.errorTips.oe3 = "";
......
......@@ -687,6 +687,11 @@ export default {
},
"registerForm.otp": function () {
this.errorTips.p2 = "";
this.registerForm.otp = this.registerForm.otp.replace(/(^\s*)|(\s*$)/g, "");
if (this.registerForm.otp.length > 0) {
this.registerForm.otp = this.registerForm.otp.substring(0, 6);
}
},
"registerForm.imageValue": function () {
this.errorTips.p3 = "";
......