From 5dd84cf51444e5c1f4c65e289be1ca58d53f3aac Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Mon, 31 Mar 2025 13:44:20 +0800 Subject: [PATCH] 最新 --- admin-web-master/dist.zip | Bin 6340418 -> 0 bytes admin-web-master/src/layout/index.vue | 36 ++++++++++++++++++------------------ admin-web-master/src/utils/request.js | 2 +- admin-web-master/src/utils/request2.js | 2 +- admin-web-master/src/views/online/chartAnalysis/index.vue | 4 ++-- admin-web-master/src/views/online/transaction/index.vue | 28 ++++++++++++++++------------ admin-web-master/src/views/setup/businessMenus/index.vue | 10 +++++----- ceres-uniapp-master/config/api.js | 14 +++++++------- ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue | 2 +- merchant-web-master/src/utils/request.js | 2 +- merchant-web-master/src/utils/request2.js | 2 +- merchant-web-master/src/views/commodity/commoditySystem/index.vue | 2 +- 12 files changed, 54 insertions(+), 50 deletions(-) diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index 45250fa..232f0e7 100644 Binary files a/admin-web-master/dist.zip and b/admin-web-master/dist.zip differ diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index eb19d2f..bc6f159 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -200,17 +200,17 @@ } } return { - msg: [], - list: [], + // msg: [], + // list: [], // msg: ['招商服务系统'], - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], - // list: [ - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], - // ['联机交易', '对账处理', '日志管理', '商户服务'], - // ['渠道售票统计分析', '销售额统计分析'], - // ], + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], + list: [ + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], + ['品牌策划', '活动策划', '氛围策划', '媒体推广'], + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], + ['联机交易', '对账处理', '日志管理', '商户服务'], + ['渠道售票统计分析', '销售额统计分析'], + ], listMune: [], mumeList: [], mumeChildren1: [], @@ -299,10 +299,10 @@ this.userAvatar = getUserAvatar() }, mounted() { - this.getMemu() - this.address() - this.waibu() - // this.neibu() + // this.getMemu() + // this.address() + // this.waibu() + this.neibu() }, methods: { @@ -786,12 +786,12 @@ ['联机交易', '对账处理', '日志管理', '商户服务'], ['渠道售票统计分析', '销售额统计分析'], ] - // this.neibu() + this.neibu() - this.getMemu() - this.waibu() - this.list = this.mumeList + // this.getMemu() + // this.waibu() + // this.list = this.mumeList }, diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 317e23b..97e23ec 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://128.10.249.23:9003'; + // baseURL = 'http://128.10.249.25:9003'; } else { diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index a4e9abc..4d617b6 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - baseURL = 'http://128.10.249.26'; + baseURL = 'http://128.10.249.25'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/online/chartAnalysis/index.vue b/admin-web-master/src/views/online/chartAnalysis/index.vue index ff491fd..dcc1a3d 100644 --- a/admin-web-master/src/views/online/chartAnalysis/index.vue +++ b/admin-web-master/src/views/online/chartAnalysis/index.vue @@ -90,7 +90,7 @@ tabTitle: '', jiaosucc:78, pageindex:{ - startTime:"2020-09-11", + startTime:"2020-01-01", endTime:"2030-12-29" }, Time:[], @@ -270,7 +270,7 @@ }, resetting(){ this.pageindex= { - startTime:"2020-09-11", + startTime:"2020-01-01", } const now = new Date(); const year = now.getFullYear(); diff --git a/admin-web-master/src/views/online/transaction/index.vue b/admin-web-master/src/views/online/transaction/index.vue index 5689fdc..cd21fdb 100644 --- a/admin-web-master/src/views/online/transaction/index.vue +++ b/admin-web-master/src/views/online/transaction/index.vue @@ -115,8 +115,8 @@ address: '789' }], pageindex:{ - startTime:"2024-09-11", - endTime:"2024-11-09" + startTime:"2020-01-01", + endTime:"" }, Time:[] } @@ -126,6 +126,11 @@ }, mounted() { + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0') + const day = String(now.getDate()).padStart(2, '0') + this.pageindex.endTime= `${year}-${month}-${day}` this.getAll() }, methods: { @@ -256,19 +261,18 @@ let processedData = datas.map(item => ({ } }, resetting(){ - this.pageindex= { - startTime:"2024-09-11", - endTime:"2024-11-09" - }, - this.Time=[] + this.pageindex= { + startTime:"2020-01-01", + } + const now = new Date(); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0') + const day = String(now.getDate()).padStart(2, '0') + this.pageindex.endTime= `${year}-${month}-${day}` + this.Time=[] this.getAll() }, - handleSizeChange() { - }, - handleCurrentChange() { - - } } } diff --git a/admin-web-master/src/views/setup/businessMenus/index.vue b/admin-web-master/src/views/setup/businessMenus/index.vue index bdd5ef0..21d36b6 100644 --- a/admin-web-master/src/views/setup/businessMenus/index.vue +++ b/admin-web-master/src/views/setup/businessMenus/index.vue @@ -171,7 +171,7 @@ export default { return { formInline: { permissionName: '', // 搜索字段 - page: '1', // 当前页 + page: '0', // 当前页 pageSize: '10' // 每页记录数 }, total: 1, @@ -308,14 +308,14 @@ export default { // 查询 search () { this.total = 1 - this.formInline.page = 1 + this.formInline.page = 0 this.getAll(this.formInline) }, // 清除 clear () { this.formInline = { permissionName: '', // 搜索字段 - page: '1', // 当前页 + page: '0', // 当前页 pageSize: '10' // 每页记录数 } this.getAll(this.formInline) @@ -506,8 +506,8 @@ export default { // 初始化查询所有数据 async getAll (formInline) { const res = await businessTabsGetAll(formInline) - this.tableData = res.data.list - this.total = res.data.total + this.tableData = res.data.content + this.total = res.data.totalElements } } } diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index 8e08a21..32b49ed 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -1,7 +1,7 @@ -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' -// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' // const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003' // const DOMAIN_PREFIX = 'http://128.10.249.26:9007' // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' @@ -9,10 +9,10 @@ // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/' -const host = `${window.location.protocol}//${window.location.host}` -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` -const TIAOZHUAN = `${host}/cdwlMall/` +// const host = `${window.location.protocol}//${window.location.host}` +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server` +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` +// const TIAOZHUAN = `${host}/cdwlMall/` diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue index ed54eda..5754097 100644 --- a/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue +++ b/ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue @@ -145,7 +145,7 @@ + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/service-product-detail.png"> diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index 8ccb67e..6b24312 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -21,7 +21,7 @@ let PREFIX; // PREFIX = 'http://8.130.38.56:8027/business-server'; // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - PREFIX = 'http://128.10.249.26:9004'; + PREFIX = 'http://128.10.249.25:9004'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004'; diff --git a/merchant-web-master/src/utils/request2.js b/merchant-web-master/src/utils/request2.js index 9f3843a..692b44b 100644 --- a/merchant-web-master/src/utils/request2.js +++ b/merchant-web-master/src/utils/request2.js @@ -21,7 +21,7 @@ let PREFIX; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'; // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'; - PREFIX = 'http://128.10.249.26:9007'; + PREFIX = 'http://128.10.249.25:9007'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004'; diff --git a/merchant-web-master/src/views/commodity/commoditySystem/index.vue b/merchant-web-master/src/views/commodity/commoditySystem/index.vue index 44dc662..8788d45 100644 --- a/merchant-web-master/src/views/commodity/commoditySystem/index.vue +++ b/merchant-web-master/src/views/commodity/commoditySystem/index.vue @@ -114,7 +114,7 @@
只能上传xlsx文件，且不超过10M
上传前不知道excel模板的，请点击 - 点我下载模板 去下载 + 点我下载模板 去下载

-- libgit2 0.21.4