Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!120

src/views/business/salesite/components/Detail.vue

@@ -130,6 +130,7 @@
 <script>
 
 import { mapGetters } from 'vuex'
+import { publicFileGetUrl } from "@/api/common"
 import { getSaleSiteDetail} from "@/api/admin/salesite";
 export default {
   props: {
@@ -142,7 +143,7 @@ export default {
 
   data() {
     return {
-      IMG_URL: process.env.VUE_APP_IMG_URL,
+      IMG_URL: publicFileGetUrl,
       loading: false,
       // 详情数据
       detail: {}

src/views/order/channel/components/ExpressEdit.vue

@@ -96,6 +96,7 @@ export default {
       this.shipForm.deliveryId = this.goodsInfo.deliveryId
       this.shipForm.deliveryFlowId = this.goodsInfo.deliveryFlowId
     },
+    
     // 关闭发货弹框
     close() {
       this.$emit("close");

src/views/order/deliver/components/ExpressEdit.vue

@@ -101,6 +101,7 @@ export default {
       this.shipForm.deliveryId = this.goodsInfo.deliveryId
       this.shipForm.deliveryFlowId = this.goodsInfo.deliveryFlowId
     },
+    
     // 关闭发货弹框
     close() {
       this.$emit("close");