From 4b81ccbaefe8236d86405cfdd8f56d82aa814401 Mon Sep 17 00:00:00 2001 From: zhaoln Date: Mon, 21 Apr 2025 17:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BA=BF=E4=B8=8A=E5=85=85?= =?UTF-8?q?=E5=80=BC=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8Abug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/src/router/index.js | 2 + .../src/views/goldBeen/goldenBeenConsum.vue | 31 +- .../src/views/goldBeen/goldenBeenDetail.vue | 53 ++- gold-system/src/views/goldBeen/onLineDetail.vue | 494 +++++++++++++++++++++ gold-system/src/views/index.vue | 1 + gold-system/src/views/login.vue | 2 +- gold-system/src/views/recharge/adminRecharge.vue | 4 +- gold-system/src/views/recharge/allRecharge.vue | 24 +- gold-system/stats.html | 2 +- 9 files changed, 561 insertions(+), 52 deletions(-) create mode 100644 gold-system/src/views/goldBeen/onLineDetail.vue diff --git a/gold-system/src/router/index.js b/gold-system/src/router/index.js index a7afbf8..33fa494 100644 --- a/gold-system/src/router/index.js +++ b/gold-system/src/router/index.js @@ -49,6 +49,8 @@ const router = createRouter({ { path: '/goldenBeenBalance', name: "goldenBeenBalance", component: () => import("../views/goldBeen/goldenBeenBalance.vue") }, //金豆充值明细 { path: '/goldenBeenDetail', name: "goldenBeenDetail", component: () => import("../views/goldBeen/goldenBeenDetail.vue") }, + //线上充值明细 + { path: '/onLineDetail', name: "onLineDetail", component: () => import("../views/goldBeen/onLineDetail.vue") }, //金豆消费明细 { path: '/goldenBeenConsum', name: "goldenBeenConsum", component: () => import("../views/goldBeen/goldenBeenConsum.vue") } ] diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index 5cf9899..fc6bf8a 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -23,9 +23,9 @@ /> - + - + - + - - + { jwcode: detailY.value.jwcode, ipAddress: detailY.value.ipAddress, sourceName: detailY.value.sourceName, - payType: detailY.value.payType, + sourceType: detailY.value.sourceType, startTime: detailY.value.createTime[0], endTime: detailY.value.createTime[1] } @@ -255,14 +254,14 @@ const getCount = async () => { if (result.code == 200) { //const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data console.log('合计数', result.data) - beenCount.value = result.data + beenCount.value = result.data || 0 } } //获取地区接口 const getArea = async () => { try { const result = await API({ - url: '/dou/getPayIp' + url: '/dou/getIp' }) areaList.value = result.data } catch (error) { @@ -303,6 +302,6 @@ getArea() .pagination { display: flex; align-items: center; - margin-top: 20px; + margin-top: 10px; } diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index fb45022..2ed45b8 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -37,7 +37,7 @@ style="width: 220px" /> - +
-

金豆总数：充值金豆总数：{{ countValue }}合计金额数:{{ priceValue }}

+ 金豆总数：充值金豆总数：{{ countValue }}合计金额数:{{ + priceValue + }} - + - + - + - + - + - + + @@ -418,20 +423,26 @@ const getPayType = async () => { const getCount = async () => { try { const result = await API({ - url: '/dou/getRechargeTotal', + url: '/dou/getTotal', data: { jwcode: detailY.value.jwcode, - deptName: detailY.value.deptName, + //deptName: detailY.value.deptName, startTime: detailY.value.createTime[0], endTime: detailY.value.createTime[1], orderNo: detailY.value.orderNo, - payStyle: detailY.value.payStyle + type: detailY.value.type + // payStyle: detailY.value.payStyle } }) - const { priceTotal, countTotal } = result.data - console.log('金豆总数', priceTotal, countTotal) - priceValue.value = priceTotal - countValue.value = countTotal + if (!!result.data) { + const { price, count } = result.data + console.log('金豆总数', price, count) + priceValue.value = price + countValue.value = count + } else { + priceValue.value = 0 + countValue.value = 0 + } } catch (error) { console.log('请求失败', error) } @@ -470,6 +481,6 @@ getCount() .pagination { display: flex; align-items: center; - margin-top: 20px; + margin-top: 10px; } diff --git a/gold-system/src/views/goldBeen/onLineDetail.vue b/gold-system/src/views/goldBeen/onLineDetail.vue new file mode 100644 index 0000000..b5eedff --- /dev/null +++ b/gold-system/src/views/goldBeen/onLineDetail.vue @@ -0,0 +1,494 @@ + + + diff --git a/gold-system/src/views/index.vue b/gold-system/src/views/index.vue index 871477d..6a5e181 100644 --- a/gold-system/src/views/index.vue +++ b/gold-system/src/views/index.vue @@ -228,6 +228,7 @@ const changeDataByArea = (item) => { > 金豆充值 金豆充值明细 + 线上充值明细 金豆消费明细 客户金豆余额 diff --git a/gold-system/src/views/login.vue b/gold-system/src/views/login.vue index 4d4fe34..a2b4387 100644 --- a/gold-system/src/views/login.vue +++ b/gold-system/src/views/login.vue @@ -96,7 +96,7 @@ const login = async function () { -