Commit 40d76ab7 40d76ab7ff3d274fc4bebcd6badf5415f3f07196 by zhanghao

commit

1 parent b81eb450
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
16 min-width="2"> 16 min-width="2">
17 </el-table-column> 17 </el-table-column>
18 <el-table-column 18 <el-table-column
19 prop="awardId"
20 label="奖品ID"
21 min-width="1">
22 </el-table-column>
23 <el-table-column
19 prop="awardTotalCount" 24 prop="awardTotalCount"
20 label="奖品数量" 25 label="奖品数量"
21 min-width="1"> 26 min-width="1">
...@@ -80,6 +85,42 @@ ...@@ -80,6 +85,42 @@
80 </el-table> 85 </el-table>
81 <br/> 86 <br/>
82 <br/> 87 <br/>
88 <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>
89 <el-table
90 :data="activityAwards"
91 border
92 highlight-current-row
93 style="width: 100%"
94 :header-cell-style="{background: 'deepskyblue', color: 'snow'}">
95 <el-table-column
96 prop="id"
97 label="奖品ID"
98 sortable
99 min-width="1">
100 </el-table-column>
101 <el-table-column
102 prop="name"
103 label="奖品名称"
104 min-width="1">
105 </el-table-column>
106 <el-table-column
107 prop="shortName"
108 label="缩略名称"
109 min-width="1">
110 </el-table-column>
111 <el-table-column
112 prop="worth"
113 label="奖品价值"
114 min-width="1">
115 </el-table-column>
116 <el-table-column
117 prop="type"
118 label="奖品类型"
119 min-width="1">
120 </el-table-column>
121 </el-table>
122 <br/>
123 <br/>
83 <a href="http://192.168.8.211:8090/pages/viewpage.action?pageId=38241498" target="_blank">活动主表(health_activity.tbl_activity_info)</a> 124 <a href="http://192.168.8.211:8090/pages/viewpage.action?pageId=38241498" target="_blank">活动主表(health_activity.tbl_activity_info)</a>
84 <el-table 125 <el-table
85 :data="activityInfos" 126 :data="activityInfos"
...@@ -278,6 +319,7 @@ ...@@ -278,6 +319,7 @@
278 actid: this.$route.query.id, 319 actid: this.$route.query.id,
279 huanjing: this.$route.query.huanjing, 320 huanjing: this.$route.query.huanjing,
280 activityDialAwards: [], 321 activityDialAwards: [],
322 activityAwards: [],
281 activityDialConfigs: [], 323 activityDialConfigs: [],
282 activityInfos: [], 324 activityInfos: [],
283 activityPopPanels: [], 325 activityPopPanels: [],
...@@ -307,6 +349,7 @@ ...@@ -307,6 +349,7 @@
307 }),config).then((res)=>{ 349 }),config).then((res)=>{
308 console.log(res.data) 350 console.log(res.data)
309 this.activityDialAwards=res.data.activityDialAwards 351 this.activityDialAwards=res.data.activityDialAwards
352 this.activityAwards=res.data.activityAwards
310 this.activityDialConfigs=res.data.activityDialConfigs 353 this.activityDialConfigs=res.data.activityDialConfigs
311 this.activityInfos=res.data.activityInfos 354 this.activityInfos=res.data.activityInfos
312 this.activityPopPanels=res.data.activityPopPanels 355 this.activityPopPanels=res.data.activityPopPanels
......