From be61bf21668d45ee39686971fa5d4354bf9a0b7f Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 2 Feb 2023 16:41:52 +0800
Subject: [PATCH] bug

---
 .../components/Detail.vue                     | 34 +++++++++++++++++--
 .../AppMarketingActivity/components/List.vue  |  4 +--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
index 3c3735ba..df6ea39d 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
@@ -65,6 +65,20 @@
       <div v-show="currIndex === 1">
         <ai-card title="报名记录">
           <template #content>
+            <ai-search-bar class="search-bar">
+              <template #right>
+                <el-input
+                  v-model="search.name"
+                  class="search-input"
+                  size="small"
+                  v-throttle="() => {search.current = 1, getList()}"
+                  placeholder="请输入姓名"
+                  clearable
+                  @clear="search.current = 1, getList()"
+                  suffix-icon="iconfont iconSearch">
+                </el-input>
+              </template>
+            </ai-search-bar>
             <ai-table
               :tableData="tableData"
               :col-configs="colConfigs"
@@ -89,7 +103,19 @@
                   :selectList="prizes"
                   @change="prizeSearch.current = 1, getPrizeList()">
                 </ai-select>
-                </template>
+              </template>
+              <template #right>
+                <el-input
+                  v-model="prizeSearch.name"
+                  class="search-input"
+                  size="small"
+                  v-throttle="() => {prizeSearch.current = 1, getPrizeList()}"
+                  placeholder="请输入奖品名称"
+                  clearable
+                  @clear="prizeSearch.current = 1, getPrizeList()"
+                  suffix-icon="iconfont iconSearch">
+                </el-input>
+              </template>
             </ai-search-bar>
             <ai-table
               :tableData="prizeList"
@@ -122,8 +148,8 @@
         currIndex: 0,
         tabList: ['基本信息', '报名记录', '抽奖记录'],
         colConfigs: [
-          { prop: 'userName',  label: '姓名', align: 'left', width: '200px' },
-          { prop: 'userPhone', label: '手机号', align: 'center' },
+          { prop: 'name',  label: '姓名', align: 'left', width: '200px' },
+          { prop: 'phone', label: '手机号', align: 'center' },
           { prop: 'createTime', label: '报名时间', align: 'center' }
         ],
         prizeColConfigs: [
@@ -136,10 +162,12 @@
         prizeSearch: {
           size: 10,
           current: 1,
+          name: '',
           prizeId: ''
         },
         search: {
           size: 10,
+          name: '',
           current: 1
         },
         prizes: [],
diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/List.vue b/project/activeAnalysis/app/AppMarketingActivity/components/List.vue
index 38ff8edb..3571785c 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/List.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/List.vue
@@ -22,9 +22,9 @@
             class="search-input"
             size="small"
             v-throttle="() => {search.current = 1, getList()}"
-            placeholder="请选择活动标题"
+            placeholder="请输入活动标题"
             clearable
-            @clear="search.current = 1, search.province = '', getList()"
+            @clear="search.current = 1, getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>