diff --git a/admin-web-master/src/api/online.js b/admin-web-master/src/api/online.js
index a013a39..6e957f2 100644
--- a/admin-web-master/src/api/online.js
+++ b/admin-web-master/src/api/online.js
@@ -36,7 +36,7 @@ export function transactionTrafficMonitoring(data) {
//日志查询分析
export function logQuery(data) {
return request({
- url: '/businessPermission/logQueryAnalysis',
+ url: '/businessPermission/payLogQueryAnalysis',
method: 'post',
data
})
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 3c359a2..a4e9abc 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.239004';
+ baseURL = 'http://128.10.249.26';
} else {
console.error('---------------------')
console.error(hostall)
diff --git a/admin-web-master/src/views/online/LQAnalysis/index.vue b/admin-web-master/src/views/online/LQAnalysis/index.vue
index 45ab0d1..5a5c96c 100644
--- a/admin-web-master/src/views/online/LQAnalysis/index.vue
+++ b/admin-web-master/src/views/online/LQAnalysis/index.vue
@@ -1,345 +1,290 @@
-
-
-
-
-
-
-
-
-
- {{scope.$index+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.type == '1'?'平台端':scope.row.type == '2'?'商家端':'C端'}}
-
-
-
-
- {{scope.row.time}}秒
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 返回
- 编辑
- 确定
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.type == '1'?'平台端':scope.row.type == '2'?'商家端':'C端'}}
+
+
+
+
+ {{scope.row.time}}秒
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+ 编辑
+ 确定
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/admin-web-master/src/views/online/chartAnalysis/index.vue b/admin-web-master/src/views/online/chartAnalysis/index.vue
index 41b1d98..ff491fd 100644
--- a/admin-web-master/src/views/online/chartAnalysis/index.vue
+++ b/admin-web-master/src/views/online/chartAnalysis/index.vue
@@ -47,6 +47,17 @@
周同比{{transactionSuccessRates.changeAmount}}
+
交易数据统计
+
+
+
下单数:{{paymentChannels.paymentQuantity}}
+
总交易额(元):{{paymentChannels.price}}
+
退款金额(元):{{paymentChannels.refundPrice}}
+
+
+
+
+
@@ -80,10 +91,11 @@
jiaosucc:78,
pageindex:{
startTime:"2020-09-11",
- endTime:"2024-11-09"
+ endTime:"2030-12-29"
},
Time:[],
- transactionSuccessRates:{}
+ transactionSuccessRates:{},
+ paymentChannels:{}
}
},
computed: {},
@@ -104,6 +116,7 @@
getAll(){
chartAnalysis(this.pageindex).then(res=>{
this.transactionSuccessRates = res.data.transactionSuccessRates
+ this.paymentChannels = res.data.paymentChannels[0]
if(res.data.userTraffics &&res.data.paymentChannels ){
this.kong(res.data.userTraffics)
this.shopB(res.data.paymentChannels)
@@ -257,9 +270,13 @@
},
resetting(){
this.pageindex= {
- startTime:"2024-09-11",
- endTime:"2024-11-09"
- },
+ startTime:"2020-09-11",
+ }
+ 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()
},
diff --git a/admin-web-master/src/views/online/detailQuery/index.vue b/admin-web-master/src/views/online/detailQuery/index.vue
index 8df3de2..935650c 100644
--- a/admin-web-master/src/views/online/detailQuery/index.vue
+++ b/admin-web-master/src/views/online/detailQuery/index.vue
@@ -270,7 +270,7 @@ export default {
onSubmit(){
-
+ this.pageindex.pageNumber = 0
this.getOrder()
},
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index b7dc64e..5f228b0 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -2,8 +2,8 @@
// 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.33:9003'
-const DOMAIN_PREFIX = 'http://128.10.249.33:9007'
+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'
// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
@@ -338,5 +338,12 @@ module.exports = {
//查询积分使用情况
pointsDetails:WX_API_BASE+ '/memberManagement/pointsDetails',
//查询待支付地址
- huoquUrl:WX_API_BASEPING+ '/order/getById'
+ huoquUrl:WX_API_BASEPING+ '/order/getById',
+ // 客户发送消息
+ keSever:WX_API_BASE+ '/cereMessageCustomerServiceChat/user/save',
+ // 查看客服消息列表
+ keSeverList:WX_API_BASE+ '/cereMessageCustomerServiceChat/user/list',
+ // 用户查看商家消息
+ keSeverList:WX_API_BASE+ '/cereMessageCustomerServiceChat/user/getDetails',
+
}
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list.vue b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
index f0a6831..fd63bc0 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/list.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
@@ -55,7 +55,7 @@
已领取
-
+
{{ item.ifCredit ? '立即兑换' : '立即领取' }}
@@ -293,7 +293,7 @@
.unit {
color: #FFEBC4;
- font-size: 36rpx;
+ font-size: 52rpx;
}
.priceValue {
diff --git a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
index 3e755d4..47cc989 100644
--- a/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
+++ b/ceres-uniapp-master/pages_category_page1/customer/chatBox.vue
@@ -4,49 +4,126 @@
-