From cbc02cb2cfc86b6c7ca1514a903288b034081f67 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 17 Jul 2025 10:55:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(consume):=20=E6=B6=88=E8=B4=B9=20=3D>?=
 =?UTF-8?q?=20=E6=B6=88=E8=80=97=20fix=EF=BC=9A=E7=94=A8=E6=88=B7=E9=87=91?=
 =?UTF-8?q?=E5=B8=81=E6=98=8E=E7=BB=86=20=E5=9C=B0=E5=8C=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/addCoinConsume.vue     | 10 +++++-----
 src/views/consume/coinConsumeDetail.vue  |  8 ++++----
 src/views/usergold/clientCountDetail.vue | 23 +++++++++++++++++++----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue
index 29e3c75..db1e558 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -68,9 +68,9 @@ const rules = reactive({
     {required: true, message: "请输入精网号", trigger: "blur"},
     // { type: 'number', message: "精网号必须为数字", trigger: "blur" }
   ],
-  goodsName: [{required: true, message: "请选择消费商品", trigger: "blur"}],
+  goodsName: [{required: true, message: "请选择商品", trigger: "blur"}],
   sumGold: [
-    { required: true, message: "消费金币总数不能为空", trigger: "blur" },
+    { required: true, message: "消耗金币总数不能为空", trigger: "blur" },
     {
       validator: (rule, value, callback) => {
         // 允许0开头的小数（如0.1）但不允许单独的0
@@ -139,7 +139,7 @@ function validateInput() {
   }
   // 验证金币不能为负数
   if (sumGold < 0) {
-    ElMessage.warning("消费金币总数不能为负数");
+    ElMessage.warning("消耗金币总数不能为负数");
     addConsume.value.sumGold = null;
     return false;
   }
@@ -184,7 +184,7 @@ function validateInput() {
   // 验证金币总和
   const totalAvailableGold = (user.value.nowSumGold)
   if (user.value.jwcode && sumGold > totalAvailableGold) {
-    ElMessage.error("消费金币总数超过可用金币总和");
+    ElMessage.error("消耗金币总数超过可用金币总和");
     // 将sumGold设置为null
     addConsume.value.sumGold = null;
     return false;
@@ -519,7 +519,7 @@ onMounted(async function () {
 
       </div>
 
-      <el-form-item prop="sumGold" label="消费金币总数">
+      <el-form-item prop="sumGold" label="消耗金币总数">
         <el-input
             v-model="addConsume.sumGold"
             style="width: 100px"
diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue
index 974253d..af3f8f8 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -480,7 +480,7 @@ onMounted(async function () {
         <el-row>
           <el-col :span="21">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">消费时间：</el-text>
+              <el-text class="mx-1" size="large">消耗时间：</el-text>
               <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                               end-placeholder="结束时间"/>
               <el-button style="margin-left: 10px" @click="getToday()">今
@@ -525,7 +525,7 @@ onMounted(async function () {
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
             <el-table-column prop="market" label="所属地区" width="110px"/>
             <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip/>
-            <el-table-column prop="payPlatform" label="消费平台" width="120px">
+            <el-table-column prop="payPlatform" label="消耗平台" width="120px">
               <template #default="scope">
                 <!-- 使用非严格相等比较 -->
                 {{ scope.row.payPlatform }}
@@ -538,7 +538,7 @@ onMounted(async function () {
               label="消费类型"
               width="120px"
             /> -->
-            <el-table-column prop="sumGold" label="消费金币总数" width="120px">
+            <el-table-column prop="sumGold" label="消耗金币总数" width="120px">
               <template #default="scope">
                 {{
                   (scope.row.taskGold +
@@ -566,7 +566,7 @@ onMounted(async function () {
 
             <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
             <el-table-column prop="adminName" label="提交人" width="110px"/>
-            <el-table-column prop="createTime" label="消费时间" sortable="custom" width="180px"/>
+            <el-table-column prop="createTime" label="消耗时间" sortable="custom" width="180px"/>
           </el-table>
         </div>
 
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue
index 6e7d356..e9bf8d0 100644
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@@ -6,6 +6,7 @@ import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http'
 import { writeFile, utils } from 'xlsx'
+import request from "@/util/request.js";
 
 
 // 定义ref 变量来存储合计数据
@@ -99,8 +100,8 @@ const type = [
     label: '退款'
   }
 ]
-
-
+const market = ref([])
+/*
 // 定义加载状态，获取地区数据
 const isLoadingArea = ref(false);
 const market = ref([])
@@ -124,7 +125,21 @@ const getArea = async () => {
   } finally {
     isLoadingArea.value = false;
   }
-};
+};*/
+
+// 地区下拉框
+const getMarket = async function () {
+  try {
+    const result = await API({
+      url: '/general/market',
+      data: {}
+    })
+    market.value = result.data
+    console.log('地区', market.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 
 // 充值明细表格
 const tableData = ref([])
@@ -332,7 +347,7 @@ const handleCurrentChange = function (val) {
 // 挂载
 onMounted(async function () {
   await get()
-  await getArea()
+  await getMarket()
   await getAdminData()
   await getPlatform() // 调用获取平台信息的函数
 })