Merge branch 'feat/lhl' of http://39.101.133.168:8807/yanjiaqing/gold_vue into feat/lhl

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"
@@ -465,6 +474,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
@@ -482,13 +501,8 @@ const platformList = ref<string[]>([
   // 'system',
   // '金币系统'
 ])
-// const typeList = ref<string[]>([
-//   '金币换金豆',
-//   '金币换免费金豆',
-//   '赠送金豆',
-//   '购买金豆',
-//   '客服操作'
-// ])
+const typeList = ref<string[]>([
+])
 //搜索表单数据
 const detailY = ref({
   jwcode: '',
@@ -698,6 +712,7 @@ onMounted(() => {
   getPayType()
   getCount()
   getArea()
+  getType()
 })
 </script>
 <style scoped lang="scss">

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

@@ -1,4 +1,4 @@
-
+<!-- 这是客户金币明细页面 -->
 <script setup>
 import { ref, onMounted, computed ,nextTick} from 'vue'
 
@@ -613,9 +613,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>