From 137c0ee805a1ae6cb5357e8891ed7ff4a861a21a Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Mon, 30 Dec 2024 18:17:33 +0800 Subject: [PATCH] 'yanshou' --- ceres-uniapp-master/config/api.js | 13 +++++-------- ceres-uniapp-master/manifest.json | 2 +- ceres-uniapp-master/unpackage/dist/build/web/index.html | 2 +- ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1afe1c3b.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/index.be8bdfc9.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/index.fd994b67.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.24d60b1f.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.4c7f8aaf.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.8010d32d.js | 1 - merchant-web-master/src/api/commodity.js | 34 ++++++++++++++++++++++++++++++++++ merchant-web-master/src/layout/index.vue | 2 +- merchant-web-master/src/utils/request.js | 7 ++++--- merchant-web-master/src/views/comprehensive/dAddress/index.vue | 25 +++++++++++++++---------- merchant-web-master/src/views/comprehensive/psRanking/index.vue | 2 +- merchant-web-master/src/views/comprehensive/purchaseDetails/index.vue | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ merchant-web-master/src/views/order/pending/index.vue | 8 ++++++++ merchant-web-master/src/views/salesSta/dataSta.vue | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- yanshouban/src/App.vue | 1 - yanshouban/src/main.js | 2 +- yanshouban/src/utils/jiami.js | 3 ++- yanshouban/src/utils/request.js | 4 ++-- yanshouban/src/views/activity/activityBian.vue | 2 +- yanshouban/src/views/activity/activityHis.vue | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- yanshouban/src/views/activity/activitySp.vue | 5 ++++- yanshouban/src/views/activity/index.vue | 51 +++++++++++++++++++++++++++++++++++++++------------ yanshouban/src/views/ads/fangAudit/index.vue | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- yanshouban/src/views/atmosphere/atmosphereBian.vue | 2 +- yanshouban/src/views/atmosphere/atmosphereGl.vue | 39 +++++++++++++++++++++++++++++---------- yanshouban/src/views/atmosphere/atmosphereHis.vue | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- yanshouban/src/views/atmosphere/atmosphereSp.vue | 14 ++++++++++---- yanshouban/src/views/customer/icManagement/index.vue | 2 +- yanshouban/src/views/customer/icReview/index.vue | 807 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/customer/rsaManagement/index.vue | 2 +- yanshouban/src/views/customer/rsaReview/index.vue | 994 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/customer/yixiang/index.vue | 10 +++++++--- yanshouban/src/views/detect/admap.vue | 8 ++++++-- yanshouban/src/views/detect/analyse.vue | 2 +- yanshouban/src/views/detect/information.vue | 8 ++++++-- yanshouban/src/views/detect/map.vue | 8 ++++++-- yanshouban/src/views/ipm/followup/index.vue | 39 ++++++++++++++++++++++++++++----------- yanshouban/src/views/ipm/inr/index.vue | 25 ++++++++++++++++++++++--- yanshouban/src/views/media/mediaMana.vue | 2 +- yanshouban/src/views/promotion/account.vue | 66 ++++++++++++++++++++++++++++++++++++++++++++++-------------------- yanshouban/src/views/promotion/contentMant.vue | 10 +++++++--- yanshouban/src/views/scheme/planningPar.vue | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- yanshouban/src/views/shopRental/manage/index.vue | 49 +++++++++++++++++++++++++++++++++++++++---------- 47 files changed, 2245 insertions(+), 1269 deletions(-) delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.1afe1c3b.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.be8bdfc9.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.fd994b67.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.24d60b1f.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.4c7f8aaf.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-question-question.8010d32d.js create mode 100644 merchant-web-master/src/views/comprehensive/purchaseDetails/index.vue diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index a23a99a..3483c70 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -3,21 +3,18 @@ // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' // const DOMAIN_PREFIXPING = 'http://192.168.2.7:9003' // const DOMAIN_PREFIX = 'http://192.168.2.7:9007' -// const host = `${window.location.protocol}//${window.location.host}` -// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` -// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server' -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' -// const DOMAIN_PREFIXPING = 'http://192.168.2.162:9003' -// const DOMAIN_PREFIX = 'http://192.168.2.162:9007' +// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' +const DOMAIN_PREFIXPING = 'http://192.168.2.120:9003' +const DOMAIN_PREFIX = 'http://192.168.2.120:9007' // const host = `${window.location.protocol}//${window.location.host}` // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -const DOMAIN_PREFIXPING = `http://8.130.38.56:9003` -const DOMAIN_PREFIX = 'http://8.130.38.56:9007' +// const DOMAIN_PREFIXPING = `http://8.130.38.56:9003` +// const DOMAIN_PREFIX = 'http://8.130.38.56:9007' // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' diff --git a/ceres-uniapp-master/manifest.json b/ceres-uniapp-master/manifest.json index e8aa1f2..d221efd 100644 --- a/ceres-uniapp-master/manifest.json +++ b/ceres-uniapp-master/manifest.json @@ -149,7 +149,7 @@ "h5" : { "router" : { "mode" : "history", - "base" : "/h5" + "base" : "cdwlMall/meh5" }, "title" : "问卷调查", "domain" : "", diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html index d15bd89..e84a49f 100644 --- a/ceres-uniapp-master/unpackage/dist/build/web/index.html +++ b/ceres-uniapp-master/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@