From d7d44fc29f835e22246299b92258bb32c5934d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Fri, 29 Apr 2022 16:46:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=91=E8=B4=A7=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sales/order/index.vue |  2 +-
 src/views/sales/order/ship.vue  | 14 +++++---------
 vite.config.js                  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue
index 49901e8..468ee66 100644
--- a/src/views/sales/order/index.vue
+++ b/src/views/sales/order/index.vue
@@ -54,7 +54,7 @@
         </TableList>
         <CloseOrder ref="refsCloseOrder" />
         <OrderTrack ref="refsOrderTrack" />
-        <OrderShip ref="refsOrderShip" @close="handleSearch" />
+        <OrderShip ref="refsOrderShip" @save="handleSearch" />
     </div>
 </template>
 
diff --git a/src/views/sales/order/ship.vue b/src/views/sales/order/ship.vue
index 250d578..0d51665 100644
--- a/src/views/sales/order/ship.vue
+++ b/src/views/sales/order/ship.vue
@@ -9,7 +9,7 @@
             @search="handleSearch"
         />
         <template #footer>
-            <el-button type="danger" @click="handleCancel">取消</el-button>
+            <el-button type="danger" @click="handleClose">取消</el-button>
             <el-button :loading="loading" type="primary" @click="handleSave">确定发货</el-button>
         </template>
     </el-dialog>
@@ -18,7 +18,6 @@
 <script setup lang="jsx">
     import ElInput from '@/components/extra/ElInput.vue';
     import ElSelect from '@/components/extra/ElSelect.vue';
-    const router = useRouter();
     const store = useStore();
     const loading = ref(false);
     const visible = ref(false);
@@ -36,14 +35,16 @@
         loading.value = false;
     };
     /* 取消 */
-    const handleCancel = () => {
-        router.push({ name: 'OrderManagement' });
+    const handleClose = () => {
+        visible.value = false;
     };
+    const emits = defineEmits(['save']);
     const handleSave = async () => {
         loading.value = true;
         let res = await store.dispatch('orderShip/save', unref(list));
         if (res) {
             handleClose();
+            emits('save');
         }
         loading.value = false;
     };
@@ -51,11 +52,6 @@
         visible.value = true;
         handleSearch();
     };
-    const emits = defineEmits(['save']);
-    const handleClose = () => {
-        visible.value = false;
-        emits('save');
-    };
     defineExpose({
         show: handleShow,
         close: handleClose,
diff --git a/vite.config.js b/vite.config.js
index 803dfae..dd00d3b 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -25,7 +25,7 @@ export default (configEnv) => {
                     // target: 'http://192.168.10.67:8090', // 罗战
                     // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
                     // target: 'https://gateway.mashibing.cn', // 预发地址
-                    target: 'https://like-gateway.mashibing.com', // 生产环境
+                    target: 'https://you-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),
                 },