commit

@@ -16,6 +16,11 @@
         min-width="2">
       </el-table-column>
       <el-table-column
+        prop="awardId"
+        label="奖品ID"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
         prop="awardTotalCount"
         label="奖品数量"
         min-width="1">
@@ -80,6 +85,42 @@
     </el-table>
     <br/>
     <br/>
+    <a href="http://192.168.8.211:8090/pages/viewpage.action?pageId=38241498" target="_blank">活动奖品表（health_activity.tbl_activity_award）（奖品类型 1:空奖 2:乐币 3:话费 4:实物 5:红包 6.人民币 7.皮肤 8.赠险 9 健康礼品 10 健康币奖励N个 11 电话医生）</a>
+    <el-table
+      :data="activityAwards"
+      border
+      highlight-current-row
+      style="width: 100%"
+      :header-cell-style="{background: 'deepskyblue', color: 'snow'}">
+      <el-table-column
+        prop="id"
+        label="奖品ID"
+        sortable
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="奖品名称"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="shortName"
+        label="缩略名称"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="worth"
+        label="奖品价值"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="type"
+        label="奖品类型"
+        min-width="1">
+      </el-table-column>
+    </el-table>
+    <br/>
+    <br/>
     <a href="http://192.168.8.211:8090/pages/viewpage.action?pageId=38241498" target="_blank">活动主表（health_activity.tbl_activity_info）</a>
     <el-table
       :data="activityInfos"
@@ -278,6 +319,7 @@
         actid: this.$route.query.id,
         huanjing: this.$route.query.huanjing,
         activityDialAwards: [],
+        activityAwards: [],
         activityDialConfigs: [],
         activityInfos: [],
         activityPopPanels: [],
@@ -307,6 +349,7 @@
         }),config).then((res)=>{
           console.log(res.data)
           this.activityDialAwards=res.data.activityDialAwards
+          this.activityAwards=res.data.activityAwards
           this.activityDialConfigs=res.data.activityDialConfigs
           this.activityInfos=res.data.activityInfos
           this.activityPopPanels=res.data.activityPopPanels