Merge branch 'main' of http://git.gpxscs.cn/front/merchapp

2025-08-16 13:36:36 +08:00 · 2025-08-16 13:36:36 +08:00 · 19620542e6
commit 19620542e6
parent 23daffe0fb 716e05aef2
63 changed files with 36 additions and 34 deletions
--- a/java-mall-app-shop-admin/dist/web/index.html
+++ b/java-mall-app-shop-admin/dist/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>小发商城商家中心</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/mchapp/static/index.2da1efab.css><link rel=icon href=./static/logo.jpg></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/mchapp/static/js/chunk-vendors.173e5569.js></script><script src=/mchapp/static/js/index.4b5630ad.js></script></body></html>
+			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/mchapp/static/index.2da1efab.css><link rel=icon href=./static/logo.jpg></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/mchapp/static/js/chunk-vendors.173e5569.js></script><script src=/mchapp/static/js/index.3d63de1b.js></script></body></html>
--- a/java-mall-app-shop-admin/dist/web/static/js/index.3d63de1b.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/index.3d63de1b.js
--- a/java-mall-app-shop-admin/dist/web/static/js/index.4b5630ad.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/index.4b5630ad.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM.9a9e4b55.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM.9a9e4b55.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM.d2fbb78e.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM.d2fbb78e.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IMmsgContent.635fc969.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IMmsgContent.635fc969.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IMmsgContent.95fa3bf6.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IMmsgContent.95fa3bf6.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-order-order~pages-viewCenter-viewCenter~pages-warehouse-manage-batch~p~55a7cdeb.5f761f9c.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-order-order~pages-viewCenter-viewCenter~pages-warehouse-manage-batch~p~55a7cdeb.5f761f9c.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-viewCenter-viewCenter~pages-warehouse-warehouse.0ffb5655.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-viewCenter-viewCenter~pages-warehouse-warehouse.0ffb5655.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-viewCenter-viewCenter~pages-warehouse-warehouse.78145bd3.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-IM~pages-my-my~pages-viewCenter-viewCenter~pages-warehouse-warehouse.78145bd3.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint.6e4a6e87.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint.6e4a6e87.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~5dcbe4d6.13e97518.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~5dcbe4d6.13e97518.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~8c1ad27d.a2309baf.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~8c1ad27d.a2309baf.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~dc50a344.4510594a.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~dc50a344.4510594a.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~e59b6aac.619f9579.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-IM-complaint~pages-audit-checkAudit~pages-audit-mapAddress~pages-audit-shop1~pages-audit-shop2~e59b6aac.619f9579.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-checkAudit.dda465bc.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-checkAudit.dda465bc.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-mapAddress.3815f903.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-mapAddress.3815f903.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-mapAddress.98f157f9.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-mapAddress.98f157f9.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop1.5e45089c.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop1.5e45089c.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop1.ea55f916.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop1.ea55f916.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop2.6c2fb05c.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop2.6c2fb05c.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop2.88bfb193.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop2.88bfb193.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop3.09c5a510.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-audit-shop3.09c5a510.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-my.296751b0.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-my.296751b0.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-my.e78e23af.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-my.e78e23af.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-my~pages-my-shopInfo~pages-my-storeBusinessStatus-updateBusinessTime.5463c6a4.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-my~pages-my-shopInfo~pages-my-storeBusinessStatus-updateBusinessTime.5463c6a4.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList.71926860.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList.71926860.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList.b525a028.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList.b525a028.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList~pages-my-shopInfo~pages-my-userInfo~pages-order-orderInfo.4a8c5065.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList~pages-my-shopInfo~pages-my-userInfo~pages-order-orderInfo.4a8c5065.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList~pages-my-storeBusinessStatus-businessStatus~pages-my-tipOff~pages-order~d1ba9591.72af4d79.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-printer-printerList~pages-my-storeBusinessStatus-businessStatus~pages-my-tipOff~pages-order~d1ba9591.72af4d79.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-shopInfo.05455491.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-shopInfo.05455491.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-shopInfo.72d3edb5.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-shopInfo.72d3edb5.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-businessStatus.29b0f0a4.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-businessStatus.29b0f0a4.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-businessStatus.ac64a744.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-businessStatus.ac64a744.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-updateBusinessTime.12f37659.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-updateBusinessTime.12f37659.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-updateBusinessTime.2ab488ff.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-storeBusinessStatus-updateBusinessTime.2ab488ff.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-tipOff.23946325.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-tipOff.23946325.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-userInfo.627e25d9.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-userInfo.627e25d9.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-my-userInfo.75c7fc57.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-my-userInfo.75c7fc57.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-order-order.46480275.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-order-order.46480275.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-order-order.a02207d2.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-order-order.a02207d2.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-order-orderInfo.64b57a54.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-order-orderInfo.64b57a54.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-order-orderInfo.bed82e78.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-order-orderInfo.bed82e78.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-register-register.cd83b2c9.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-register-register.cd83b2c9.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-register-register.e7cb7ca4.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-register-register.e7cb7ca4.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-viewCenter-viewCenter.6d53fd1d.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-viewCenter-viewCenter.6d53fd1d.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-viewCenter-viewCenter.ac8aea03.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-viewCenter-viewCenter.ac8aea03.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-batch.0e2d2478.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-batch.0e2d2478.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-batch.7fcdcb88.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-batch.7fcdcb88.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-classifyList.4d787958.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-classifyList.4d787958.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-classifyList.682c717b.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-classifyList.682c717b.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productList.a76a85b1.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productList.a76a85b1.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productList.d863c5fd.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productList.d863c5fd.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productListSearch.2d017364.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productListSearch.2d017364.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productListSearch.938bdb5b.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-productListSearch.938bdb5b.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-specification.2e3653c1.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-specification.2e3653c1.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-specification.62481f10.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-specification.62481f10.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-typeManagement.2b976aac.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-typeManagement.2b976aac.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-typeManagement.f339832c.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-manage-typeManagement.f339832c.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-warehouse.632121b0.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-warehouse.632121b0.js
--- a/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-warehouse.8414eaf7.js
+++ b/java-mall-app-shop-admin/dist/web/static/js/pages-warehouse-warehouse.8414eaf7.js
--- a/java-mall-app-shop-admin/dist/web/static/mp3/jinxingzhong.MP3
+++ b/java-mall-app-shop-admin/dist/web/static/mp3/jinxingzhong.MP3
--- a/java-mall-app-shop-admin/dist/web/static/mp3/yichang.MP3
+++ b/java-mall-app-shop-admin/dist/web/static/mp3/yichang.MP3