Merge branch 'dev' into test

src/views/game/jl/index.vue

@@ -97,10 +97,10 @@ const songs = ref([
     label: '未使用',
     value: 1,
   },
-  {
+  // {
-    label: '已使用',
+  //   label: '已使用',
-    value: 2,
+  //   value: 2,
-  },
+  // },
   {
     label: '赢',
     value: 3,

src/views/game/route.js

@@ -7,7 +7,7 @@ export default {
   redirect: '/game_jl',
   meta: {
     title: '游戏统计',
-    icon: 'mdi:index',
+    icon: 'mdi:access-point',
     order: 100,
   },
   children: [
@@ -17,7 +17,7 @@ export default {
       component: () => import('./jl/index.vue'),
       meta: {
         title: '豆子记录',
-        icon: 'mdi:index',
+        icon: 'mdi:access-point-check',
       },
     },
   ],

src/views/user/index1/index.vue

@@ -20,7 +20,7 @@
           </n-card>
         </div>
       </n-col>
-      <n-col :span="24" mt-10>
+      <!-- <n-col :span="24" mt-10>
         <div>
           <span>筛选状态：</span>
           <n-radio-group v-model:value="queryData.status">
@@ -32,7 +32,7 @@
             />
           </n-radio-group>
         </div>
-      </n-col>
+      </n-col> -->
       <n-col :span="24">
         <div mt-10 flex items-center>
           <div w-100>关键字搜索：</div>
@@ -180,24 +180,24 @@ const queryData = ref({
   word: '',
 })
 
-const songs = ref([
+// const songs = ref([
-  {
+//   {
-    value: 1,
+//     value: 1,
-    label: '未使用',
+//     label: '未使用',
-  },
+//   },
-  {
+//   {
-    value: 3,
+//     value: 3,
-    label: '用户赢',
+//     label: '用户赢',
-  },
+//   },
-  {
+//   {
-    value: 4,
+//     value: 4,
-    label: '用户输',
+//     label: '用户输',
-  },
+//   },
-  {
+//   {
-    value: 5,
+//     value: 5,
-    label: '已过期',
+//     label: '已过期',
-  },
+//   },
-])
+// ])
 
 const selectOptions = ref([
   {