Merge branch 'feat' into develop

src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -374,6 +374,10 @@ export default {
       })
     },
     onSubmit() {
+      if (this.radio.length) {
+        this.$errorMsg('必须选择一种提货方式')
+        return
+      }
       if (this.radio.includes(2) && !this.pickCategory.length) {
         this.$errorMsg('商家自提必须选择产品类别')
         return

src/views/supply/pickup/components/pickup_form.vue

@@ -662,10 +662,10 @@ export default {
         this.isPick = this.userInfo.isPick
           res.data.forEach(k => {
           if (this.frontPickType) {
-            if (!this.isFront && k.dictCode == 1) {
+            if (!this.isFront && k.dictCode == 2) {
               k.disabled = true
             }
-            if (!this.isPick && k.dictCode == 2) {
+            if (!this.isPick && k.dictCode == 1) {
               k.disabled = true
             }
           }