Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

2024-02-27 18:05:22 +08:00 · 2024-02-27 18:05:22 +08:00 · f4b3b82fb7
commit f4b3b82fb7
parent cde71f49a7 32ffa10737
265 changed files with 152 additions and 150 deletions
--- a/public/index.html
+++ b/public/index.html
@ -2,4 +2,4 @@
            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' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.3822bc6e.js></script><script src=/static/js/index.e5ed9214.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.19ab3404.js></script></body></html>
--- a/public/static/index.2da1efab.css
+++ b/public/static/index.2da1efab.css
--- a/public/static/js/chunk-vendors.3822bc6e.js
+++ b/public/static/js/chunk-vendors.3822bc6e.js
--- a/public/static/js/chunk-vendors.c6349b23.js
+++ b/public/static/js/chunk-vendors.c6349b23.js
--- a/public/static/js/index.19ab3404.js
+++ b/public/static/js/index.19ab3404.js
--- a/public/static/js/index.e5ed9214.js
+++ b/public/static/js/index.e5ed9214.js
--- a/public/static/js/pages-activity-assist-index.39415655.js
+++ b/public/static/js/pages-activity-assist-index.39415655.js
--- a/public/static/js/pages-activity-assist-index.3dd44054.js
+++ b/public/static/js/pages-activity-assist-index.3dd44054.js
--- a/public/static/js/pages-activity-assist_detail-index.848863a6.js
+++ b/public/static/js/pages-activity-assist_detail-index.848863a6.js
--- a/public/static/js/pages-activity-assist_detail-index.a4d5c4b7.js
+++ b/public/static/js/pages-activity-assist_detail-index.a4d5c4b7.js
--- a/public/static/js/pages-activity-assist_detail-index~pages-activity-goods_seckill_details-index~pages-activity-presell~d17b42ce.2b2e0e75.js
+++ b/public/static/js/pages-activity-assist_detail-index~pages-activity-goods_seckill_details-index~pages-activity-presell~d17b42ce.2b2e0e75.js
--- a/public/static/js/pages-activity-assist_detail-index~pages-activity-goods_seckill_details-index~pages-activity-presell~d17b42ce.69633b94.js
+++ b/public/static/js/pages-activity-assist_detail-index~pages-activity-goods_seckill_details-index~pages-activity-presell~d17b42ce.69633b94.js
--- a/public/static/js/pages-activity-assist_record-index.c12da29d.js
+++ b/public/static/js/pages-activity-assist_record-index.c12da29d.js
--- a/public/static/js/pages-activity-assist_record-index.d097c6b4.js
+++ b/public/static/js/pages-activity-assist_record-index.d097c6b4.js
--- a/public/static/js/pages-activity-collect_coupons-index.4b92b302.js
+++ b/public/static/js/pages-activity-collect_coupons-index.4b92b302.js
--- a/public/static/js/pages-activity-collect_coupons-index.e8ef5004.js
+++ b/public/static/js/pages-activity-collect_coupons-index.e8ef5004.js
--- a/public/static/js/pages-activity-combination-index.4c38312e.js
+++ b/public/static/js/pages-activity-combination-index.4c38312e.js
--- a/public/static/js/pages-activity-combination_status-index.69546bba.js
+++ b/public/static/js/pages-activity-combination_status-index.69546bba.js
--- a/public/static/js/pages-activity-combination_status-index.9970f6c1.js
+++ b/public/static/js/pages-activity-combination_status-index.9970f6c1.js
--- a/public/static/js/pages-activity-goods_seckill-index.693bc844.js
+++ b/public/static/js/pages-activity-goods_seckill-index.693bc844.js
--- a/public/static/js/pages-activity-goods_seckill_details-index~pages-admin-goods_details-index.259360f7.js
+++ b/public/static/js/pages-activity-goods_seckill_details-index~pages-admin-goods_details-index.259360f7.js
--- a/public/static/js/pages-activity-goods_seckill_details-index~pages-admin-goods_details-index.4c500c33.js
+++ b/public/static/js/pages-activity-goods_seckill_details-index~pages-admin-goods_details-index.4c500c33.js
--- a/public/static/js/pages-activity-lifeService-index.a4d5a6ef.js
+++ b/public/static/js/pages-activity-lifeService-index.a4d5a6ef.js
--- a/public/static/js/pages-activity-liveBroadcast-index.a28a3509.js
+++ b/public/static/js/pages-activity-liveBroadcast-index.a28a3509.js
--- a/public/static/js/pages-activity-presell-index.7e743dca.js
+++ b/public/static/js/pages-activity-presell-index.7e743dca.js
--- a/public/static/js/pages-activity-presell-index.a4487cde.js
+++ b/public/static/js/pages-activity-presell-index.a4487cde.js
--- a/public/static/js/pages-activity-presell-index~pages-helpPeople-formTable~pages-users-user_info-index.f4592c41.js
+++ b/public/static/js/pages-activity-presell-index~pages-helpPeople-formTable~pages-users-user_info-index.f4592c41.js
--- a/public/static/js/pages-activity-presell_details-index.97307cb0.js
+++ b/public/static/js/pages-activity-presell_details-index.97307cb0.js
--- a/public/static/js/pages-activity-presell_details-index.b8975cb8.js
+++ b/public/static/js/pages-activity-presell_details-index.b8975cb8.js
--- a/public/static/js/pages-activity-rank-index.69ab03a5.js
+++ b/public/static/js/pages-activity-rank-index.69ab03a5.js
--- a/public/static/js/pages-activity-topic-index.438d17b0.js
+++ b/public/static/js/pages-activity-topic-index.438d17b0.js
--- a/public/static/js/pages-activity-topic-index.9a7b19c0.js
+++ b/public/static/js/pages-activity-topic-index.9a7b19c0.js
--- a/public/static/js/pages-activity-topic_detail-index.6c175656.js
+++ b/public/static/js/pages-activity-topic_detail-index.6c175656.js
--- a/public/static/js/pages-activity-topic_detail-index.e6dcfe4d.js
+++ b/public/static/js/pages-activity-topic_detail-index.e6dcfe4d.js
--- a/public/static/js/pages-admin-cancellate_result-index.8ea85827.js
+++ b/public/static/js/pages-admin-cancellate_result-index.8ea85827.js
--- a/public/static/js/pages-admin-cancellate_result-index.ac2c8aef.js
+++ b/public/static/js/pages-admin-cancellate_result-index.ac2c8aef.js
--- a/public/static/js/pages-admin-goods_details-index.ad499537.js
+++ b/public/static/js/pages-admin-goods_details-index.ad499537.js
--- a/public/static/js/pages-admin-stockOut-index.0aab4659.js
+++ b/public/static/js/pages-admin-stockOut-index.0aab4659.js
--- a/public/static/js/pages-admin-stockOut-index.f2a15683.js
+++ b/public/static/js/pages-admin-stockOut-index.f2a15683.js
--- a/public/static/js/pages-annex-vip_center-index~pages-annex-vip_paid-index~pages-newActivity-giftBag-giftBag~pages-nong~7a60d616.1cbf50b7.js
+++ b/public/static/js/pages-annex-vip_center-index~pages-annex-vip_paid-index~pages-newActivity-giftBag-giftBag~pages-nong~7a60d616.1cbf50b7.js
--- a/public/static/js/pages-annex-vip_center-index~pages-annex-vip_paid-index~pages-newActivity-giftBag-giftBag~pages-nong~7a60d616.f783074e.js
+++ b/public/static/js/pages-annex-vip_center-index~pages-annex-vip_paid-index~pages-newActivity-giftBag-giftBag~pages-nong~7a60d616.f783074e.js
--- a/public/static/js/pages-annex-vip_clause-index.b3065999.js
+++ b/public/static/js/pages-annex-vip_clause-index.b3065999.js
--- a/public/static/js/pages-annex-vip_grade-index.8bbe3873.js
+++ b/public/static/js/pages-annex-vip_grade-index.8bbe3873.js
--- a/public/static/js/pages-chat-customer_list-chat.8c40a5a8.js
+++ b/public/static/js/pages-chat-customer_list-chat.8c40a5a8.js
--- a/public/static/js/pages-chat-customer_list-chat.c93cd4b8.js
+++ b/public/static/js/pages-chat-customer_list-chat.c93cd4b8.js
--- a/public/static/js/pages-chat-customer_list-index.1abd0944.js
+++ b/public/static/js/pages-chat-customer_list-index.1abd0944.js
--- a/public/static/js/pages-chat-customer_list-index.d1064214.js
+++ b/public/static/js/pages-chat-customer_list-index.d1064214.js
--- a/public/static/js/pages-columnGoods-HotNewGoods-index.debcc1f1.js
+++ b/public/static/js/pages-columnGoods-HotNewGoods-index.debcc1f1.js
--- a/public/static/js/pages-columnGoods-HotNewGoods-index.f3640f09.js
+++ b/public/static/js/pages-columnGoods-HotNewGoods-index.f3640f09.js
--- a/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~2568da14.26b2c40c.js
+++ b/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~2568da14.26b2c40c.js
--- a/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~2568da14.b3157a16.js
+++ b/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~2568da14.b3157a16.js
--- a/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~9c3f1f1b.1086d795.js
+++ b/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~9c3f1f1b.1086d795.js
--- a/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~9c3f1f1b.63149f2f.js
+++ b/public/static/js/pages-columnGoods-goods_coupon_list-index~pages-columnGoods-goods_list-index~pages-columnGoods-goods~9c3f1f1b.63149f2f.js
--- a/public/static/js/pages-columnGoods-goods_search-index.873b647f.js
+++ b/public/static/js/pages-columnGoods-goods_search-index.873b647f.js
--- a/public/static/js/pages-columnGoods-goods_search-index.e80b081f.js
+++ b/public/static/js/pages-columnGoods-goods_search-index.e80b081f.js
--- a/public/static/js/pages-commissionedSales-initiateDelegation-index.bc9f4b5d.js
+++ b/public/static/js/pages-commissionedSales-initiateDelegation-index.bc9f4b5d.js
--- a/public/static/js/pages-commissionedSales-initiateDelegation-index.f9c341b6.js
+++ b/public/static/js/pages-commissionedSales-initiateDelegation-index.f9c341b6.js
--- a/public/static/js/pages-commissionedSales-receivedCommission-index.4b8259c4.js
+++ b/public/static/js/pages-commissionedSales-receivedCommission-index.4b8259c4.js
--- a/public/static/js/pages-commissionedSales-receivedCommission-index.dfd73d11.js
+++ b/public/static/js/pages-commissionedSales-receivedCommission-index.dfd73d11.js
--- a/public/static/js/pages-gather-gather.13de0966.js
+++ b/public/static/js/pages-gather-gather.13de0966.js
--- a/public/static/js/pages-gather-gather.f06e5161.js
+++ b/public/static/js/pages-gather-gather.f06e5161.js
--- a/public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.3a701794.js
+++ b/public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.3a701794.js
--- a/public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.524ea083.js
+++ b/public/static/js/pages-gather-gather~pages-moreProject-moreProject~pages-plant_release-index~pages-trading_hall-adddi~105e47dc.524ea083.js
--- a/public/static/js/pages-goods_cate-goods_cate.19802d66.js
+++ b/public/static/js/pages-goods_cate-goods_cate.19802d66.js
--- a/public/static/js/pages-goods_details-index.e51e9103.js
+++ b/public/static/js/pages-goods_details-index.e51e9103.js
--- a/public/static/js/pages-goods_details-index.f05932f3.js
+++ b/public/static/js/pages-goods_details-index.f05932f3.js
--- a/public/static/js/pages-goods_details-index_v.6a15bfe7.js
+++ b/public/static/js/pages-goods_details-index_v.6a15bfe7.js
--- a/public/static/js/pages-goods_details-index_v.a1c17d9f.js
+++ b/public/static/js/pages-goods_details-index_v.a1c17d9f.js
--- a/public/static/js/pages-helpPeople-formTable.6337bf94.js
+++ b/public/static/js/pages-helpPeople-formTable.6337bf94.js
--- a/public/static/js/pages-helpPeople-formTable.e2479842.js
+++ b/public/static/js/pages-helpPeople-formTable.e2479842.js
--- a/public/static/js/pages-helpPeople-formTable~pages-users-user_info-index.aefa22de.js
+++ b/public/static/js/pages-helpPeople-formTable~pages-users-user_info-index.aefa22de.js
--- a/public/static/js/pages-index-index.a4a708f3.js
+++ b/public/static/js/pages-index-index.a4a708f3.js
--- a/public/static/js/pages-index-index.f00be2f3.js
+++ b/public/static/js/pages-index-index.f00be2f3.js
--- a/public/static/js/pages-moreProject-moreProject.072497fd.js
+++ b/public/static/js/pages-moreProject-moreProject.072497fd.js
--- a/public/static/js/pages-moreProject-moreProject.2f6e3c3e.js
+++ b/public/static/js/pages-moreProject-moreProject.2f6e3c3e.js
--- a/public/static/js/pages-newActivity-activityDetail-activityDetail~pages-newActivity-towPrice-towPrice.22cab09b.js
+++ b/public/static/js/pages-newActivity-activityDetail-activityDetail~pages-newActivity-towPrice-towPrice.22cab09b.js
--- a/public/static/js/pages-newActivity-activityDetail-activityDetail~pages-newActivity-towPrice-towPrice.2b481959.js
+++ b/public/static/js/pages-newActivity-activityDetail-activityDetail~pages-newActivity-towPrice-towPrice.2b481959.js
--- a/public/static/js/pages-newActivity-giftBag-giftBag.40dc8d91.js
+++ b/public/static/js/pages-newActivity-giftBag-giftBag.40dc8d91.js
--- a/public/static/js/pages-newActivity-giftBag-giftBag.7cc5948f.js
+++ b/public/static/js/pages-newActivity-giftBag-giftBag.7cc5948f.js
--- a/public/static/js/pages-newActivity-invitation-invitation.7586a281.js
+++ b/public/static/js/pages-newActivity-invitation-invitation.7586a281.js
--- a/public/static/js/pages-newActivity-invitation-invitation.79cfdb11.js
+++ b/public/static/js/pages-newActivity-invitation-invitation.79cfdb11.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy.441634ff.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy.441634ff.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy.aa4e0e9b.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy.aa4e0e9b.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy2.97f42b7e.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy2.97f42b7e.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy2.b531c15b.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy2.b531c15b.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy3.70d5d3fc.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy3.70d5d3fc.js
--- a/public/static/js/pages-newActivity-subsidy-subsidy3.b21a73f4.js
+++ b/public/static/js/pages-newActivity-subsidy-subsidy3.b21a73f4.js
--- a/public/static/js/pages-newActivity-towPrice-towPrice.7e52f259.js
+++ b/public/static/js/pages-newActivity-towPrice-towPrice.7e52f259.js
--- a/public/static/js/pages-news_details-index.3c00fd98.js
+++ b/public/static/js/pages-news_details-index.3c00fd98.js
--- a/public/static/js/pages-news_details-index.4ef8eddf.js
+++ b/public/static/js/pages-news_details-index.4ef8eddf.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-index.c5f96326.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-index.c5f96326.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-index.f803fdec.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-index.f803fdec.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-indexa.165c76c1.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-indexa.165c76c1.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-indexa.a806277d.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-indexa.a806277d.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-indexb.943ce55f.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-indexb.943ce55f.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-indexh.8eb9db8b.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-indexh.8eb9db8b.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-indexh.fbec7982.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-indexh.fbec7982.js
--- a/public/static/js/pages-nongKe-cloud_entrepot-index~pages-nongKe-cloud_entrepot-indexa~pages-nongKe-food-index~pages-n~5f4141fe.6edde61d.js
+++ b/public/static/js/pages-nongKe-cloud_entrepot-index~pages-nongKe-cloud_entrepot-indexa~pages-nongKe-food-index~pages-n~5f4141fe.6edde61d.js
--- a/public/static/js/pages-nongKe-gather-select_warehouse.f699e8e2.js
+++ b/public/static/js/pages-nongKe-gather-select_warehouse.f699e8e2.js
--- a/public/static/js/pages-nongKe-specialty-indexa.32b3ee03.js
+++ b/public/static/js/pages-nongKe-specialty-indexa.32b3ee03.js
--- a/Show More
+++ b/Show More