合并

gold-system/.env.development

@@ -1,5 +1,12 @@
+<<<<<<< HEAD
 # VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://54.251.137.151:10704/'
+=======
+# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
+#VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://192.168.8.94:8080/'
+VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
+>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 # VITE_API_BASE='http://192.168.8.220:8080/'

gold-system/.env.production

@@ -1,7 +1,12 @@
 # VITE_API_BASE='http://54.251.137.151:10702/'
 <<<<<<< HEAD
+<<<<<<< HEAD
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 =======
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 # VITE_API_BASE='http://192.168.8.220:8080/'
 >>>>>>> zry
+=======
+VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
+# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
+>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3

gold-system/.env.test

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 #VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
@@ -11,3 +12,10 @@ VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 # VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.220:8080/'
 >>>>>>> zry
+=======
+# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
+#VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://192.168.8.94:8080/'
+VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
+# VITE_API_BASE='http://192.168.8.232:8080/'
+>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3

gold-system/src/api/index.js

@@ -1,6 +1,6 @@
 import { pa } from 'element-plus/es/locales.mjs';
 import http from '../util/http.js';
-
+// 这个是不知道有啥用
 const API={
     post: function(url,data){
         return http({url:url,method:'post',data:data})

gold-system/src/store/area.js

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-
+// 这个也是不知道有啥用，谁给在index.vue里注了
 export const useAreaStore = defineStore('area', {
   state: () => ({
     currentArea: '全部',

gold-system/src/util/request.js

@@ -1,11 +1,13 @@
 import axios from 'axios'
+// 创建axios实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_API_BASE,
   timeout: 10000,
   headers: {
     'Content-Type': 'application/json'
   },
-    // 设置默认请求方法为 POST
+  // 设置请求头，指定请求体的格式为 JSON
+    // 设置默认请求方法为 POST  这行对应的代码搁哪呢？
 })
 
 // 请求拦截器

gold-system/src/views/audit/rechargeAudit.vue

@@ -553,7 +553,6 @@ const handleSortChange = (column) => {
 // 精网号去空格
 const trimJwCode = () => {
   if (rechargeVo.value.jwcode) {
-    // 去除字符串两端的空格
     rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, ''); 
   }
 }
@@ -654,7 +653,7 @@ const trimJwCode = () => {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button @click="reset()" type="success">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/audit/refundAudit.vue

@@ -599,7 +599,7 @@ const trimJwCode = () => {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/consume/addConsume.vue

@@ -443,7 +443,7 @@ onMounted(async function () {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="delteConsume" style="margin-left: 280px">重置</el-button>
+    <el-button type="success" @click="delteConsume" style="margin-left: 280px">重置</el-button>
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 

gold-system/src/views/consume/allConsume.vue

@@ -412,7 +412,7 @@ const handleCurrentChange = function (val) {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/goldBeen/addGoldenBeen.vue

@@ -62,7 +62,7 @@
         </el-form-item> -->
         <el-form-item>
           <div class="btn-group">
-            <el-button @click="resetData(ruleFormRef)">重置</el-button>
+            <el-button type="success" @click="resetData(ruleFormRef)">重置</el-button>
             <el-button type="primary" @click="addBean(ruleFormRef)">
               提交
             </el-button>

gold-system/src/views/goldBeen/goldenBeenBalance.vue

@@ -2,14 +2,16 @@
   <!-- 这是客户金豆余额页面 -->
   <div class="filter-box">
     <el-form :model="detailY" ref="ruleFormRef">
-      <el-form-item prop="jwcode" label="精网号">
+      <el-form-item prop="jwcode">
+        <el-text class="mx-1" size="large">精网号：</el-text>
         <el-input
           v-model="detailY.jwcode"
           placeholder="请输入精网号"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="area" label="地区">
+      <el-form-item prop="area">
+        <el-text class="mx-1" size="large">地区：</el-text>
         <el-select
           v-model="detailY.area"
           placeholder="请选择所属地区"
@@ -25,10 +27,10 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="search()"
+        <el-button type="primary" @click="search()"
           >查询</el-button
         >
-        <el-button type="primary" size="small" @click="reset(ruleFormRef)"
+        <el-button type="success" @click="reset(ruleFormRef)"
           >重置</el-button
         >
       </el-form-item>
@@ -194,15 +196,24 @@ const getArea = async () => {
   }
 }
 const getCount = async () => {
+  try {
     const result = await API({
-    url: '/dou/getYveTotal'
+      url: '/dou/getYveTotal',
+      // 传递jwcode和ipAddress参数，可以让金币数随查询变化
+      data: {
+        jwcode: detailY.jwcode,
+        ipAddress: detailY.area
+      }
     })
-  if (result.code == 200) {
+    if (result.code === 200) {
       const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data
       getObj.value.jinbiBuy = jinbiBuy
       getObj.value.jinbiFree = jinbiFree
       getObj.value.jinbiCostTotal = jinbiCostTotal
     }
+  } catch (error) {
+    console.log('获取统计数据失败', error)
+  }
 }
 getArea()
 getCount()

gold-system/src/views/goldBeen/goldenBeenConsum.vue

@@ -2,14 +2,16 @@
   <!-- 这是金豆消费明细页面 -->
   <div class="filter-box">
     <el-form :model="detailY" ref="ruleFormRef">
-      <el-form-item prop="jwcode" label="精网号">
+      <el-form-item prop="jwcode">
+        <el-text class="mx-1" size="large">精网号：</el-text>
         <el-input
           v-model="detailY.jwcode"
           placeholder="请输入精网号"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="ipAddress" label="地区">
+      <el-form-item prop="ipAddress">
+        <el-text class="mx-1" size="large">地区：</el-text>
         <el-select
           v-model="detailY.ipAddress"
           placeholder="请选择所属地区"
@@ -24,7 +26,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="sourceType" label="消费类型">
+      <el-form-item prop="sourceType">
+        <el-text class="mx-1" size="large">消费类型：</el-text>
         <el-select
           v-model="detailY.sourceType"
           placeholder="请选择消费类型"
@@ -55,14 +58,16 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item prop="sourceName" label="直播间">
+      <el-form-item prop="sourceName">
+        <el-text class="mx-1" size="large">直播间：</el-text>
         <el-input
           v-model="detailY.sourceName"
           placeholder="请输入直播间"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="createTime" label="消费时间">
+      <el-form-item prop="createTime">
+        <el-text class="mx-1" size="large">消费时间：</el-text>
         <el-date-picker
           v-model="detailY.createTime"
           type="daterange"
@@ -219,11 +224,14 @@ const getInit = async function () {
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 }
-// 精网号去空格
+// 精网号、直播间去空格
 const trimJwCode = () => {
   if (detailY.value.jwcode) {
     detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); 
   }
+  if (detailY.value.sourceName) {
+    detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, ''); 
+  }
 }
 // 搜索
 const search = function () {

gold-system/src/views/goldBeen/goldenBeenDetail.vue

@@ -2,14 +2,16 @@
   <!-- 这是金豆充值明细页面 -->
   <div class="filter-box">
     <el-form :model="detailY" ref="ruleFormRef">
-      <el-form-item prop="jwcode" label="精网号">
+      <el-form-item prop="jwcode">
+        <el-text class="mx-1" size="large">精网号：</el-text>
         <el-input
           v-model="detailY.jwcode"
           placeholder="请输入精网号"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="deptName" label="地区">
+      <el-form-item prop="deptName" >
+        <el-text class="mx-1" size="large">地区：</el-text>
         <el-select
           v-model="detailY.deptName"
           placeholder="请选择所属地区"
@@ -24,14 +26,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="orderNo" label="订单号">
+      <el-form-item prop="orderNo" >
+        <el-text class="mx-1" size="large">订单号：</el-text>
         <el-input
           v-model="detailY.orderNo"
           placeholder="请输入订单号"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="type" label="充值类型">
+      <el-form-item prop="type">
+        <el-text class="mx-1" size="large">充值类型：</el-text>
         <el-input
           v-model="detailY.type"
           placeholder="请输入充值类型"
@@ -53,7 +57,8 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item prop="createTime" label="充值时间">
+      <el-form-item prop="createTime">
+        <el-text class="mx-1" size="large">充值时间：</el-text>
         <el-date-picker
           v-model="detailY.createTime"
           type="daterange"
@@ -196,7 +201,7 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { reactive, ref, onMounted } from 'vue'
 import { FormInstance } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import moment from 'moment'
@@ -217,12 +222,24 @@ const excelData = reactive({
 })
 const priceValue = ref(0)
 const countValue = ref(0)
+// areaList 地区列表
 const areaList = ref<string[]>([])
 const isExport = ref<boolean>(false)
 const rules = ref({
   jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
   area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
 })
+//获取地区接口
+const getArea = async () => {
+  try {
+    const result = await API({
+      url: '/dou/getPayIp'
+    })
+    areaList.value = result.data
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const handlePageSizeChange = (val) => {
   getObj.value.pageSize = val
   getObj.value.pageNum = 1
@@ -387,15 +404,21 @@ const getInit = async function (
 //     getInit({ sortField: prop, sortOrder: 'DESC' })
 //   }
 // }
-// 精网号去空格
-const trimJwCode = () => {
+// 精网号、订单号、充值类型去空格
+const trim = () => {
   if (detailY.value.jwcode) {
     detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); 
   }
+  if (detailY.value.orderNo) {
+    detailY.value.orderNo = detailY.value.orderNo.replace(/\s/g, ''); 
+  }
+  if (detailY.value.type) {
+    detailY.value.type = detailY.value.type.replace(/\s/g, ''); 
+  }
 }
 // 搜索
 const search = function () {
-  trimJwCode();
+  trim();
   getObj.value.pageNum = 1
   getInit({})
   getCount()
@@ -404,17 +427,7 @@ const search = function () {
 const reset = function (formEl) {
   formEl.resetFields()
 }
-//获取地区接口
-const getArea = async () => {
-  try {
-    const result = await API({
-      url: '/dou/getPayIp'
-    })
-    areaList.value = result.data
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
+
 //获取支付方式接口
 const getPayType = async () => {
   try {
@@ -455,10 +468,13 @@ const getCount = async () => {
     console.log('请求失败', error)
   }
 }
+
+onMounted(() => {
   getInit({})
-getArea()
   getPayType()
   getCount()
+  getArea()
+})
 </script>
 <style scoped lang="scss">
 .filter-box {

gold-system/src/views/goldBeen/onLineDetail.vue

@@ -1,15 +1,20 @@
 <template>
   <!-- 这是线上充值明细页面 -->
+
+  <!-- 这是搜索表单 -->
+   <!-- 咱就是说为什么不加注释！ -->
   <div class="filter-box">
     <el-form :model="detailY" ref="ruleFormRef">
-      <el-form-item prop="jwcode" label="精网号">
+      <el-form-item prop="jwcode" >
+        <el-text class="mx-1" size="large">精网号：</el-text>
         <el-input
           v-model="detailY.jwcode"
           placeholder="请输入精网号"
           style="width: 220px"
         />
       </el-form-item>
-      <el-form-item prop="deptName" label="地区">
+      <el-form-item prop="deptName">
+        <el-text class="mx-1" size="large">地区：</el-text>
         <el-select
           v-model="detailY.deptName"
           placeholder="请选择所属地区"
@@ -24,7 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="orderNo" label="订单号">
+      <el-form-item prop="orderNo">
+        <el-text class="mx-1" size="large">订单号：</el-text>
         <el-input
           v-model="detailY.orderNo"
           placeholder="请输入订单号"
@@ -38,7 +44,8 @@
           style="width: 220px"
         />
       </el-form-item> -->
-      <el-form-item prop="payStyle" label="充值平台">
+      <el-form-item prop="payStyle">
+        <el-text class="mx-1" size="large">充值平台：</el-text>
         <el-select
           v-model="detailY.payStyle"
           placeholder="请选择充值平台"
@@ -53,7 +60,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="createTime" label="充值时间">
+      <el-form-item prop="createTime">
+        <el-text class="mx-1" size="large">充值时间：</el-text>
         <el-date-picker
           v-model="detailY.createTime"
           type="daterange"
@@ -65,11 +73,14 @@
           :unlinkPanels="true"
         />
       </el-form-item>
+      <el-col :span="10">
         <el-form-item>
         <el-button type="primary" @click="search">查询</el-button>
         <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
         <el-button type="primary" @click="exportExcel">导出excel</el-button>
         </el-form-item>
+      </el-col>
+
     </el-form>
   </div>
   <div class="table-box">
@@ -385,11 +396,14 @@ const getInit = async function (
 //     getInit({ sortField: prop, sortOrder: 'DESC' })
 //   }
 // }
-// 精网号去空格
+// 精网号、订单号去空格
 const trimJwCode = () => {
   if (detailY.value.jwcode) {
     detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); 
   }
+  if (detailY.value.orderNo) {
+    detailY.value.orderNo = detailY.value.orderNo.replace(/\s/g, ''); 
+  }
 }
 // 搜索
 const search = function () {

gold-system/src/views/index.vue

@@ -1,4 +1,6 @@
 <script setup>
+// 导航栏在这
+// 这也是登录后的index
 import { ref, onMounted, reactive, computed, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import ElementPlus from 'element-plus'

gold-system/src/views/managerecharge/activity.vue

@@ -1,4 +1,5 @@
 <script setup>
+// 这是活动管理页面
 import { ref, onMounted, reactive, computed } from 'vue'
 import ElementPlus from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -94,8 +95,16 @@ const get = async function (val) {
     ElMessage.error('请求失败')
   }
 }
+
+// 活动名称去空格
+const trim = () => {
+  if (activity.value.activityName) {
+    activity.value.activityName = activity.value.activityName.replace(/\s/g, ''); 
+  }
+}
 // 搜索
 const search = function () {
+  trim();
   getObj.value.pageNum = 1
   get()
 }
@@ -164,6 +173,7 @@ const throttledAdd = async () => {
     ElMessage.error('新增活动失败')
   }
 }
+<<<<<<< HEAD
 
 // 删除确认方法
 const delConfirm = async (row) => {
@@ -189,6 +199,8 @@ const delConfirm = async (row) => {
 const del = (row) => {
   delObj.value = row
 }
+=======
+>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 </script>
 
 <template>
@@ -216,7 +228,7 @@ const del = (row) => {
             />
           </div>
           <div class="head-card-btn">
-            <el-button @click="reset()">重置</el-button>
+            <el-button type="success" @click="reset()">重置</el-button>
             <el-button type="primary" @click="search()">查询</el-button>
           </div>
         </div>

gold-system/src/views/managerecharge/rate.vue

@@ -474,6 +474,7 @@ function handleInput(value) {
           >
           <el-button
             class="button-item"
+            type="success"
             style="float: right"
             @click="handledelete"
             >重置</el-button

gold-system/src/views/permissions/index.vue

@@ -62,8 +62,15 @@ const get = async function (val) {
     console.log('请求失败', error)
   }
 }
+// 精网号去空格
+const trimJwCode = () => {
+  if (admin.value.jwcode) {
+    admin.value.jwcode = admin.value.jwcode.replace(/\s/g, ''); 
+  }
+}  
 // 搜索
 const search = function () {
+  trimJwCode();
   getObj.value.pageNum = 1
   get()
 }
@@ -466,7 +473,7 @@ const handleCurrentChange = function (val) {
           </div>
 
           <div class="head-card-btn">
-            <el-button @click="reset()">重置</el-button>
+            <el-button type="success" @click="reset()">重置</el-button>
             <el-button type="primary" @click="search()">查询</el-button>
           </div>
         </div>

gold-system/src/views/recharge/addRecharge.vue

@@ -1044,7 +1044,7 @@ onMounted(async function () {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="deleteRecharge" style="margin-left: 280px"
+    <el-button @click="deleteRecharge" style="margin-left: 280px" type="success"
       >重置</el-button
     >
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
@@ -1397,7 +1397,7 @@ onMounted(async function () {
                 @confirm="resetConfirm"
               >
                 <template #reference>
-                  <el-button type="primary" text @click="reset(scope.row)">
+                  <el-button type="success" text @click="reset(scope.row)">
                     重置
                   </el-button>
                 </template>

gold-system/src/views/recharge/adminRecharge.vue

@@ -517,7 +517,7 @@ const handleSortChange = (column) => {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/recharge/allRecharge.vue

@@ -482,7 +482,7 @@ const handleSortChange = (column) => {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/refund/addRefund.vue

@@ -396,7 +396,7 @@ onMounted(async function () {
         placeholder="提交人姓名"
       />
     </el-form-item>
-    <el-button @click="cancel()" style="margin-left: 280px">重置</el-button>
+    <el-button type="success" @click="cancel()" style="margin-left: 280px">重置</el-button>
     <el-button type="primary" @click="addBefore"> 提交 </el-button>
   </el-form>
 

gold-system/src/views/refund/allRefund.vue

@@ -512,7 +512,7 @@ const handleCurrentChange = function (val) {
           </el-col>
           <el-col :span="3">
             <div class="head-card-btn">
-              <el-button @click="reset()">重置</el-button>
+              <el-button type="success" @click="reset()">重置</el-button>
               <el-button type="primary" @click="search()">查询</el-button>
             </div>
           </el-col>

gold-system/src/views/usergold/index.vue

@@ -25,6 +25,34 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
+//获取地区接口
+
+// 定义加载状态
+const isLoadingArea = ref(false);
+
+// 获取地区数据的函数
+const getArea = async () => {
+  isLoadingArea.value = true;
+  try {
+    const result = await API({
+      url: '/detailY/getarea'
+    });
+    // 假设后端返回的是字符串数组，转换为 { value, label } 格式
+    if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
+      area.value = result.data.map(item => ({ value: item, label: item }));
+    } else {
+      area.value = result.data;
+    }
+  } catch (error) {
+    console.error('获取地区数据失败:', error);
+    ElMessage.error('获取地区数据失败，请稍后重试');
+    // 可以提供默认数据
+    area.value = []; 
+  } finally {
+    isLoadingArea.value = false;
+  }
+};
+
 // 充值明细表格
 const tableData = ref([])
 // 计算用户各金币总数的不分页对象
@@ -49,6 +77,8 @@ const getObj = ref({
 })
 //开启条件筛选导出excel
 const getPutEX = ref(false)
+// 地区
+const area = ref([])
 
 // 支付方式选项
 const num = [
@@ -253,6 +283,7 @@ const checkNumber = function () {
 
 // 挂载
 onMounted(async function () {
+  await getArea()
   await getAdminData()
   await get()
 })
@@ -395,33 +426,33 @@ const areyour = async function () {
 
 const areyouright = ref(false)
 
-//选地区
-const area = [
-  {
-    value: '马来西亚',
-    label: '马来西亚'
-  },
-  {
-    value: '新加坡',
-    label: '新加坡'
-  },
-  {
-    value: '香港',
-    label: '香港'
-  },
-  {
-    value: '泰国',
-    label: '泰国'
-  },
-  {
-    value: '加拿大',
-    label: '加拿大'
-  },
-  {
-    value: '越南HCM',
-    label: '越南HCM'
-  }
-]
+// //选地区
+// const area = [
+//   {
+//     value: '马来西亚',
+//     label: '马来西亚'
+//   },
+//   {
+//     value: '新加坡',
+//     label: '新加坡'
+//   },
+//   {
+//     value: '香港',
+//     label: '香港'
+//   },
+//   {
+//     value: '泰国',
+//     label: '泰国'
+//   },
+//   {
+//     value: '加拿大',
+//     label: '加拿大'
+//   },
+//   {
+//     value: '越南HCM',
+//     label: '越南HCM'
+//   }
+// ]
 //选消费平台
 const platform = [
   {
@@ -676,15 +707,17 @@ const handleCurrentChange = function (val) {
               <el-select
                 v-model="detailY.area"
                 placeholder="请选择所属地区"
-                style="width: 200px"
+                style="width: 240px"
                 clearable
+                :loading="isLoadingArea"
               >
                 <el-option
                   v-for="item in area"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.value || item"
+                  :label="item.label || item"
+                  :value="item.value || item"
                 />
+                
               </el-select>
             </div>
           </el-col>
@@ -703,7 +736,7 @@ const handleCurrentChange = function (val) {
           <el-button type="success" @click="getPutEX = true"
             >导出Excel表格</el-button
           >
-          <el-button @click="reset()">重置</el-button>
+          <el-button type="success" @click="reset()">重置</el-button>
           <el-button type="primary" @click="search()">查询</el-button>
         </div>
       </el-card>

gold-system/src/views/usergoldInfo/index.vue

@@ -287,7 +287,7 @@ const handleCurrentChange = function (val) {
           </div>
 
           <div class="head-card-btn">
-            <el-button @click="reset()">重置</el-button>
+            <el-button type="success" @click="reset()">重置</el-button>
             <el-button type="primary" @click="search()">查询</el-button>
           </div>
         </div>

gold-system/src/views/workspace/index.vue

@@ -1,6 +1,6 @@
 <script setup>
  import * as echarts from 'echarts'
-
+// 这是工作台
 import { ref, onMounted, reactive, computed } from 'vue'
 import { VscInfo } from 'vue-icons-plus/vsc'
 import * as bs from 'vue-icons-plus/bs'