Merge branch 'feature/7月迭代' into dev

src/components/active-config/base-config.vue

@@ -46,7 +46,15 @@ import baseConfig from '@/components/active-config/base-config.vue';
         v-if="$route.query.activityId && activeInfoData.cardCoupName"
         label="卡券："
         prop="cardCoupName"
-      >{{activeInfoData.cardCoupName}} </el-form-item>
+      >
+      {{activeInfoData.cardCoupName}}
+      <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus!=null">
+      {{statusText[activeInfoData.cardCoupStatus]}}
+      </el-tag>
+       <el-tag size="mini" style="margin-left:5px;" type="danger" v-if="activeInfoData.cardCoupStatus==null&&activeInfoData.cardCoupStock==0">
+       库存不足
+      </el-tag>
+       </el-form-item>
       <el-form-item
         label="活动名称："
         prop="activityName"
@@ -162,6 +170,11 @@ export default {
     };
     return {
       loading: false,
+      statusText: {
+        0: '正常',
+        1: '删除',
+        2: '已过期'
+      },
       activeInfoData: {
         activityId: '',
         parentGoalId: '',