这是一次拉取branch 'milestone-20250728-金币前端三期' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250730114922-金币三期

src/views/consume/bean/addBeanConsume.vue

@@ -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 {

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 {

src/views/recharge/beanSystemRecharge.vue

@@ -377,7 +377,7 @@ onMounted(async function () {
                 <div class="bean-info">
                     <!-- 汉字用 <strong> 加粗，动态数据用 <span> 包一层单独改色 -->
                     金豆总数：{{ beanNum }}
-                    , 充值金豆数：{{ permanentBeans }}
+                    , 付费金豆数：{{ permanentBeans }}
                     , 免费金豆数：{{ freeBean }}。
                 </div>
                 <!-- 设置表格容器的高度和滚动样式 -->

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()