feat(custom): \!

src/views/commodity/hot_list/index.vue

@@ -454,7 +454,7 @@ const columns = ref([
     align: 'center',
   },
   {
-    title: '折扣比例（%）',
+    title: '抵扣比例（%）',
     key: 'discount',
     align: 'center',
   },

src/views/finance/api.js

@@ -9,4 +9,6 @@ export default {
   ydataEdit: (data) => request.post('/store/amount/withdraw/edit', data),
   // 溯源统计
   suyuanData: (data) => request.post('/pulse/count', data),
+  // 获取游戏大厅
+  getGameData: (data) => request.post('/game/list', data),
 }

src/views/finance/suyuan.vue

@@ -1,5 +1,87 @@
 <template>
   <CommonPage show-footer :title="$route.title">
+    <n-grid class="mb-10" x-gap="12">
+      <n-gi :span="24">
+        <div flex>
+          <n-card w-250>
+            <n-statistic label="总赢积分" tabular-nums>
+              <n-number-animation ref="numberAnimationInstRef" :from="0" :to="cardData.win" />
+            </n-statistic>
+          </n-card>
+          <n-card ml-10 w-250>
+            <n-statistic label="总豆子" tabular-nums>
+              <n-number-animation ref="numberAnimationInstRef" :from="0" :to="cardData.pulse" />
+            </n-statistic>
+          </n-card>
+        </div>
+      </n-gi>
+      <n-gi :span="12">
+        <div mt-10 flex items-center>
+          <div w-100>筛选条件:</div>
+          <n-input-group>
+            <n-select
+              v-model:value="queryParams.selectKey"
+              :style="{ width: '30rem' }"
+              :options="selectOptions"
+              placeholder="请选择"
+            />
+            <n-input v-model:value="queryParams.word" :style="{ width: '50rem' }" />
+          </n-input-group>
+        </div>
+      </n-gi>
+      <n-gi :span="24">
+        <div mt-10 flex items-center>
+          <div mr-10>游戏名称:</div>
+          <n-select
+            v-model:value="queryParams.hall_id"
+            w-250
+            :options="gamelist"
+            placeholder="请选择游戏"
+          />
+        </div>
+      </n-gi>
+      <n-gi :span="24" mt-10>
+        <div>
+          <span>豆子状态：</span>
+          <n-radio-group v-model:value="queryParams.Status">
+            <n-radio-button
+              v-for="song in songs"
+              :key="song.value"
+              :value="song.value"
+              :label="song.label"
+            />
+          </n-radio-group>
+        </div>
+      </n-gi>
+      <n-gi :span="24" mt-10>
+        <div>
+          <span>活动赠送：</span>
+          <n-radio-group v-model:value="queryParams.Type">
+            <n-radio-button
+              v-for="song in songs1"
+              :key="song.value"
+              :value="song.value"
+              :label="song.label"
+            />
+          </n-radio-group>
+        </div>
+      </n-gi>
+      <n-gi :span="24">
+        <div mt-10 flex items-center>
+          <div>时间筛选：</div>
+          <n-date-picker
+            v-model:formatted-value="queryParams.time"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            clearable
+          />
+        </div>
+      </n-gi>
+      <n-gi span="24" mt-10 flex items-center>
+        <n-button type="primary" @click="getList">查询</n-button>
+        <n-button ml-10 @click="clear">重置</n-button>
+      </n-gi>
+    </n-grid>
     <n-data-table
       class="mt-10"
       :loading="loading"
@@ -14,12 +96,119 @@
 
 <script setup>
 import api from './api'
+import dayjs from 'dayjs'
 
-// const queryData = ref({})
+const queryParams = ref({})
+
+const cardData = ref({})
+
+const selectOptions = [
+  {
+    label: '商家电话',
+    value: 0,
+  },
+  {
+    label: '用户电话',
+    value: 1,
+  },
+]
+
+const songs = ref([
+  {
+    value: 1,
+    label: '未使用',
+  },
+  {
+    value: 3,
+    label: '用户赢',
+  },
+  {
+    value: 4,
+    label: '用户输',
+  },
+  {
+    value: 5,
+    label: '已过期',
+  },
+])
+
+const gamelist = ref([])
+
+const songs1 = ref([
+  {
+    value: 5,
+    label: '注册赠送',
+  },
+  {
+    value: 6,
+    label: '签到赠送',
+  },
+  {
+    value: 7,
+    label: '平台赠送',
+  },
+])
 
 const loading = ref(false)
 
-const columns = ref([])
+const columns = ref([
+  {
+    title: '游戏名称',
+    align: 'center',
+    slot: 'game_name',
+    render: (row) => {
+      const res = gamelist.value.find((item) => item.value === row.hall_id)
+      return h('span', null, {
+        default: () => res?.label || '',
+      })
+    },
+  },
+  {
+    title: '订单ID',
+    align: 'center',
+    key: 'order_id',
+  },
+  {
+    title: '期数',
+    align: 'center',
+    key: 'periods',
+  },
+  {
+    title: '投注豆子',
+    align: 'center',
+    key: 'number',
+  },
+  {
+    title: '赢积分',
+    align: 'center',
+    key: 'integral',
+  },
+  {
+    title: '用户电话',
+    align: 'center',
+    key: 'user_phone',
+  },
+  {
+    title: '商户电话',
+    align: 'center',
+    key: 'merchant_phone',
+  },
+  {
+    title: '投注时间',
+    align: 'center',
+    key: 'add_time',
+  },
+  {
+    title: '过期时间',
+    align: 'center',
+    slot: 'expire',
+    render: (row) => {
+      return h('span', null, {
+        default: () => dayjs(row.expire).format('YYYY-MM-DD HH:mm:ss'),
+      })
+    },
+  },
+])
 
 const data = ref([])
 
@@ -35,30 +224,56 @@ const pagination = ref({
 
 onMounted(() => {
   getList()
+  getGameList()
 })
 
+const getGameList = async () => {
+  const res = await api.getGameData({ pageSize: 9999999, pageNum: 1 })
+  gamelist.value = res.data.data.map((item) => ({ value: item.ID, label: item.name }))
+}
+
 const getList = async () => {
   loading.value = true
-  // const query_data = {
+  const query_data = {
-  //   Status: queryData.value.status || '',
+    ...queryParams.value,
-  //   Phone: queryData.value.word || '',
+    StartTime: queryParams.value.time?.[0] || '',
-  //   StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+    EndTime: queryParams.value.time?.[1] || '',
-  //   EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+  }
-  // }
+
+  switch (queryParams.value.selectKey) {
+    case 0:
+      query_data['merchant_phone'] = queryParams.value.word
+      break
+    case 1:
+      query_data['user_phone'] = queryParams.value.word
+      break
+  }
+
+  delete query_data.time
+  delete query_data.word
   const res = await api.suyuanData({
     pageNum: pagination.value.page,
     pageSize: pagination.value.pageSize,
-    // ...query_data,
+    ...query_data,
   })
-
+  data.value = res.data.result || []
-  data.value = res.data.data || []
+  pagination.value.itemCount = res.data.count
-  pagination.value.itemCount = res.data.total
+  cardData.value.win = res.data.win
-  // cardData.value.total = res.data.all
+  cardData.value.pulse = res.data.pulse
-  // cardData.value.service = res.data.audit_number
-  // cardData.value.commission = res.data.audit_commission
-  // cardData.value.count = res.data.success_amount
   loading.value = false
 }
+
+const clear = () => {
+  queryParams.value = {
+    word: '',
+    selectKey: null,
+    Status: '',
+    time: null,
+    Type: '',
+    hall_id: '',
+  }
+  getList()
+}
 </script>
 
 <style lang="scss" scoped></style>

src/views/system/msgMag/index.vue

@@ -0,0 +1,7 @@
+<template>
+  <CommonPage show-footer :title="$route.title"></CommonPage>
+</template>
+
+<script setup></script>
+
+<style lang="scss" scoped></style>

src/views/user/index/index.vue

@@ -3,21 +3,21 @@
     <n-grid class="mb-10" x-gap="12">
       <n-gi :span="24">
         <div flex>
-          <n-card w-250>
+          <!-- <n-card w-250>
             <n-statistic label="用户总赢积分" tabular-nums>
               <n-number-animation ref="numberAnimationInstRef" :from="0" :to="cardData.win" />
             </n-statistic>
-          </n-card>
+          </n-card> -->
-          <n-card ml-10 w-250>
+          <n-card w-250>
             <n-statistic label="用户积分（留存）" tabular-nums>
               <n-number-animation ref="numberAnimationInstRef" :from="0" :to="cardData.integral" />
             </n-statistic>
           </n-card>
-          <n-card ml-10 w-250>
+          <!-- <n-card ml-10 w-250>
             <n-statistic label="总豆子" tabular-nums>
               <n-number-animation ref="numberAnimationInstRef" :from="0" :to="cardData.pulse" />
             </n-statistic>
-          </n-card>
+          </n-card> -->
           <n-card ml-10 w-250>
             <n-statistic label="今日新增用户" tabular-nums>
               <n-number-animation
@@ -27,7 +27,7 @@
               />
             </n-statistic>
           </n-card>
-          <n-card ml-10 w-250>
+          <!-- <n-card ml-10 w-250>
             <n-statistic label="用户总流水(元)" tabular-nums>
               <n-number-animation
                 ref="numberAnimationInstRef"
@@ -36,8 +36,8 @@
                 :precision="2"
               />
             </n-statistic>
-          </n-card>
+          </n-card> -->
-          <n-card ml-10 w-250>
+          <!-- <n-card ml-10 w-250>
             <n-statistic label="总佣金(积分)" tabular-nums>
               <n-number-animation
                 ref="numberAnimationInstRef"
@@ -46,7 +46,7 @@
                 :precision="2"
               />
             </n-statistic>
-          </n-card>
+          </n-card> -->
           <n-card ml-10 w-250>
             <n-statistic label="平台总用户" tabular-nums>
               <n-number-animation
@@ -58,7 +58,7 @@
           </n-card>
         </div>
       </n-gi>
-      <n-gi span="12" mt-10 flex items-center>
+      <n-gi :span="12" mt-10 flex items-center>
         <span w-100>筛选条件:</span>
         <n-input-group>
           <n-select
@@ -70,7 +70,7 @@
           <n-input v-model:value="queryParams.word" :style="{ width: '30%' }" />
         </n-input-group>
       </n-gi>
-      <n-gi :span="24" mt-10>
+      <!-- <n-gi :span="24" mt-10>
         <div>
           <span>筛选状态：</span>
           <n-radio-group v-model:value="queryParams.status">
@@ -95,8 +95,8 @@
             />
           </n-radio-group>
         </div>
-      </n-gi>
+      </n-gi> -->
-      <n-gi :span="10">
+      <n-gi :span="24">
         <div mt-10 flex items-center>
           <span w-100>时间筛选：</span>
           <n-date-picker
@@ -279,40 +279,6 @@ const cardData = ref({
   win: 0,
 })
 
-const songs = ref([
-  {
-    value: 1,
-    label: '未使用',
-  },
-  {
-    value: 3,
-    label: '用户赢',
-  },
-  {
-    value: 4,
-    label: '用户输',
-  },
-  {
-    value: 5,
-    label: '已过期',
-  },
-])
-
-const songs1 = ref([
-  {
-    value: 5,
-    label: '注册赠送',
-  },
-  {
-    value: 6,
-    label: '签到赠送',
-  },
-  {
-    value: 7,
-    label: '主动赠送',
-  },
-])
-
 const selectOptions = [
   {
     label: '用户昵称',
@@ -364,20 +330,20 @@ const columns = ref([
     sorter: true,
     sortOrder: false,
   },
-  {
+  // {
-    title: '赢积分',
+  //   title: '赢积分',
-    align: 'center',
+  //   align: 'center',
-    key: 'win',
+  //   key: 'win',
-    sorter: true,
+  //   sorter: true,
-    sortOrder: false,
+  //   sortOrder: false,
-  },
+  // },
-  {
+  // {
-    title: '用户豆子',
+  //   title: '用户豆子',
-    align: 'center',
+  //   align: 'center',
-    key: 'pulse',
+  //   key: 'pulse',
-    sorter: true,
+  //   sorter: true,
-    sortOrder: false,
+  //   sortOrder: false,
-  },
+  // },
   {
     title: '用户状态',
     align: 'center',