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

src/views/storeManagement/storeAdd.vue

@@ -441,7 +441,7 @@
                 </van-checkbox-group>
                 <van-field
                   class="otherCompetitor"
-                  v-model="otherCompetitor"
+                  v-model="fromValue.otherCompetitor"
                   label="其他"
                   maxlength="20"
                   autosize
@@ -828,6 +828,7 @@ export default {
         mainProjectType: '',
         mainRelationFrom: '',
         storeCompetitorList: [],
+        otherCompetitor: '',
       },
       location: {
         lat: '34.6174',
@@ -960,6 +961,7 @@ export default {
           mainProjectType: '',
           mainRelationFrom: '',
           storeCompetitorList: [],
+          otherCompetitor: '',
         };
         setTimeout(() => {
           // this.getLocation()
@@ -1881,10 +1883,18 @@ export default {
           this.$toast('属性未填写');
           return;
         }
-        if (!fromValue.storeCompetitorList.length && !this.otherCompetitor) {
+        if (!fromValue.storeCompetitorList.length && !fromValue.otherCompetitor) {
           this.$toast('主营竞品品牌未填写');
           return;
         }
+        if (this.fromValue.otherCompetitor) {
+          if (this.fromValue.otherCompetitor.length < 2) {
+            this.$toast('主营竞品品牌其他文本信息最少2个字');
+            return;
+          } else {
+            this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
+          }
+        }
       } else {
         // 非同城分销店 经销商必填校验
         if (
@@ -1901,14 +1911,6 @@ export default {
         this.$toast('潜在客户类型未填写');
         return;
       }
-      if (this.fromValue.otherCompetitor) {
-        if (this.fromValue.otherCompetitor.length < 2) {
-          this.$toast('主营竞品品牌其他文本信息最少2个字');
-          return;
-        } else {
-          this.fromValue.storeCompetitorList.push(this.fromValue.otherCompetitor);
-        }
-      }
       // 同城分销建店添加去下单提示
       if (
         this.verifyStoreType(this.fromValue.storeCategory) &&