Merge branch 'dev' into 'test'

抽奖活动 活动数据 奖品盲豆显示数量

See merge request quanshu/mp-ui-pc!254

src/views/business/marketing/components/ActivityTable.vue

@@ -33,7 +33,8 @@
         </el-table-column>
         <el-table-column label="奖品名称" prop="prizeName" min-width="85" >
           <template slot-scope="scope">
-            <div v-if="scope.row.prizeName != ''">{{ scope.row.prizeName }}</div>
+            <div v-if="scope.row.prizeType == 'COIN'">盲豆 x{{scope.row.value}}</div>
+            <div v-else-if="scope.row.prizeName != ''">{{ scope.row.prizeName }}</div>
             <div v-else> -- </div>
           </template>
         </el-table-column>