diff --git a/gold-system/.env.development b/gold-system/.env.development index fd76a2e..e9f1785 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,5 +1,5 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -#VITE_API_BASE='http://54.251.137.151:10704/' +# 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.220:8080/' diff --git a/gold-system/.env.test b/gold-system/.env.test index 2e71c12..81e3539 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,5 +1,6 @@ -# 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_prod' -# VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.220:8080/' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' +# VITE_API_BASE='http://192.168.8.232:8080/' + diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index 836b7f0..52407ac 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -92,6 +92,7 @@ 近7天 + 导出Excel 查询 重置 @@ -164,13 +165,70 @@ + + + +
导出信息
+
+ 你正在导出所有数据 +
+
+ 你正在导出以下数据 +
+
精网号:{{ detailY.jwcode }}
+
地区:{{ detailY.ipAddress }}
+
+ 消费类型:{{ consumList.value.find(item => item.value === detailY.sourceType)?.text }} +
+
直播间:{{ detailY.sourceName }}
+
+ 时间范围:{{ detailY.startTime }} 至 {{ detailY.endTime }} +
+ +
+ + + + +
+ 已导出 {{ Math.round((exportProgress / 100) * total) }} 条 / 共 {{ total }} 条 +
+ +
+<<<<<<< HEAD + +======= +>>>>>>> 703486fc8c3f87173c028d61161e502a2e07fdfc diff --git a/gold-system/src/views/index.vue b/gold-system/src/views/index.vue index 1e94bb6..7a496dc 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 1a78c29..5010a3f 100644 --- a/gold-system/src/views/managerecharge/activity.vue +++ b/gold-system/src/views/managerecharge/activity.vue @@ -231,7 +231,7 @@ const delConfirm = async (row) => { delObj.value = row // 发送删除请求 const result = await request({ - url: '/recharge/activity/delete', // 假设这是删除活动的接口 + url: '/recharge/activity/edit', // 假设这是删除活动的接口 method: 'post', data: delObj.value }) @@ -324,6 +324,7 @@ const del = (row) => { {{ moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }} +