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

src/pages/create_order/create_order.vue

@@ -1996,15 +1996,6 @@
 						}
 						that.getOffData()
 
-            // // 没有收货人信息
-            // if(!that.params.consigneeVO){
-            //   that.hasConsignee = false
-            // }
-            // 如果用户当前不支持无收货人，则强制显示收货人信息
-            // if(that.noConsignee){
-            //   that.hasConsignee = true
-            // }
-
             // 回显目的城市和目的国
             const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId)
             if(dstCityIndex > -1){
@@ -2039,7 +2030,10 @@
               this.currentHarvestIndex = harvestIndex
             }
 
-            // this.hasConsignee = res.data.hasConsignee
+            this.hasConsignee = res.data.hasConsignee
+            if (!that.noConsignee){
+              this.hasConsignee = true
+            }
           }
 				})
 			},