Merge branch 'test'

src/views/commodity/point/index.vue

@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/no-v-html -->
 <template>
   <CommonPage show-footer :title="$route.title">
     <n-data-table

src/views/game/dice/data/index.vue

@@ -39,10 +39,6 @@
         本局总下注：
         <span text-25>{{ totalA || 0 }}</span>
       </div>
-      <div ml-20>
-        本局总下注：
-        <span text-25>{{ totalA || 0 }}</span>
-      </div>
     </div>
 
     <div>
@@ -180,6 +176,9 @@ const show1 = ref(true)
 
 ws.onopen = () => {
   console.log('1连接成功')
+  setInterval(() => {
+    ws.send('ping')
+  }, 2500)
 }
 
 const totalA = ref(null)
@@ -195,6 +194,9 @@ ws.onmessage = (msg) => {
 
 ws1.onopen = () => {
   console.log('2连接成功')
+  setInterval(() => {
+    ws.send('ping')
+  }, 2500)
 }
 
 ws1.onmessage = (msg) => {

src/views/marketing/sign/index.vue

@@ -20,13 +20,14 @@ const ok = () => {
   formRef.value?.validate(async (errors) => {
     if (!errors) {
       try {
-        const data = {
+        // const data = {
-          Gift: formData.value.gift,
+        //   Gift: formData.value.gift,
-          Sign: formData.value.sign,
+        //   Sign: formData.value.sign,
-          WeekSign: formData.value.week_sign,
+        //   WeekSign: formData.value.weekSign,
-          MonthSign: formData.value.month_sign,
+        //   MonthSign: formData.value.monthSign,
-        }
+        //   WarningNumber: formData.value.warningNumber,
-        await api.setSignConfig(data)
+        // }
+        await api.setSignConfig(formData.value)
         $message.success('保存成功')
       } catch (e) {
         $message.error(e.msg)
@@ -40,20 +41,20 @@ const ok = () => {
   <CommonPage show-footer :title="$route.title">
     <n-form ref="formRef" :model="formData" :rules="rules">
       <n-grid :cols="24" :x-gap="24">
-        <n-form-item-gi :span="24" label="注册赠送" path="gift">
+        <n-form-item-gi :span="24" label="注册赠送" path="Gift">
-          <n-input-number v-model:value="formData.gift" :step="100" />
+          <n-input-number v-model:value="formData.Gift" :step="100" />
         </n-form-item-gi>
-        <n-form-item-gi :span="24" label="每日赠送" path="sign">
+        <n-form-item-gi :span="24" label="每日赠送" path="Sign">
-          <n-input-number v-model:value="formData.sign" :step="100" />
+          <n-input-number v-model:value="formData.Sign" :step="100" />
         </n-form-item-gi>
-        <n-form-item-gi :span="24" label="每周赠送" path="week_sign">
+        <n-form-item-gi :span="24" label="每周赠送" path="WeekSign">
-          <n-input-number v-model:value="formData.week_sign" :step="100" />
+          <n-input-number v-model:value="formData.WeekSign" :step="100" />
         </n-form-item-gi>
-        <n-form-item-gi :span="24" label="每月赠送" path="month_sign">
+        <n-form-item-gi :span="24" label="每月赠送" path="MonthSign">
-          <n-input-number v-model:value="formData.month_sign" :step="100" />
+          <n-input-number v-model:value="formData.MonthSign" :step="100" />
         </n-form-item-gi>
-        <n-form-item-gi :span="24" label="下注预警（豆子）" path="warningNumber">
+        <n-form-item-gi :span="24" label="下注预警（豆子）" path="WarningNumber">
-          <n-input-number v-model:value="formData.warningNumber" :step="100" />
+          <n-input-number v-model:value="formData.WarningNumber" :step="100" />
         </n-form-item-gi>
         <n-form-item-gi :span="12">
           <n-button v-perms="['/admin/gift/setting/edit']" type="primary" @click="ok">

src/views/system/sys/api.js

@@ -1,6 +1,6 @@
 import { request } from '@/utils'
 
 export default {
-  getConfig: (data) => request.post('/userConfig', data),
+  getConfig: (data) => request.post('/edit/setting', data),
-  editConfig: (data) => request.post('/userConfig/edit', data),
+  editConfig: (data) => request.post('/edit/setting/edit', data),
 }

src/views/system/sys/index.vue

@@ -2,21 +2,40 @@
   <CommonPage show-footer :title="$route.title">
     <n-form
       ref="formRef"
-      :label-width="120"
+      :label-width="150"
       :model="formValue"
       label-placement="left"
       :rules="rules"
     >
-      <n-form-item label="积分佣金比例:" path="reward">
+      <n-form-item label="提现手续费类型:" path="ScaleType">
+        <n-radio-group v-model:value="formValue.ScaleType" name="radiogroup">
+          <n-space>
+            <n-radio
+              v-for="song in [
+                { label: '动态比例', value: 1 },
+                { label: '固定数值', value: 2 },
+              ]"
+              :key="song.value"
+              :value="song.value"
+            >
+              {{ song.label }}
+            </n-radio>
+          </n-space>
+        </n-radio-group>
+      </n-form-item>
+      <n-form-item label="提现手续费比例:" path="Scale">
         <n-input-number
-          v-model:value="formValue.reward"
+          v-model:value="formValue.Scale"
+          clearable
+          :precision="3"
           style="width: 200px"
-          placeholder="输入积分佣金比例"
+          placeholder="输入提现手续费比例"
         />
       </n-form-item>
       <n-form-item>
         <n-button
           v-perms="['/admin/userConfig/edit']"
+          class="ml-25"
           attr-type="button"
           type="primary"
           @click="handleValidateClick"
@@ -31,18 +50,23 @@
 <script setup>
 import api from './api'
 
-const formValue = ref({
+const formValue = ref({})
-  reward: null,
-})
 
 const formRef = ref(null)
 
 const rules = {
-  reward: [
+  Scale: [
     {
       required: true,
       type: 'number',
-      message: '请输入积分佣金比例',
+      message: '请输入提现手续费比例',
+    },
+  ],
+  ScaleType: [
+    {
+      required: true,
+      type: 'number',
+      message: '请选择提现手续费类型',
     },
   ],
 }
@@ -53,7 +77,7 @@ onMounted(() => {
 
 const getconfig = async () => {
   const res = await api.getConfig()
-  formValue.value = res.data.data
+  formValue.value = res.data.data[0]
 }
 
 const handleValidateClick = () => {

src/views/user/index/api.js

@@ -12,10 +12,12 @@ export default {
   getjfJllist: (data) => request.post('/user/point', data),
   // 获取推广记录
   gettgJllist: (data) => request.post('/user/referee/point', data),
-  // 积分赠送
+  // 豆子赠送
   addUserPulse: (data) => request.post('/gift/pulse', data),
   // 获取赠送记录
   getgiftJllist: (data) => request.post('/user/gift/pluse', data),
   // 用户状态修改
   updateUserStatus: (data) => request.post('/user/status/edit', data),
+  // 投注记录
+  getBetlist: (data) => request.post('/user/dice/list', data),
 }

src/views/user/index/index.vue

@@ -147,8 +147,8 @@
           <n-tab name="3" tab="豆子记录"></n-tab>
           <n-tab name="4" tab="积分记录"></n-tab>
           <n-tab name="5" tab="推广记录"></n-tab>
-
           <n-tab name="6" tab="赠送记录"></n-tab>
+          <n-tab name="7" tab="投注记录"></n-tab>
         </n-tabs>
         <n-row gutter="12">
           <n-col :span="12">
@@ -181,6 +181,10 @@
                     label: '商品赠送',
                     value: 3,
                   },
+                  {
+                    label: '游戏获取',
+                    value: 5,
+                  },
                 ]"
                 placeholder="请选择类型"
               />
@@ -205,7 +209,7 @@
       </n-drawer-content>
     </n-drawer>
     <!--  赠送  -->
-    <n-modal v-model:show="showModal" :mask-closable="false">
+    <n-modal v-model:show="showModal">
       <n-card
         style="width: 600px"
         title="豆子赠送"
@@ -224,7 +228,7 @@
                 :step="100"
               />
             </n-form-item-gi>
-            <n-form-item-gi :span="24">
+            <n-form-item-gi v-perms="['/admin/gift/pulse']" :span="24">
               <n-button type="primary" @click="ok">提交</n-button>
               <n-button ml-10 @click="addClear">取消</n-button>
             </n-form-item-gi>
@@ -644,7 +648,7 @@ const tabsChange = async (e = '1') => {
         key: 'oid',
       },
       {
-        title: '消费豆子',
+        title: '获得豆子',
         align: 'center',
         key: 'number',
       },
@@ -734,6 +738,48 @@ const tabsChange = async (e = '1') => {
         key: 'add_time',
       },
     ]
+  } else if (tabVal.value === '7') {
+    tabsColumns.value = [
+      // {
+      //   title: '昵称',
+      //   key: 'User',
+      //   align: 'center',
+      // },
+      // {
+      //   title: '电话',
+      //   key: 'Phone',
+      //   align: 'center',
+      // },
+      {
+        title: '期数',
+        key: 'Periods',
+        align: 'center',
+      },
+      {
+        title: '下注豆子',
+        key: 'TotalCount',
+        align: 'center',
+        sorter: true,
+        sortOrder: false,
+      },
+      {
+        title: '赢积分',
+        key: 'NumberSum',
+        align: 'center',
+        sorter: true,
+        sortOrder: false,
+      },
+      {
+        title: '购买号码',
+        key: 'PeriodsNum',
+        align: 'center',
+      },
+      {
+        title: '时间',
+        key: 'DrawTime',
+        align: 'center',
+      },
+    ]
   }
   tabsPagination.value.page = 1
   await getTabsList()
@@ -769,6 +815,16 @@ const getTabsList = async () => {
     case '6':
       res = await api.getgiftJllist(data)
       break
+    case '7':
+      // const betData = {
+      //   Uid: nowRow.value.uid,
+      //   PageNum: tabsPagination.value.page,
+      //   PageSize: tabsPagination.value.pageSize,
+      //   StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+      //   EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+      // }
+      res = await api.getBetlist(data)
+      break
   }
   tabsData.value = res.data.data || []
   tabsPagination.value.itemCount = res.data.total