Merge branch 'dev_hxz' into test

src/views/system/order/components/orderDetail.vue

@@ -671,10 +671,10 @@ export default {
       let ssqLabelList = [];
       if(this.onlyEidtPlaceholder) {
         ssqLabelList = this.$refs['ssqCascader'].getCheckedNodes()[0].pathLabels;
-        console.log(11,ssqLabelList);
+        //console.log(11,ssqLabelList);
       }else {
         ssqLabelList = this.addressForm.areaList;
-        console.log(22,ssqLabelList);
+        //console.log(22,ssqLabelList);
       }
 
       let params = {

src/views/system/retreat/edit.vue

@@ -503,6 +503,7 @@
         if(type ==3) {
           this.onlyIsAgree = type // 退货退款 同意退货退款
           this.dialogASTypeTitle = "提示";
+          this.order_refund_address = '';
           this.isASTypeDialog = true;
         }
       },