Merge branch 'zhongqi-delivery' of http://git.huaml.com/zhh/front-end into zhongqi-delivery

hdApp/src/admin/order/detail.vue

@@ -644,8 +644,8 @@ export default {
       
       if(platform == 'fengniao'){
         getCancelReason({hdOrderId: orderId, platform: deliveryId}).then(res => {
-          if (res.code == 1 && res.data && res.data.code == 0) {
-            this.cancelReasonList = res.data.data.reasonList;
+          if (res.code == 1 && res.data) {
+            this.cancelReasonList = res.data.reasonList;
             this.currentExpressInfo = { orderId, deliveryId };
             this.selectedCancelReasonCode = null;
             this.otherCancelReason = '';

mallApp/src/pages/billing/affirmGhs.vue

@@ -453,8 +453,6 @@ export default {
 					that.form.showAddress = userInfo.showAddress
 
 					const openIntraCity = shopInfo.openIntraCity
-					const hcFreeKm = shopInfo.hcFreeKm
-					const hcMap = shopInfo.hcMap
 					that.form.openIntraCity = openIntraCity
 					
 					if(Number(openIntraCity) == 1 && that.form.sendType == 2){