Merge branch 'test'

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

@@ -1,6 +1,6 @@
 <template>
   <CommonPage show-footer :title="$route.title">
-    <div flex items-center>
+    <div flex items-center justify-between>
       <div mr-20 flex>
         <div>游戏状态：</div>
         <n-switch
@@ -11,16 +11,18 @@
         />
       </div>
       <div flex items-center>
-        <div>开奖记录：</div>
+        <div ml-20 flex items-center>
-        <n-button type="primary" @click="openData">预览</n-button>
+          <div>开奖记录：</div>
-      </div>
+          <n-button type="primary" @click="openData">预览</n-button>
-      <div ml-20 flex items-center>
+        </div>
-        <div>本局记录：</div>
+        <div ml-20 flex items-center>
-        <n-button type="primary" @click="openJl(1)">预览</n-button>
+          <div>本局记录：</div>
-      </div>
+          <n-button type="primary" @click="openJl(1)">预览</n-button>
-      <div ml-20 flex items-center>
+        </div>
-        <div>全部记录：</div>
+        <div ml-20 flex items-center>
-        <n-button type="primary" @click="openJl(2)">预览</n-button>
+          <div>全部记录：</div>
+          <n-button type="primary" @click="openJl(2)">预览</n-button>
+        </div>
       </div>
     </div>
 
@@ -37,7 +39,21 @@
         本局总下注：
         <span text-25>{{ totalA || 0 }}</span>
       </div>
+      <div ml-20>
+        本局总下注：
+        <span text-25>{{ totalA || 0 }}</span>
+      </div>
     </div>
+
+    <div>
+      <div>
+        第
+        <span text-25>{{ data[0]?.Periods || 0 }}</span>
+        期开奖结果：
+        <span text-20>{{ data[0]?.Name || 0 }}</span>
+      </div>
+    </div>
+
     <n-spin size="large" :show="show">
       <div flex flex-wrap justify-between>
         <n-card
@@ -151,6 +167,14 @@ const val1 = ref(null)
 
 const time = ref(null)
 
+watch(time, (val) => {
+  if (Number(val) === 0) {
+    setTimeout(() => {
+      get_kj_jl()
+    }, 2500)
+  }
+})
+
 const show = ref(true)
 const show1 = ref(true)
 
@@ -189,6 +213,7 @@ ws1.onmessage = (msg) => {
 onMounted(() => {
   // get_data()
   get_data1()
+  get_kj_jl()
 })
 
 // const get_data = async () => {
@@ -251,9 +276,12 @@ const columns = ref([
   },
 ])
 const data = ref([])
-const openData = async () => {
+const openData = () => {
+  showModal.value = true
+  get_kj_jl()
+}
+const get_kj_jl = async () => {
   try {
-    showModal.value = true
     loading.value = true
     const res = await api.getKJList()
     console.log(res)

src/views/marketing/sign/index.vue

@@ -52,6 +52,9 @@ const ok = () => {
         <n-form-item-gi :span="24" label="每月赠送" path="month_sign">
           <n-input-number v-model:value="formData.month_sign" :step="100" />
         </n-form-item-gi>
+        <n-form-item-gi :span="24" label="下注预警（豆子）" path="warningNumber">
+          <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/user/index/api.js

@@ -16,4 +16,6 @@ export default {
   addUserPulse: (data) => request.post('/gift/pulse', data),
   // 获取赠送记录
   getgiftJllist: (data) => request.post('/user/gift/pluse', data),
+  // 用户状态修改
+  updateUserStatus: (data) => request.post('/user/status/edit', data),
 }

src/views/user/index/index.vue

@@ -238,7 +238,7 @@
 <script setup>
 import { h } from 'vue'
 import api from './api'
-import { NDropdown, NButton } from 'naive-ui'
+import { NDropdown, NButton, NSwitch } from 'naive-ui'
 import TheIcon from '@/components/icon/TheIcon.vue'
 
 const loading = ref(false)
@@ -374,6 +374,29 @@ const columns = ref([
     sorter: true,
     sortOrder: false,
   },
+  {
+    title: '用户状态',
+    align: 'center',
+    slot: 'status',
+    render: (row) => {
+      return h(
+        NSwitch,
+        {
+          value: row.status,
+          checkedValue: 1,
+          uncheckedValue: 2,
+          onUpdateValue: async (value) => {
+            await api.updateUserStatus({
+              uid: row.uid,
+              status: value,
+            })
+            await getList()
+          },
+        },
+        {}
+      )
+    },
+  },
   {
     title: '操作',
     align: 'center',