From 8dca79c8b0e189fd2f308fa8e02c6edbed3bb41c Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Thu, 20 Mar 2025 21:22:06 +0800 Subject: [PATCH] 1 --- admin-web-master/dist.zip | Bin 0 -> 6007429 bytes admin-web-master/src/App.vue | 22 +++++++++++++++++++++- admin-web-master/src/api/orderany.js | 8 ++++++++ admin-web-master/src/layout/index.vue | 36 ++++++++++++++++++------------------ admin-web-master/src/utils/request.js | 2 +- admin-web-master/src/views/activity/activityHis.vue | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- admin-web-master/src/views/activity/index.vue | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- admin-web-master/src/views/atmosphere/atmosphereGl.vue | 50 +++++++++++++++++++++++++++++++++++++------------- admin-web-master/src/views/atmosphere/atmosphereHis.vue | 1425 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin-web-master/src/views/customer/rsaManagement/tanpan.vue | 2 +- admin-web-master/src/views/online/transaction/index.vue | 4 ++-- admin-web-master/src/views/order/orderany/index.vue | 34 +++++++++++++--------------------- admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue | 4 ++++ ceres-uniapp-master/config/api.js | 18 +++++++++--------- ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue | 5 ++++- ceres-uniapp-master/pages_category_page1/question/question.vue | 6 +++--- ceres-uniapp-master/unpackage/dist/build/web.zip | Bin 2109338 -> 0 bytes ceres-uniapp-master/unpackage/dist/build/web/index.html | 2 +- ceres-uniapp-master/unpackage/dist/build/web/static/js/index.e3b2f5bb.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/index.ff1d2f6b.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.b1815acb.js | 15 +++++++++++++++ ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.cb9364b9.js | 15 --------------- ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index~pages_category_page1-askedquestion-askedquestion~pages_category_page1-distri~7d8e2b7c.a9232f86.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index~pages_category_page1-askedquestion-askedquestion~pages_category_page1-distri~ec9e5acf.4ff98278.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate.16aaa3a1.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate.dc22a6fe.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate~pages_category_page1-goodsModule-evaluate~pages_categor~062958de.2319e26a.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluateDetails.0ecb5cf7.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluateDetails.91f004c7.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluate~pages_category_page1-orderModule-Intervene~pages_category_~b100d078.70719004.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.3890c151.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.cc905e6c.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.9e42382c.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.b438ceb6.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-afterSaleApply.67655e93.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-afterSaleApply.a069e6ad.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-index.cc54d0d0.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-index.f11e95c3.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.17baada8.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.600bd286.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.16f3035b.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.ca9b0fff.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.2df722e3.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.9ca4c526.js | 1 + merchant-web-master/src/App.vue | 31 ++++++++++++++++++++++++++++--- merchant-web-master/src/api/psRanking.js | 12 ++++++++++-- merchant-web-master/src/utils/request.js | 2 +- merchant-web-master/src/views/comprehensive/Lcinquiry/index.vue | 97 ++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- merchant-web-master/src/views/comprehensive/OrderRhq/index.vue | 6 +++--- merchant-web-master/src/views/comprehensive/dAddress/index.vue | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------ merchant-web-master/src/views/comprehensive/pEranking/index.vue | 50 ++++++++++++++++++++------------------------------ merchant-web-master/src/views/comprehensive/pcdetails/index.vue | 64 +++++++++++++++++++++++++--------------------------------------- merchant-web-master/src/views/comprehensive/psRanking/index.vue | 35 ++++++++--------------------------- merchant-web-master/src/views/comprehensive/purchaseDetails/index.vue | 8 ++++---- merchant-web-master/src/views/stockControl/inventory/addCommodity.vue | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- merchant-web-master/src/views/stockControl/inventory/index.vue | 3 ++- 56 files changed, 1388 insertions(+), 1174 deletions(-) create mode 100644 admin-web-master/dist.zip create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.e3b2f5bb.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.ff1d2f6b.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.b1815acb.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.cb9364b9.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index~pages_category_page1-askedquestion-askedquestion~pages_category_page1-distri~7d8e2b7c.a9232f86.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index~pages_category_page1-askedquestion-askedquestion~pages_category_page1-distri~ec9e5acf.4ff98278.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate.16aaa3a1.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate.dc22a6fe.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-addEvaluate~pages_category_page1-goodsModule-evaluate~pages_categor~062958de.2319e26a.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluateDetails.0ecb5cf7.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluateDetails.91f004c7.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-evaluate~pages_category_page1-orderModule-Intervene~pages_category_~b100d078.70719004.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.3890c151.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-goodsDetails.cc905e6c.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.9e42382c.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.b438ceb6.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-afterSaleApply.67655e93.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-afterSaleApply.a069e6ad.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-index.cc54d0d0.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-index.f11e95c3.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.17baada8.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.600bd286.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.16f3035b.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.ca9b0fff.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.2df722e3.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.9ca4c526.js diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip new file mode 100644 index 0000000..53cf546 Binary files /dev/null and b/admin-web-master/dist.zip differ diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue index c531627..a848400 100644 --- a/admin-web-master/src/App.vue +++ b/admin-web-master/src/App.vue @@ -87,7 +87,27 @@ export default { };