From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
index a9eee0b..a1ea86c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
@@ -105,6 +105,8 @@
                     title: '导入快递单,部分失败',
                     content: data.info
                 });
+                var url = basePath + "/admin/shopOrder/exportLogisticsImportExcel";
+                window.open(url);
                 parent.myGrid.serchData();
             }
             $("#showFileName").val('');
@@ -116,7 +118,7 @@
 
 
     function download() {
-        window.location.href=  "https://xcshop.csxuncong.com/templates/logisticsImport.xls";
+        window.location.href=basePath + "/uploadfile/image/logisticsImport.xls";
     }
 </script>
 </body>

--
Gitblit v1.9.1