From e7a2677d218750f5f50a323575fd9a4974463be3 Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Wed, 8 Jan 2025 12:01:25 +0800 Subject: [PATCH] '更新' --- admin-web-master/src/layout/index.vue | 11 +++++------ admin-web-master/src/utils/request.js | 3 ++- admin-web-master/src/utils/request2.js | 2 +- admin-web-master/src/views/analysis/ranking/index.vue | 4 ++-- admin-web-master/src/views/analysis/refund/index.vue | 2 +- admin-web-master/src/views/analysis/statistics/index.vue | 2 +- admin-web-master/src/views/atmosphere/atmosphereBian.vue | 2 +- admin-web-master/src/views/atmosphere/atmosphereBz.vue | 14 +++++++++----- admin-web-master/src/views/atmosphere/atmosphereGl.vue | 2 +- admin-web-master/src/views/online/detailQuery/index.vue | 4 ++-- admin-web-master/src/views/online/reconciliationDetails/index.vue | 4 ++-- admin-web-master/src/views/online/reportDownload/index.vue | 4 ++-- admin-web-master/src/views/revenue/details/index.vue | 5 ++++- admin-web-master/src/views/revenue/totalsales/index.vue | 15 ++++++++++++--- ceres-uniapp-master/config/api.js | 4 ++-- ceres-uniapp-master/unpackage/dist/build/web/index.html | 2 +- ceres-uniapp-master/unpackage/dist/build/web/static/js/index.5c68187c.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/index.db66890d.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.9c62debe.js | 15 --------------- ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.f19d9eee.js | 15 +++++++++++++++ ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.0ad9eb32.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.c01075b6.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.7f6ffe12.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.bb95b8d4.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.07f2bda7.js | 1 + ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.36341819.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page2-userModule-personalDetails.7873a24c.js | 1 - ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page2-userModule-personalDetails.fdd55413.js | 1 + merchant-web-master/src/utils/request.js | 4 ++-- yanshouban/src/utils/request.js | 9 ++++----- yanshouban/src/views/activity/activitySp.vue | 4 ++-- yanshouban/src/views/atmosphere/atmosphereBian.vue | 2 +- yanshouban/src/views/atmosphere/atmosphereBz.vue | 14 +++++++++----- yanshouban/src/views/atmosphere/atmosphereGl.vue | 8 ++------ yanshouban/src/views/atmosphere/atmosphereSp.vue | 4 ++-- yanshouban/src/views/online/reconciliationDetails/index.vue | 4 ++-- yanshouban/src/views/online/reportDownload/index.vue | 6 +++--- 37 files changed, 95 insertions(+), 80 deletions(-) create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.5c68187c.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/index.db66890d.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.9c62debe.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages-tabbar-user-index.f19d9eee.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.0ad9eb32.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-goodsModule-userEvaluate.c01075b6.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.7f6ffe12.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-logisticsInfo.bb95b8d4.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.07f2bda7.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page1-orderModule-orderDetails.36341819.js delete mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page2-userModule-personalDetails.7873a24c.js create mode 100644 ceres-uniapp-master/unpackage/dist/build/web/static/js/pages_category_page2-userModule-personalDetails.fdd55413.js diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index 1a2c266..75e8128 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -260,9 +260,9 @@ export default { listMune:[], list:[ // ['招商资源监测','招商租赁管理','系统设置'] - ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'], - // ['问卷调查'], - // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'], + // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'], + + ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], ['品牌策划','活动策划','氛围策划','媒体推广'], ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], ['联机交易','对账处理','日志管理','商户服务'], @@ -641,9 +641,8 @@ this.listMune[0] = All this.listMune = [] this.list=[ // ['招商资源监测','招商租赁管理','系统设置'] - ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'], - // ['问卷调查'], - // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'], + // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'], + ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], ['品牌策划','活动策划','氛围策划','媒体推广'], ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], ['联机交易','对账处理','日志管理','商户服务'], diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 99d4281..4c83187 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -15,7 +15,8 @@ let hostall = window.location.href; // const baseURL = 'http://192.168.2.38:9003'; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; + // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; + baseURL = 'http://192.168.2.225:9003'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index d56ef2c..5dd84ec 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -15,7 +15,7 @@ let hostall = window.location.href; // const baseURL = 'http://192.168.2.38:9003'; let baseURL = '' // || host === 'localhost:9528' -if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === '192.168.31.45:9529') { +if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server'; baseURL = 'http://172.16.61.125:9004'; } else { diff --git a/admin-web-master/src/views/analysis/ranking/index.vue b/admin-web-master/src/views/analysis/ranking/index.vue index fd6026f..9dcc26d 100644 --- a/admin-web-master/src/views/analysis/ranking/index.vue +++ b/admin-web-master/src/views/analysis/ranking/index.vue @@ -9,7 +9,7 @@