diff --git a/.env.production b/.env.production
index fec2830..3df5709 100644
--- a/.env.production
+++ b/.env.production
@@ -24,9 +24,9 @@ VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
# 趣玩
# 趣玩生产
-# VUE_APP_COS_BASE_URL = 'https://filedsjkdlas.oqpac.cn/'
+VUE_APP_COS_BASE_URL = 'https://filesdjkal.mgzhq.cn/'
# 趣玩测试
-VUE_APP_COS_BASE_URL = 'https://quyoutest-1330083379.cos.ap-guangzhou.myqcloud.com/'
+# VUE_APP_COS_BASE_URL = 'https://quyoutest-1330083379.cos.ap-guangzhou.myqcloud.com/'
VUE_APP_SYSTEM_HOME = '趣玩'
VUE_APP_TITLE = 趣玩后台管理系统
diff --git a/public/favicon-huaxiang.ico b/public/favicon-huaxiang.ico
new file mode 100644
index 0000000..5affccd
Binary files /dev/null and b/public/favicon-huaxiang.ico differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 5affccd..4869de8 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/cai/orderLogs.js b/src/api/cai/orderLogs.js
new file mode 100644
index 0000000..4fc17a7
--- /dev/null
+++ b/src/api/cai/orderLogs.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询订单日志列表
+export function listOrderLogs(query) {
+ return request({
+ url: '/cai/orderLogs/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询订单日志详细
+export function getOrderLogs(id) {
+ return request({
+ url: '/cai/orderLogs/' + id,
+ method: 'get'
+ })
+}
+
+// 新增订单日志
+export function addOrderLogs(data) {
+ return request({
+ url: '/cai/orderLogs',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改订单日志
+export function updateOrderLogs(data) {
+ return request({
+ url: '/cai/orderLogs',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除订单日志
+export function delOrderLogs(id) {
+ return request({
+ url: '/cai/orderLogs/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/cai/rechargeOrder.js b/src/api/cai/rechargeOrder.js
index 0b193af..f987dc7 100644
--- a/src/api/cai/rechargeOrder.js
+++ b/src/api/cai/rechargeOrder.js
@@ -58,3 +58,12 @@ export function listOrderLogsByOrderNo(queryParams) {
params: queryParams
})
}
+
+
+export function checkRechargeOrder(orderNo,payType) {
+ return request({
+ url: '/cai/rechargeOrder/checkPay',
+ method: 'get',
+ params: {orderNo,payType}
+ })
+}
diff --git a/src/assets/logo/logo-huaxiang.png b/src/assets/logo/logo-huaxiang.png
new file mode 100644
index 0000000..e567310
Binary files /dev/null and b/src/assets/logo/logo-huaxiang.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e567310..de8d712 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/views/cai/orderLogs/index.vue b/src/views/cai/orderLogs/index.vue
new file mode 100644
index 0000000..c6730ff
--- /dev/null
+++ b/src/views/cai/orderLogs/index.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/cai/payTrdConfig/index.vue b/src/views/cai/payTrdConfig/index.vue
index d170d47..7a37eb2 100644
--- a/src/views/cai/payTrdConfig/index.vue
+++ b/src/views/cai/payTrdConfig/index.vue
@@ -56,11 +56,14 @@
+
+
+
-
-
+
+
diff --git a/src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue b/src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue
index 115d859..123d749 100644
--- a/src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue
+++ b/src/views/cai/payTrdConfig/pay-trd-config-add-or-update-dialog.vue
@@ -12,6 +12,15 @@
+
+
+
+
+
+
+
+
+
@@ -53,6 +62,9 @@ export default {
type: undefined,
name: undefined,
mchId: undefined,
+ minAmount: 0,
+ maxAmount: 0,
+ sortBy: 0,
aliProductId: undefined,
gatewayUrl: undefined,
notifyUrl: undefined,
@@ -60,6 +72,15 @@ export default {
},
// 表单校验
rules: {
+ minAmount: [
+ { required: true, message: "不能为空", trigger: "blur" }
+ ],
+ maxAmount: [
+ { required: true, message: "不能为空", trigger: "blur" }
+ ],
+ sortBy: [
+ { required: true, message: "不能为空", trigger: "blur" }
+ ],
type: [
{ required: true, message: "支付类型不能为空", trigger: "change" }
],
diff --git a/src/views/cai/rechargeOrder/index.vue b/src/views/cai/rechargeOrder/index.vue
index 4a598ec..0fcb918 100644
--- a/src/views/cai/rechargeOrder/index.vue
+++ b/src/views/cai/rechargeOrder/index.vue
@@ -88,12 +88,11 @@
-
+
分销记录
@@ -101,7 +100,13 @@
支付校验
+
+ 操作记录