Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev

src/views/mall/promotion/lottery/record/index.vue

@@ -8,28 +8,10 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="奖品类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择奖品类型" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_LUCK_PRIZE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="是否领取" prop="isReceive">
-        <el-input
-          v-model="queryParams.isReceive"
-          placeholder="请输入是否领取"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否发货" prop="isDeliver">
-        <el-input
-          v-model="queryParams.isDeliver"
-          placeholder="请输入是否发货"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-select v-model="queryParams.isReceive" placeholder="请选择领取状态" clearable class="!w-240px">
+          <el-option v-for="(val, index) in statusType" :key="index" :label="val.label" :value="val.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
@@ -71,10 +53,12 @@
     <el-table v-loading="loading" :data="list" :stripe="true">
       <el-table-column label="中奖用户" align="center" prop="user.name" />
       <el-table-column label="活动名称" align="center" prop="lottery.name" />
-      <el-table-column label="奖品信息" align="center" prop="prize.name">
+      <el-table-column label="奖品信息" align="center" prop="prize.name" min-width="200">
         <template #default="scope">
           <div class="flex items-center">
-            <el-image :src="scope.row.prize.image" class="!w-60px !h-50px mr-5px" />
+            <div class="!w-50px !h-50px mr-5px">
+              <el-image :src="scope.row.prize.image" class="!w-50px !h-50px" />
+            </div>
             {{ scope.row.prize.name }}
           </div>
         </template>
@@ -144,6 +128,10 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const statusType = [
+  { label: '是', value: true },
+  { label: '否', value: false }
+]
 
 /** 查询列表 */
 const getList = async () => {