Commit a95bc117 authored by chenwei's avatar chenwei

Merge branch 'feature' into 'dev'

默认地址

See merge request !10
parents 620d212b 90ef6e3c
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
}, },
computed: { computed: {
isChinese() { isChinese() {
this.getCode = this.$t('login.getCode') this.getCode = this.$t("login.getCode");
return this.$i18n.locale === "zh_CN"; return this.$i18n.locale === "zh_CN";
}, },
}, },
...@@ -237,8 +237,8 @@ export default { ...@@ -237,8 +237,8 @@ export default {
r.data.forEach((element) => { r.data.forEach((element) => {
element.isDefault === 0 ? (this.addressInfo = element) : ""; element.isDefault === 0 ? (this.addressInfo = element) : "";
}); });
if(this.addressInfo.isDefault !=0){ if (this.addressInfo.isDefault != 0 && r.data.length > 0) {
this.addressInfo = r.data[0] this.addressInfo = r.data[0];
} }
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment