From 9e536dabbc35b63e72c2d3814cdc6ae60ef03571 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Wed, 25 Dec 2024 11:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=BA=8F?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/gold-system/src/views/audit/rechargeAudit.vue | 5 +
vue/gold-system/src/views/audit/refundAudit.vue | 7 +-
vue/gold-system/src/views/consume/allConsume.vue | 5 +
.../src/views/managerecharge/activity.vue | 5 +
vue/gold-system/src/views/managerecharge/rate.vue | 5 +
vue/gold-system/src/views/recharge/addRecharge.vue | 334 +++++++--------------
.../src/views/recharge/adminRecharge.vue | 5 +
vue/gold-system/src/views/recharge/allRecharge.vue | 5 +
vue/gold-system/src/views/refund/allRefund.vue | 5 +
vue/gold-system/src/views/usergold/index.vue | 11 +-
10 files changed, 154 insertions(+), 233 deletions(-)
diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index 95376fb..7508298 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -512,6 +512,11 @@ onMounted(async function () {
+
+
+ {{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}
+
+
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index 0914f9d..1ec8d27 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -379,7 +379,7 @@ const rules = reactive({
onMounted(async function () {
await get();
getProduct();
- await getArea();
+ // await getArea();
});
@@ -490,6 +490,11 @@ onMounted(async function () {
+
+
+ {{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}
+
+
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index 9ce5a24..a02f516 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -333,6 +333,11 @@ getGoods();
style="width: 100%"
:default-sort="{ prop: 'createTime ', order: 'descending' }"
>
+
+
+ {{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}
+
+
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index 308b28f..4b52efa 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -325,6 +325,11 @@ onMounted(async function () {
+
+
+ {{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}
+
+
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 87c3e70..d604d70 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -426,6 +426,11 @@ const delConfirm = async function (row) {
:height="tableHeight"
style="width: 100%"
>
+
+
+ {{ scope.$index + 1+(getObj.pageNum-1)*getObj.pageSize }}
+
+
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index d561579..39181b0 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -569,6 +569,53 @@ const cancelBatch = function () {
});
};
//
+const changeActivity = function (row) {
+ console.log("row===", row);
+ let ratio = 0;
+ for (let i = 0; i < activity.value.length; i++) {
+ if (activity.value[i].activityId == row.activityId) {
+ ratio = activity.value[i].rechargeRatio;
+ break;
+ }
+ }
+ console.log("ratio===", ratio);
+ if (row.paidGold == null || row.paidGold == '') {
+ row.freeGold = 0;
+ } else {
+ if (ratio == 0) {
+ row.freeGold = 0;
+ } else {
+ row.freeGold = Math.ceil(row.paidGold / ratio);
+ // for (let i = 0; i < batchData.value.length; i++) {
+ // if (batchData.value[i].line == row.line) {
+ // batchData.value[i].freeGold = Math.ceil(row.paidGold / ratio);
+ // break;
+ // }
+ // };
+ }
+ }
+};
+//
+const changePaidGold = function (row) {
+ console.log("row===", row);
+ let ratio = 0;
+ if(row.activityId == null || row.activityId == ''){
+ row.freeGold = 0;
+ }else{
+ for (let i = 0; i < activity.value.length; i++) {
+ if (activity.value[i].activityId == row.activityId) {
+ ratio = activity.value[i].rechargeRatio;
+ break;
+ }
+ }
+ if (ratio == 0) {
+ row.freeGold = 0;
+ } else {
+ row.freeGold = Math.ceil(Number(row.paidGold) / ratio);
+ }
+ }
+}
+//
const calculatedRowFreeGold = function (row) {
console.log("row===", row);
let ratio = 0;
@@ -593,7 +640,7 @@ const calculatedRowFreeGold = function (row) {
};
const calculatedRowRechargeGold = computed(() => {
- if (!Rate.value == 0) {
+ if (Rate.value != 0) {
const paidGold = Number(addRecharge.value.paidGold) || 0;
const rate = Number(Rate.value) || 1; // 避免乘以0
return Number(Math.ceil(paidGold * rate));
@@ -656,39 +703,17 @@ const batchAdd = function () {
-
+
- 查询
+ 查询
-
-
+
+
@@ -699,70 +724,24 @@ const batchAdd = function () {
个
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
@@ -771,41 +750,19 @@ const batchAdd = function () {
-
+
-
+
- 重置
+ 重置
提交
-
-
+
+
客户信息
@@ -828,13 +785,10 @@ const batchAdd = function () {
{{
user.buyJb + user.free6 + user.free12 + user.coreJb
}}
- (充值金币:{{ user.buyJb }};免费金币:{{
+ (充值金币:{{ user.buyJb
+ }};免费金币:{{
user.free6 + user.free12
- }};任务金币:{{ user.coreJb }})
+ }};任务金币:{{ user.coreJb }})
@@ -875,32 +829,15 @@ const batchAdd = function () {
-
+