Merge branch 'dev' into test

src/views/distribution/delivery/distributionDelivery.vue

@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { getDetailDelivery, addDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
+import { addDelivery, getDetailDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
 import option from "@/option/distribution/distributionDelivery";
 import { mapGetters } from "vuex";
 

src/views/wel/index.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <div>
     <el-row>
       <el-col :span="24">
@@ -954,4 +954,8 @@ export default {
 .el-font-size {
   font-size: 14px;
 }
-</style>
+</style> -->
+
+<template>
+  <span>功能开发中。。。</span>
+</template>

vite.config.js

@@ -12,7 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-          target: 'http://192.168.2.11:8889',
+          target: 'http://192.168.2.110:9999',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),