Merge branch 'feature/8月-奥莱定制' into dev

src/views/card/form.vue

@@ -80,7 +80,7 @@
 
       <el-form-item v-if="form.cardType == 3" label="卡券成本比例">
         <el-switch v-model="form.costValueProportionFlag" :active-value="1" :inactive-value="0" :disabled="isEdit || isInfo"></el-switch>
-        <el-alert class="cost-tip" type="info" show-icon :closable="false" title="成本比例以商户维度设置"></el-alert>
+        <span class="gray fz13">* 成本比例以商户维度设置</span>
         <div class="cost-box" v-if="form.costValueProportionFlag == 1">
           <div class="cost-box-type">
             <span class="cost-box-type-label">成本费用</span>
@@ -515,14 +515,6 @@ export default cardForm;
     line-height: 30px;
   }
 }
-.cost-tip {
-  display: inline-flex;
-  padding-top: 0;
-  padding-bottom: 0;
-  vertical-align: middle;
-  width: 300px;
-  background: transparent;
-}
 .cost-box {
   margin-top: 10px;
   width: 701px;

src/views/card/partials/status-render.js

@@ -16,7 +16,7 @@ export default Vue.component('render-temp', {
     // 是否有商场抵金券的创建权限 true：有权限 false：无权限
     const hasCouponCreate = this.$store.getters.getLimitCodeList.every(el => el != 'couponCreate');
     // 是否是商场类商户
-    const hasStoreCardAuth = this.$store.getters.storeCardAuth;
+    const hasStoreCardAuth = this.$store.getters.getStoreCardAuth;
     // 当前卡券是否 是长期有效||在投放有效期内
     // putEffectiveMode 0：固定日期，1：长期
     const canGroupSend = this.item.putEffectiveMode == 1 ? true : new Date() > new Date(this.item.putBeginDate) && new Date() < new Date(this.item.putEndDate);