From d6a4c7ae92c2f9439c572799b00e8b6ed6631508 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Tue, 29 Apr 2025 18:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gold-system/.env.development                       | 12 ++------
 .../src/views/goldBeen/goldenBeenDetail.vue        | 33 ++++++++++++++++------
 gold-system/src/views/usergold/index.vue           |  8 +++---
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/gold-system/.env.development b/gold-system/.env.development
index dc8b0a6..35d06a7 100644
--- a/gold-system/.env.development
+++ b/gold-system/.env.development
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-# 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://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='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://54.251.137.151:10704/'
->>>>>>> 229c13b945d0e56e10792208bccfdeed0488bca0
-# VITE_API_BASE='http://192.168.8.220:8080/'
+VITE_API_BASE='http://192.168.8.220:8080/'
diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
index 8e5f235..e5b147e 100644
--- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
@@ -36,12 +36,21 @@
       </el-form-item>
       <el-form-item prop="type">
         <el-text class="mx-1" size="large">充值类型：</el-text>
-        <el-input
+        <el-select
           v-model="detailY.type"
-          placeholder="请输入充值类型"
-          style="width: 220px"
-        />
+          placeholder="请选择充值类型"
+          style="width: 240px"
+          clearable
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
       </el-form-item>
+
       <!-- <el-form-item prop="payStyle" label="充值平台">
         <el-select
           v-model="detailY.payStyle"
@@ -283,6 +292,16 @@ const getArea = async () => {
     console.log('请求失败', error)
   }
 }
+const getType = async () => {
+  try {
+    const result = await API({
+      url: '/dou/getType'
+    })
+    typeList.value = result.data
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
 const handlePageSizeChange = (val) => {
   getObj.value.pageSize = val
   getObj.value.pageNum = 1
@@ -301,11 +320,6 @@ const platformList = ref<string[]>([
   // '金币系统'
 ])
 const typeList = ref<string[]>([
-  '金币换金豆',
-  '金币换免费金豆',
-  '赠送金豆',
-  '购买金豆',
-  '客服操作'
 ])
 //搜索表单数据
 const detailY = ref({
@@ -516,6 +530,7 @@ onMounted(() => {
   getPayType()
   getCount()
   getArea()
+  getType()
 })
 </script>
 <style scoped lang="scss">
diff --git a/gold-system/src/views/usergold/index.vue b/gold-system/src/views/usergold/index.vue
index bf73614..cef2e67 100644
--- a/gold-system/src/views/usergold/index.vue
+++ b/gold-system/src/views/usergold/index.vue
@@ -1,4 +1,4 @@
-
+<!-- 这是客户金币明细页面 -->
 <script setup>
 import { ref, onMounted, computed ,nextTick} from 'vue'
 
@@ -608,9 +608,9 @@ const handleCurrentChange = function (val) {
             end-placeholder="结束时间"
             style="margin-right: 10px"
           />
-          <el-button type="success" @click="getToday()">今</el-button>
-          <el-button type="success" @click="getYesterday()">昨</el-button>
-          <el-button type="success" @click="get7Days()">近7天</el-button>
+          <el-button @click="getToday()">今</el-button>
+          <el-button @click="getYesterday()">昨</el-button>
+          <el-button @click="get7Days()">近7天</el-button>
           <el-button type="success" @click="exportExcel">导出Excel表格</el-button>
           <el-button type="success" @click="reset()">重置</el-button>
           <el-button type="primary" @click="search()">查询</el-button>