Merge branch 'dev' into test

src/views/commodity/hot_list/index.vue

@@ -1,19 +1,80 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
   <CommonPage show-footer :title="$route.title">
+    <!-- {{ queryParams }} -->
     <n-grid class="mb-10" x-gap="12">
       <n-gi span="12" mt-10 flex items-center>
         <span w-100>筛选条件:</span>
         <n-input-group>
           <n-select
             v-model:value="queryParams.selectKey"
-            :style="{ width: '20%' }"
+            :style="{ width: '25%' }"
             :options="selectOptions"
             placeholder="请选择"
           />
-          <n-input v-model:value="queryParams.word" :style="{ width: '30%' }" />
+          <n-input v-model:value="queryParams.word" :style="{ width: '50%' }" />
         </n-input-group>
       </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 [
+                {
+                  label: '待审',
+                  value: 0,
+                },
+                {
+                  label: '已审核',
+                  value: 1,
+                },
+                {
+                  label: '拒绝',
+                  value: 2,
+                },
+                {
+                  label: '待审核',
+                  value: 3,
+                },
+              ]"
+              :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 [
+                {
+                  label: '普通商品',
+                  value: 0,
+                },
+                {
+                  label: '活动商品',
+                  value: 1,
+                },
+                {
+                  label: '积分商品',
+                  value: 2,
+                },
+                {
+                  label: '摇球商品',
+                  value: 3,
+                },
+              ]"
+              :key="song.value"
+              :value="song.value"
+              :label="song.label"
+            />
+          </n-radio-group>
+        </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>
@@ -212,11 +273,17 @@ const selectOptions = ref([
     label: '商品名称',
     value: 0,
   },
+  {
+    label: '商家bid',
+    value: 1,
+  },
 ])
 
 const queryParams = ref({
   selectKey: 0,
   word: '',
+  type: '',
+  status: '',
   checkedRowKeysRef: [],
 })
 
@@ -508,10 +575,17 @@ onMounted(() => {
 const getList = async () => {
   loading.value = true
   try {
+    const query_data = {
+      status: queryParams.value.status,
+      type: queryParams.value.type,
+    }
+
+    query_data[queryParams.value.selectKey === 0 ? 'name' : 'bid'] = queryParams.value.word
+
     const res = await api.getHotlist({
       pageNum: pagination.value.page,
       pageSize: pagination.value.pageSize,
-      name: queryParams.value.word,
+      ...query_data,
     })
     data.value = res.data.data.sort((a, b) => b.status - a.status) || []
     pagination.value.itemCount = res.data.total
@@ -526,7 +600,13 @@ const clear = () => {
   isDzModel.value = false
   notesVal.value = ''
   nowRow.value = {}
-  queryParams.value.word = ''
+  queryParams.value = {
+    selectKey: 0,
+    word: '',
+    type: '',
+    status: '',
+    checkedRowKeysRef: [],
+  }
   getList()
 }