Merge remote-tracking branch 'origin/release' into release

src/pages/create_order/create_order.vue

@@ -1289,6 +1289,9 @@
           this.params.isCargoControl = true
         }
       },
+      "params.isCargoControl"() {
+        this.setDefaultDrawee()
+      },
       "params.drawee"(drawee) {
         // 240224 微信反馈
         // 不好意思，这写错了，付款人=发货人----提单价格默认否；付款人=收货人，提交价格默认是
@@ -1301,12 +1304,23 @@
       }
 		},
 		methods: {
+      setDefaultDrawee(){
+        // 优先级为：发货人默认付款，发货人付款>收货人默认付款，收货人付款>订单控货，收货人付款
+        if(this.$store.state.userInfo.defaultPay){
+          this.$set(this.params, 'drawee', 1)
+          return
+        }
+        if(this.params.isCargoControl){
+          this.$set(this.params, 'drawee', 2)
+        }
+      },
       changeHasConsignee(e){
         this.hasConsignee = e.detail.value === "1"
         // 无收货人默认发货人付款
-        if(!this.hasConsignee){
-          this.$set(this.params, 'drawee', 1)
-        }
+        // if(!this.hasConsignee){
+        //   this.$set(this.params, 'drawee', 1)
+        // }
+        this.setDefaultDrawee()
       },
 			toback(){
 				uni.navigateBack()