From 229c13b945d0e56e10792208bccfdeed0488bca0 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 29 Apr 2025 13:44:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=B9=E5=AE=8C=E4=BB=8A=E6=98=A8?= =?UTF-8?q?=E8=BF=91=E4=B8=83=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.development | 7 -- gold-system/.env.production | 11 +-- gold-system/.env.test | 17 +--- .../src/views/goldBeen/goldenBeenConsum.vue | 70 ++++++++++--- .../src/views/goldBeen/goldenBeenDetail.vue | 72 +++++++++++--- gold-system/src/views/goldBeen/onLineDetail.vue | 69 ++++++++++--- gold-system/src/views/index.vue | 1 + gold-system/src/views/login.vue | 16 +++ gold-system/src/views/managerecharge/activity.vue | 62 +++++++++++- gold-system/src/views/managerecharge/rate.vue | 110 ++++++++++++++++----- gold-system/src/views/usergold/index.vue | 62 ++++-------- gold-system/stats.html | 38 +++---- 12 files changed, 367 insertions(+), 168 deletions(-) diff --git a/gold-system/.env.development b/gold-system/.env.development index 8807842..e9f1785 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,12 +1,5 @@ -<<<<<<< HEAD # VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' -======= -# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -#VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' ->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 # VITE_API_BASE='http://192.168.8.220:8080/' diff --git a/gold-system/.env.production b/gold-system/.env.production index 98834c3..e11dbec 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,12 +1,3 @@ # VITE_API_BASE='http://54.251.137.151:10702/' -<<<<<<< HEAD -<<<<<<< HEAD VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -======= -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='http://192.168.8.220:8080/' ->>>>>>> zry -======= -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' ->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 + diff --git a/gold-system/.env.test b/gold-system/.env.test index af5e5ed..81e3539 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,21 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -#VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.232:8080/' -======= -# VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.220:8080/' ->>>>>>> zry -======= # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' #VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://192.168.8.232:8080/' ->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 + diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index a9e505a..7f0db16 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -66,17 +66,30 @@ style="width: 220px" /> - - 消费时间： + + 开始时间： + + + 结束时间： + + 今 + 昨 + 近7天 查询 @@ -185,7 +198,8 @@ const ruleFormRef = ref() const detailY = ref({ jwcode: '', ipAddress: '', - createTime: '', + startTime:'', + endTime:'', // channel: '', //频道 sourceName: '', //直播间 sourceType: '' //消费类型 @@ -194,11 +208,45 @@ const getObj = ref({ pageNum: 1, pageSize: 50 }) +// 今天 +const getToday = function () { + const today = new Date() + // 格式化开始时间 + const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'days') + // 格式化开始时间 + const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 近7天 +const get7Days = function () { + // 格式化开始时间 + const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} + //初始化 const getInit = async function () { try { console.log('搜索参数', getObj.value) - const [startTime, endTime] = detailY.value.createTime + const startTime = detailY.value.startTime + const endTime = detailY.value.endTime // 发送POST请求 const result = await API({ url: '/dou/getSpend', @@ -263,8 +311,8 @@ const getCount = async () => { ipAddress: detailY.value.ipAddress, sourceName: detailY.value.sourceName, sourceType: detailY.value.sourceType, - startTime: detailY.value.createTime[0], - endTime: detailY.value.createTime[1] + startTime: detailY.value.startTime, + endTime: detailY.value.endTime } }) if (result.code == 200) { diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index b57ad3f..8e5f235 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -57,19 +57,31 @@ /> --> - - 充值时间： + + 开始时间： + + 结束时间： + + + 今 + 昨 + 近7天 查询 重置 @@ -229,7 +241,38 @@ const rules = ref({ jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], area: [{ required: true, message: '请选择所属地区', trigger: 'change' }] }) -//获取地区接口 +// 今天 +const getToday = function () { + const today = new Date() + // 格式化开始时间 + const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'days') + // 格式化开始时间 + const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 近7天 +const get7Days = function () { + // 格式化开始时间 + const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} const getArea = async () => { try { const result = await API({ @@ -271,7 +314,8 @@ const detailY = ref({ orderNo: '', payStyle: '', type: '', - createTime: '' + startTime: '', + endTime: '' }) const getObj = ref({ pageNum: 1, @@ -363,8 +407,6 @@ const getInit = async function ( ) { try { console.log('搜索参数', getObj.value) - const [startTime, endTime] = detailY.value.createTime - console.log(startTime, endTime) // 发送POST请求 const result = await API({ url: '/dou/getPay', @@ -372,8 +414,8 @@ const getInit = async function ( pay: { jwcode: isExport.value ? excelData.jwcode : detailY.value.jwcode, deptName: isExport.value ? excelData.area : detailY.value.deptName, - startTime: isExport.value ? excelData.startTime : startTime || '', - endTime: isExport.value ? excelData.endTime : endTime || '', + startTime: isExport.value ? excelData.startTime : detailY.value.startTime || '', + endTime: isExport.value ? excelData.endTime : detailY.value.endTime || '', payStyle: isExport.value ? '' : detailY.value.payStyle, type: isExport.value ? '' : detailY.value.type, orderNo: isExport.value ? '' : detailY.value.orderNo, @@ -448,8 +490,8 @@ const getCount = async () => { data: { jwcode: detailY.value.jwcode, deptName: detailY.value.deptName, - startTime: detailY.value.createTime[0], - endTime: detailY.value.createTime[1], + startTime: detailY.value.startTime, + endTime: detailY.value.endTime, orderNo: detailY.value.orderNo, type: detailY.value.type // payStyle: detailY.value.payStyle diff --git a/gold-system/src/views/goldBeen/onLineDetail.vue b/gold-system/src/views/goldBeen/onLineDetail.vue index bb56742..a6a5094 100644 --- a/gold-system/src/views/goldBeen/onLineDetail.vue +++ b/gold-system/src/views/goldBeen/onLineDetail.vue @@ -60,19 +60,31 @@ /> - - 充值时间： + + 开始时间： + + 结束时间： + + 今 + 昨 + 近7天 + 查询 @@ -230,6 +242,38 @@ const rules = ref({ jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], area: [{ required: true, message: '请选择所属地区', trigger: 'change' }] }) +// 今天 +const getToday = function () { + const today = new Date() + // 格式化开始时间 + const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 昨天 +const getYesterday = function () { + const yesterday = moment().subtract(1, 'days') + // 格式化开始时间 + const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} +// 近7天 +const get7Days = function () { + // 格式化开始时间 + const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss') + // 格式化结束时间 + const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss') + detailY.value.startTime = startDate + detailY.value.endTime = endDate + search() +} const handlePageSizeChange = (val) => { getObj.value.pageSize = val getObj.value.pageNum = 1 @@ -263,7 +307,8 @@ const detailY = ref({ orderNo: '', payStyle: '', type: '', - createTime: '' + startTime: '', + endTime: '' }) const getObj = ref({ pageNum: 1, @@ -355,7 +400,9 @@ const getInit = async function ( ) { try { console.log('搜索参数', getObj.value) - const [startTime, endTime] = detailY.value.createTime + const startTime = detailY.value.startTime + const endTime = detailY.value.endTime + console.log(startTime, endTime) // 发送POST请求 const result = await API({ @@ -458,8 +505,8 @@ const getCount = async () => { data: { jwcode: detailY.value.jwcode, deptName: detailY.value.deptName, - startTime: detailY.value.createTime[0], - endTime: detailY.value.createTime[1], + startTime: detailY.value.startTime, + endTime: detailY.value.endTime, orderNo: detailY.value.orderNo, payStyle: detailY.value.payStyle } diff --git a/gold-system/src/views/index.vue b/gold-system/src/views/index.vue index d5d6ac0..255aa35 100644 --- a/gold-system/src/views/index.vue +++ b/gold-system/src/views/index.vue @@ -22,6 +22,7 @@ const { currentArea, updateArea } = storeToRefs(areaStore) const adminData = ref({ name: '' }) + const getAdminData = async function () { try { const result = await API({ url: '/admin/userinfo', data: {} }) diff --git a/gold-system/src/views/login.vue b/gold-system/src/views/login.vue index e1f3aa1..f764989 100644 --- a/gold-system/src/views/login.vue +++ b/gold-system/src/views/login.vue @@ -225,3 +225,19 @@ More comprehensive version at shenanigans.shoghisimon.ca/collection/css background-size: 100% 2px, 100% 100%, 100% 100%; } + + \ No newline at end of file diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue index d0c11d8..27d504e 100644 --- a/gold-system/src/views/managerecharge/activity.vue +++ b/gold-system/src/views/managerecharge/activity.vue @@ -95,7 +95,58 @@ const get = async function (val) { ElMessage.error('请求失败') } } - +// 今天 +const getToday = function () { + const today = new Date() + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + ) + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} +// 昨天 +const getYesterday = function () { + const yesterday = new Date() + yesterday.setDate(yesterday.getDate() - 1) + const startDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + ) + const endDate = new Date( + yesterday.getFullYear(), + yesterday.getMonth(), + yesterday.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} +// 近7天 +const get7Days = function () { + const today = new Date() + const startDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() - 6 + ) + const endDate = new Date( + today.getFullYear(), + today.getMonth(), + today.getDate() + 1 + ) + getTime.value = [startDate, endDate] + console.log('getTime', getTime.value) + get() +} // 活动名称去空格 const trim = () => { if (activity.value.activityName) { @@ -173,7 +224,6 @@ const throttledAdd = async () => { ElMessage.error('新增活动失败') } } -<<<<<<< HEAD // 删除确认方法 const delConfirm = async (row) => { @@ -199,8 +249,6 @@ const delConfirm = async (row) => { const del = (row) => { delObj.value = row } -======= ->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 + - + --> + + + diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue index bf73614..fe1cbab 100644 --- a/gold-system/src/views/usergold/index.vue +++ b/gold-system/src/views/usergold/index.vue @@ -478,12 +478,17 @@ const handleCurrentChange = function (val) { :close-on-click-modal="false" >
导出信息
-
你正在导出以下数据
+ 例如，在代码中，我们可能错误地在模板中使用了detailY.value，但实际上应该直接使用detailY。 --> +
+ 你正在导出所有数据 +
+
+ 你正在导出以下数据 +
精网号：{{ detailY.jwcode || '' }}
平台信息：{{ detailY.consumePlatform ? (platform.find(item => item.value === detailY.consumePlatform)?.label) : '' }}
数量更新类型：{{ detailY.num ? (num.find(item => item.value === detailY.num)?.label || '') : '' }}
diff --git a/gold-system/stats.html b/gold-system/stats.html index c82bd5c..cecefb2 100644 --- a/gold-system/stats.html +++ b/gold-system/stats.html @@ -4925,27 +4925,25 @@ var drawChart = (function (exports) { })({}); - + /*-->*/ - - \ No newline at end of file + + + From d6a4c7ae92c2f9439c572799b00e8b6ed6631508 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 29 Apr 2025 18:06:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.development | 12 ++------ .../src/views/goldBeen/goldenBeenDetail.vue | 33 ++++++++++++++++------ gold-system/src/views/usergold/index.vue | 8 +++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/gold-system/.env.development b/gold-system/.env.development index dc8b0a6..35d06a7 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,12 +1,6 @@ -<<<<<<< HEAD -# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -#VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' -======= + # VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' +# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' ->>>>>>> 229c13b945d0e56e10792208bccfdeed0488bca0 -# VITE_API_BASE='http://192.168.8.220:8080/' +VITE_API_BASE='http://192.168.8.220:8080/' diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 8e5f235..e5b147e 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -36,12 +36,21 @@ 充值类型： - + placeholder="请选择充值类型" + style="width: 240px" + clearable + > + + +