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

---
 .../AppMarketingActivity/components/Add.vue   |  2 +-
 .../components/Detail.vue                     | 48 +++++++++++++++----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/Add.vue b/project/activeAnalysis/app/AppMarketingActivity/components/Add.vue
index 2841d31e..52a38094 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/Add.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/Add.vue
@@ -111,7 +111,7 @@
                       <el-input-number size="small" v-model="item.showIndex" :min="1"></el-input-number>
                     </div>
                     <div class="prize-item">
-                      <span>奖品排序：</span>
+                      <span>开放轮次：</span>
                       <el-radio-group v-model="item.belongRound">
                         <el-radio :label="1">第一轮</el-radio>
                         <el-radio :label="2">第二轮</el-radio>
diff --git a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
index 10342f10..3c3735ba 100644
--- a/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
+++ b/project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-detail isHasSidebar>
+  <ai-detail isHasSidebar class="AppMarketingActivity-detail">
     <template slot="title">
       <ai-title title="活动详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
       </ai-title>
@@ -38,15 +38,17 @@
         <ai-card title="奖品">
           <template #content>
             <ai-wrapper
+              class="prize-item"
               v-for="(item, key) in info.prizes"
               :key="key"
               label-width="180px">
               <ai-info-item label="奖品名称" isLine :value="item.name"></ai-info-item>
               <ai-info-item label="中奖规则" :value="item.rule"></ai-info-item>
               <ai-info-item label="奖品总数" :value="item.total"></ai-info-item>
-              <ai-info-item label="奖品排序" :value="item.belongRound"></ai-info-item>
+              <ai-info-item label="奖品排序" :value="item.showIndex"></ai-info-item>
+              <ai-info-item label="开放轮次" :value="item.belongRound"></ai-info-item>
               <ai-info-item label="是否默认" :value="item.defaultPrize === '0' ? '否' : '是'"></ai-info-item>
-              <ai-info-item label="奖品图片">
+              <ai-info-item label="奖品图片" isLine>
                 <ai-uploader
                   :instance="instance"
                   disabled
@@ -78,6 +80,17 @@
       <div v-show="currIndex === 2">
         <ai-card title="抽奖记录">
           <template #content>
+            <ai-search-bar class="search-bar">
+              <template #left>
+                <ai-select
+                  v-model="prizeSearch.prizeId"
+                  clearable
+                  placeholder="请选择奖品"
+                  :selectList="prizes"
+                  @change="prizeSearch.current = 1, getPrizeList()">
+                </ai-select>
+                </template>
+            </ai-search-bar>
             <ai-table
               :tableData="prizeList"
               :col-configs="prizeColConfigs"
@@ -114,19 +127,22 @@
           { prop: 'createTime', label: '报名时间', align: 'center' }
         ],
         prizeColConfigs: [
-          { prop: 'userName',  label: '姓名', align: 'left', width: '200px' },
-          { prop: 'userPhone', label: '手机号', align: 'center' },
-          { prop: 'createTime', label: '报名时间', align: 'center' }
+          { prop: 'name',  label: '姓名', align: 'left', width: '200px' },
+          { prop: 'phone', label: '手机号', align: 'center' },
+          { prop: 'prizeName', label: '奖品名称', align: 'center' },
+          { prop: 'createTime', label: '抽奖时间', align: 'center' }
         ],
         prizeList: [],
         prizeSearch: {
           size: 10,
-          current: 1
+          current: 1,
+          prizeId: ''
         },
         search: {
           size: 10,
           current: 1
         },
+        prizes: [],
         tableData: [],
         total: 0,
         info: {}
@@ -156,7 +172,7 @@
       getPrizeList() {
         this.instance.post(`/app/appmarketingactivityinfo/raffleList?activityId=${this.params.id}`, null, {
           params: {
-            ...this.search
+            ...this.prizeSearch
           }
         }).then(res => {
           if (res.code == 0) {
@@ -171,6 +187,12 @@
           if (res.code == 0) {
             if (res.data) {
               this.info = res.data
+              this.prizes = res.data.prizes.map(v => {
+                return {
+                  dictValue: v.id,
+                  dictName: v.name
+                }
+              })
             }
           }
         })
@@ -187,4 +209,14 @@
 </script>
 
 <style scoped lang="scss">
+  .AppMarketingActivity-detail {
+    .prize-item {
+      padding: 20px 0 0;
+      border-bottom: 1px solid #eee;
+
+      &:first-child {
+        padding-top: 0;
+      }
+    }
+  }
 </style>