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 @@
-
+
- 导出
+ 导出
-->
- 导出
+ 导出
-->
- 导出
+ 导出
-
-
-
-
-
+
@@ -113,6 +109,14 @@
+
+
+
+
+
+
+
+
diff --git a/admin-web-master/src/views/atmosphere/atmosphereGl.vue b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
index bcce4a5..3ab4225 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereGl.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereGl.vue
@@ -153,7 +153,7 @@
-
+
diff --git a/admin-web-master/src/views/online/detailQuery/index.vue b/admin-web-master/src/views/online/detailQuery/index.vue
index 9155ece..a3b5dbc 100644
--- a/admin-web-master/src/views/online/detailQuery/index.vue
+++ b/admin-web-master/src/views/online/detailQuery/index.vue
@@ -232,7 +232,7 @@ paryTime:[]
limit: 10,
minOrderPrice:'',
maxOrderPrice:'',
- orderTimeStart:'',
+ orderTimeStart:'2024-1-1 00:00:00',
orderTimeEnd:'',
},
minMach:'',
@@ -246,7 +246,7 @@ paryTime:[]
},
methods: {
async getOrder(){
- this.getFirstDayOfYear()
+ // this.getFirstDayOfYear()
this.getLastDayOfYear()
const res = await merchantQueries(this.pageindex)
this.tableData = res.data
diff --git a/admin-web-master/src/views/online/reconciliationDetails/index.vue b/admin-web-master/src/views/online/reconciliationDetails/index.vue
index 6d46bd3..901c0c3 100644
--- a/admin-web-master/src/views/online/reconciliationDetails/index.vue
+++ b/admin-web-master/src/views/online/reconciliationDetails/index.vue
@@ -204,7 +204,7 @@ export default {
merchantId:'9E602E5977EC48DEA06D42C67F4C93F0',
page: 1,
limit: 10,
- orderTimeStart:'',
+ orderTimeStart:'2024-1-1 00:00:00',
orderTimeEnd:'',
},
}
@@ -215,7 +215,7 @@ export default {
},
methods: {
async getOrder(){
- this.getFirstDayOfYear()
+ // this.getFirstDayOfYear()
this.getLastDayOfYear()
const res = await merchantQueries(this.pageindex)
this.tableData = res.data
diff --git a/admin-web-master/src/views/online/reportDownload/index.vue b/admin-web-master/src/views/online/reportDownload/index.vue
index 56b044a..a6d613c 100644
--- a/admin-web-master/src/views/online/reportDownload/index.vue
+++ b/admin-web-master/src/views/online/reportDownload/index.vue
@@ -192,7 +192,7 @@ export default {
merchantId:'9E602E5977EC48DEA06D42C67F4C93F0',
page: 1,
limit: 10,
- orderTimeStart:'',
+ orderTimeStart:'2024-1-1 00:00:00',
orderTimeEnd:'',
},
}
@@ -203,7 +203,7 @@ export default {
},
methods: {
async getOrder(){
- this.getFirstDayOfYear()
+ // this.getFirstDayOfYear()
this.getLastDayOfYear()
const res = await merchantQueries(this.pageindex)
this.tableData = res.data
diff --git a/admin-web-master/src/views/revenue/details/index.vue b/admin-web-master/src/views/revenue/details/index.vue
index c858768..c5ee64d 100644
--- a/admin-web-master/src/views/revenue/details/index.vue
+++ b/admin-web-master/src/views/revenue/details/index.vue
@@ -45,10 +45,13 @@
重置
- 导出
+
+
+ 导出
+
diff --git a/admin-web-master/src/views/revenue/totalsales/index.vue b/admin-web-master/src/views/revenue/totalsales/index.vue
index f5f9ad2..e0c4838 100644
--- a/admin-web-master/src/views/revenue/totalsales/index.vue
+++ b/admin-web-master/src/views/revenue/totalsales/index.vue
@@ -47,7 +47,7 @@
-
@@ -325,6 +325,9 @@ this.echar( this.tableData)
{
data:processedData.map(item => item.value),
type: 'line',
+ itemStyle: {
+ color: '#3f9b6a',
+ },
}
]
}
@@ -361,7 +364,10 @@ this.echar( this.tableData)
series: [
{
data:processedData.map(item => item.value),
- type: 'bar'
+ type: 'bar',
+ itemStyle: {
+ color: '#3f9b6a',
+ },
},
],
@@ -400,7 +406,10 @@ this.echar( this.tableData)
series: [
{
data:processedData.map(item => item.value),
- type: 'bar'
+ type: 'bar',
+ itemStyle: {
+ color: '#3f9b6a',
+ },
}
]
};
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index b0ad01c..d09b4b0 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -8,8 +8,8 @@
const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
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 DOMAIN_PREFIXPING = 'http://192.168.2.225:9003'
+// const DOMAIN_PREFIX = 'http://192.168.2.225:9007'
// const host = `${window.location.protocol}//${window.location.host}`
// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
diff --git a/ceres-uniapp-master/unpackage/dist/build/web/index.html b/ceres-uniapp-master/unpackage/dist/build/web/index.html
index bab0ad7..ff9bb8f 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 @@
在线商城
\ No newline at end of file
+ document.write('
')