Browse Source

merge yufei 账户配置

jiayufei 4 năm trước cách đây
mục cha
commit
a7c64f1a63

+ 2 - 2
src/views/modules/account-config/account-config-server.js

@@ -1,2 +1,2 @@
-// export const urlAcount = 'http://118.24.244.213:8080';
-export const urlAcount = 'http://192.168.1.43:8080';
+export const urlAcount = 'http://118.24.244.213:8080';
+// export const urlAcount = 'http://192.168.1.43:8080';

+ 4 - 4
src/views/modules/account-config/components/configuration-modal.vue

@@ -1170,14 +1170,14 @@ export default {
             defaultData.forEach(item => {
                 item.replaceSex = item.audience.gender === 'NONE' ? '不限' : item.audience.gender === 'GENDER_FEMALE' ? '女' : '男';
                 item.replaceEnabled = item.audience.auto_extend_enabled === 1 ? '开启' : '不开启';
-                item.replacePlate = item.audience.platform.join(',');
-                item.replaceCitys = item.audience.cityNames.join(',');
+                item.replacePlate = item.audience.length ? item.audience.platform.join(',') : '暂无';
+                item.replaceCitys = item.audience.length ? item.audience.cityNames.join(',') : '暂无';
                 this.ageArr.forEach(val => {
-                    if (item.audience.age.includes(val.value)) {
+                    if (item.audience.age && item.audience.age.includes(val.value)) {
                         ageUpdateList.push(val.label);
                     }
                 });
-                item.replaceAge = ageUpdateList.join(',');
+                item.replaceAge = ageUpdateList.length ? ageUpdateList.join(',') : '暂无';
             });
             this.packageMessageDetail = defaultData;
         },