发货的默认付款人逻辑补充

src/views/jiedao/profile/delivery.vue

@@ -1947,6 +1947,7 @@ export default {
     },
     'form.isCargoControl'() {
       // this.isCargoControlDrawee()
+      this.setDefaultDrawee()
       this.getIdCardData()
     },
     'form.channelId'() {
@@ -2013,11 +2014,12 @@ export default {
     hasConsignee(){
       // 无收货人，默认发货人付款,而且必须控货
       if(!this.hasConsignee){
-        this.form.drawee = 1
+        // this.form.drawee = 1
         this.form.isCargoControl = true
         this.$refs.form.clearValidate("consigneeName")
         this.$refs.form.clearValidate("consigneePhone")
         this.$refs.form.clearValidate("consigneeCompany")
+        this.setDefaultDrawee()
       }
     }
   },
@@ -2132,6 +2134,16 @@ export default {
         this.form.objectiveId = this.importCityList[0].id
       } */
     },
+    setDefaultDrawee(){
+      // 优先级为：发货人默认付款，发货人付款>收货人默认付款，收货人付款>订单控货，收货人付款
+      if(this.userInfo.defaultPay){
+        this.form.drawee = 1
+        return
+      }
+      if(this.form.isCargoControl){
+        this.form.drawee = 2
+      }
+    },
     async getChannelList() {
       const query = {
         cityId: this.form.objectiveId,