Merge branch 'feature_20241212_同城分销店拆分、分销店对应多个经销商'

src/views/deviceOutside/rangeStore.vue

@@ -1141,8 +1141,7 @@ export default {
         } else {
           return this.storeGold;
         }
-      } else if (row.iconName == '有布机') {
-        // 有布机-金牌店
+      } else if (row.iconName == 'jinpai_ccm') {
         if (tyle == 1) {
           this.checkIco = storeCCMactive;
         } else {

src/views/storeManagement/storeAdd.vue

@@ -1802,7 +1802,7 @@ export default {
       ) {
         // 同城分销多经销商
         this.fromValue.sfaStoreChainsContactList = this.sfaStoreChainsContactList;
-        if (!this.fromValue.sfaStoreChainsContactList.length) {
+        if (!this.sfaStoreChainsContactList || !this.fromValue.sfaStoreChainsContactList.length) {
           this.$toast('经销商未填写');
           return;
         }

src/views/storeManagement/storeEdit.vue

@@ -1785,7 +1785,7 @@ export default {
       ) {
         // 同城分销多经销商
         this.fromValue.sfaStoreChainsContactList = this.sfaStoreChainsContactList;
-        if (!this.fromValue.sfaStoreChainsContactList.length) {
+        if (!this.sfaStoreChainsContactList || !this.sfaStoreChainsContactList.length) {
           this.$toast('经销商未填写');
           return;
         }
@@ -1793,6 +1793,10 @@ export default {
           this.$toast('属性未填写');
           return;
         }
+        if (fromValue.imgSed == '') {
+          this.$toast('图片未上传');
+          return;
+        }
       } else {
         // 非同城分销店 经销商必填校验
         if (
@@ -1804,15 +1808,6 @@ export default {
           this.$toast('经销商未选择');
           return;
         }
-        if (
-          fromValue.imgSed == '' &&
-          fromValue.ifJzStoreType != 1 &&
-          this.storeTypePOP &&
-          fromValue.storeCategory != 'C917'
-        ) {
-          this.$toast('图片未上传');
-          return;
-        }
       }
 
       let loading1 = this.$toast.loading({