From 52168b3ef3caacb8ec0ceb166cdfc60a33023f56 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sat, 9 Aug 2025 14:57:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=91=E8=B1=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/bean/addBeanConsume.vue | 4 ++--
 src/views/recharge/addBeanRecharge.vue    | 2 +-
 src/views/recharge/beanSystemRecharge.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue
index 2144f69..1f9ea6e 100644
--- a/src/views/consume/bean/addBeanConsume.vue
+++ b/src/views/consume/bean/addBeanConsume.vue
@@ -71,7 +71,7 @@ const rules = reactive({
       }, trigger: 'blur'
     }],
   permanentBean: [
-    { required: true, message: '请输入永久金豆数', trigger: 'blur' },
+    { required: true, message: '请输入付费金豆数', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
         // 检查是否为非负整数
@@ -139,7 +139,7 @@ const handleConsumeForm = async () => {
       formRef.value.validate((valid) => {
         if (valid) {
           if (Number(consumeForm.value.permanentBean) === 0 && Number(consumeForm.value.freeBean) === 0) {
-            reject(new Error('永久金豆和付费金豆不能同时为0'));
+            reject(new Error('付费金豆和免费金豆不能同时为0'));
           }
           resolve(); // 验证通过，继续执行后续代码
         } else {
diff --git a/src/views/recharge/addBeanRecharge.vue b/src/views/recharge/addBeanRecharge.vue
index 322f9c3..64675fd 100644
--- a/src/views/recharge/addBeanRecharge.vue
+++ b/src/views/recharge/addBeanRecharge.vue
@@ -138,7 +138,7 @@ const handleAddForm = async () => {
       formRef.value.validate((valid) => {
         if (valid) {
           if (Number(addForm.value.permanentBean) === 0 && Number(addForm.value.freeBean) === 0) {
-            reject(new Error('永久金豆和付费金豆不能同时为0'));
+            reject(new Error('付费金豆和免费金豆不能同时为0'));
           }
           resolve(); // 验证通过，继续执行后续代码
         } else {
diff --git a/src/views/recharge/beanSystemRecharge.vue b/src/views/recharge/beanSystemRecharge.vue
index a5340d6..58f49ee 100644
--- a/src/views/recharge/beanSystemRecharge.vue
+++ b/src/views/recharge/beanSystemRecharge.vue
@@ -377,7 +377,7 @@ onMounted(async function () {
                 <div class="bean-info">
                     <!-- 汉字用 <strong> 加粗，动态数据用 <span> 包一层单独改色 -->
                     金豆总数：{{ beanNum }}
-                    , 充值金豆数：{{ permanentBeans }}
+                    , 付费金豆数：{{ permanentBeans }}
                     , 免费金豆数：{{ freeBean }}。
                 </div>
                 <!-- 设置表格容器的高度和滚动样式 -->
@@ -393,7 +393,7 @@ onMounted(async function () {
                         <el-table-column fixed="left" prop="name" label="姓名" min-width="100" />
                         <el-table-column fixed="left" prop="jwcode" label="精网号" min-width="110px" />
                         <el-table-column prop="market" label="所属地区" min-width="100px" />
-                        <el-table-column prop="permanentBean" label="永久金豆" sortable="custom" min-width="110px" />
+                        <el-table-column prop="permanentBean" label="付费金豆" sortable="custom" min-width="110px" />
                         <el-table-column prop="freeBean" label="免费金豆" sortable="custom" min-width="110px" />
                         <el-table-column prop="remark" label="备注" min-width="150px" show-overflow-tooltip />
                         <el-table-column prop="rechargeTime" label="充值时间" min-width="200px">

From 7a9bed3adff49ccb063728c866d3b9769ca6229d Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Sat, 9 Aug 2025 15:25:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=AD=9B=E9=80=89=E9=A1=B9=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=87=8D=E7=BD=AE=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=99=A4=E4=BA=86=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8C=85=E5=90=AB=E5=9C=B0=E5=8C=BA=E5=A4=96=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/usergold/gold/clientCountDetail.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue
index af9c474..2fd1a37 100644
--- a/src/views/usergold/gold/clientCountDetail.vue
+++ b/src/views/usergold/gold/clientCountDetail.vue
@@ -216,17 +216,14 @@ const get = async function (val) {
 
 // 重置
 const reset = function () {
-  delete goldDetail.value.jwcode
-  delete goldDetail.value.type
-  delete goldDetail.value.startTime
-  delete goldDetail.value.endTime
-  delete goldDetail.value.markets
-  // goldDetail.value.markets = []
+  goldDetail.value ={
+
+  }
+  goldDetail.value.markets = []
   selectedMarketPath.value = []
   delete sortField.value
   delete sortOrder.value
   getTime.value = []
-  delete goldDetail.value.payPlatform
   activeTimeRange.value = '' // 清除激活状态
 
   search()