1

src/components/activity/CouponList.vue

@@ -82,10 +82,12 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <th>优惠券名</th>
-        <th>数量</th>
+        <th>优惠券数量</th>
+        <th>发放数量</th>
+        <th>剩余数量</th>
         <th>线路名称</th>
         <th>类型</th>
-        <th>满减/折扣</th>
+        <th>使用条件</th>
         <th>面额</th>
         <!-- <th>使用状态</th> -->
         <th>叠加使用</th>
@@ -97,6 +99,8 @@
       <tr v-for="(item,index) in DataList" v-loading="loading">
         <td>{{item.couponsName}}</td>
         <td>{{item.couponCount}}</td>
+        <td>{{item.couponReceiveCount}}</td>
+        <td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
         <td>{{item.lineName}}</td>
         <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
         <td>{{item.useCondition}}</td>

src/components/activity/LuckyDraw.vue

@@ -62,6 +62,9 @@
     .LuckyDraw .ql-container{
       min-height: 100px;
     }
+    .LuckyDraw .avatar-uploader-icon{
+      height: auto
+    }
   </style>
 <template>
   <div class="flexOne LuckyDraw">

src/components/activity/awardList.vue

@@ -129,7 +129,7 @@ export default {
           rank:'',  
       },
      rules:{ 
-        awardName: [{ required: true, message: "请输入公司", trigger: "blur" }],
+        awardName: [{ required: true, message: "请输入奖项名称", trigger: "blur" }],
         awardType: [{ required: true, message: "请选择奖项类型", trigger: "change" }],
         awardRelationId: [{required: true, message: "请选择奖项关联", trigger: "change"}],
         awardCount: [{ required: true, message: "请输入奖项数量", trigger: "blur" }],