Browse Source

Merge branch 'feature_20260211_同城分销店-主营竞品品牌' into uat(dev)

zhujindu 4 days ago
parent
commit
984698087b

+ 2 - 2
src/views/storeManagement/storeAdd.vue

@@ -1872,7 +1872,7 @@ export default {
           this.$toast('属性未填写');
           this.$toast('属性未填写');
           return;
           return;
         }
         }
-        if (!fromValue.storeCompetitorList.length && this.otherCompetitor == '') {
+        if (!fromValue.storeCompetitorList.length && !this.otherCompetitor) {
           this.$toast('主营竞品品牌未填写');
           this.$toast('主营竞品品牌未填写');
           return;
           return;
         }
         }
@@ -1927,7 +1927,7 @@ export default {
               })
               })
               .then(() => {
               .then(() => {
                 this.toastLoading(0, '上传中...', true);
                 this.toastLoading(0, '上传中...', true);
-                if (this.fromValue.otherCompetitor != '')
+                if (this.fromValue.otherCompetitor)
                   this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
                   this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
                 this.addStoreFun();
                 this.addStoreFun();
               });
               });

+ 2 - 2
src/views/storeManagement/storeEdit.vue

@@ -1848,7 +1848,7 @@ export default {
           this.$toast('图片未上传');
           this.$toast('图片未上传');
           return;
           return;
         }
         }
-        if (!fromValue.storeCompetitorList.length && fromValue.otherCompetitor == '') {
+        if (!fromValue.storeCompetitorList.length && !fromValue.otherCompetitor) {
           this.$toast('主营竞品品牌未填写');
           this.$toast('主营竞品品牌未填写');
           return;
           return;
         }
         }
@@ -1874,7 +1874,7 @@ export default {
       this.fromValue.myLat = this.location.lat;
       this.fromValue.myLat = this.location.lat;
       this.fromValue.myLon = this.location.lon;
       this.fromValue.myLon = this.location.lon;
       console.log(this.fromValue);
       console.log(this.fromValue);
-      if (this.fromValue.otherCompetitor != '')
+      if (this.fromValue.otherCompetitor)
         this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
         this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
       updateStore(this.fromValue).then((res) => {
       updateStore(this.fromValue).then((res) => {
         loading1.clear();
         loading1.clear();