Merge branch 'dev' into test

src/views/commodity/hot_list/index.vue

@@ -21,10 +21,6 @@
           <n-radio-group v-model:value="queryParams.status">
             <n-radio-button
               v-for="song in [
-                {
-                  label: '待审',
-                  value: 0,
-                },
                 {
                   label: '已审核',
                   value: 1,
@@ -274,7 +270,7 @@ const selectOptions = ref([
     value: 0,
   },
   {
-    label: '商家bid',
+    label: '商家名称',
     value: 1,
   },
 ])
@@ -283,7 +279,7 @@ const queryParams = ref({
   selectKey: 0,
   word: '',
   type: '',
-  status: '',
+  status: 0,
   checkedRowKeysRef: [],
 })
 
@@ -580,7 +576,7 @@ const getList = async () => {
       type: queryParams.value.type,
     }
 
-    query_data[queryParams.value.selectKey === 0 ? 'name' : 'bid'] = queryParams.value.word
+    query_data[queryParams.value.selectKey === 0 ? 'name' : 'store_name'] = queryParams.value.word
 
     const res = await api.getHotlist({
       pageNum: pagination.value.page,
@@ -604,7 +600,7 @@ const clear = () => {
     selectKey: 0,
     word: '',
     type: '',
-    status: '',
+    status: 0,
     checkedRowKeysRef: [],
   }
   getList()