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

# Conflicts:
#	src/views/card/partials/status-render.js

src/views/card/form.vue

@@ -80,6 +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>
+        <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>

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

@@ -15,6 +15,8 @@ export default Vue.component('render-temp', {
     const showPutonBtn = this.item.showPutonBtn || false;
     // 是否有商场抵金券的创建权限 true：有权限 false：无权限
     const hasCouponCreate = this.$store.getters.getLimitCodeList.every(el => el != 'couponCreate');
+    // 是否是商场类商户
+    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);
@@ -36,7 +38,7 @@ export default Vue.component('render-temp', {
       </a>
     );
     const bind3 =
-      $getButtonLimit($buttonCode.marketingEditCard) && !isWeimo && !isApiCreate && (isCommon ? hasCouponCreate : true) ? (
+      $getButtonLimit($buttonCode.marketingEditCard) && !isWeimo && !isApiCreate && (this.item.cardType == 3 && hasStoreCardAuth ? hasCouponCreate : true) ? (
         <a title="编辑" limit-code={$buttonCode.marketingEditCard} onClick={this.handler.bind(null, 3)}>
           <i class="el-icon-edit" />
         </a>
@@ -44,7 +46,7 @@ export default Vue.component('render-temp', {
         ''
       );
     const bind4 =
-      $getButtonLimit($buttonCode.marketingDelCard) && canEdit && !isWeimo && (isCommon ? hasCouponCreate : true) ? (
+      $getButtonLimit($buttonCode.marketingDelCard) && canEdit && !isWeimo && (this.item.cardType == 3 && hasStoreCardAuth ? hasCouponCreate : true) ? (
         <a title="删除" limit-code={$buttonCode.marketingDelCard} onClick={this.handler.bind(null, 4)}>
           <i class="el-icon-delete" />
         </a>
@@ -57,7 +59,7 @@ export default Vue.component('render-temp', {
       </a>
     );
     const bind6 =
-      $getButtonLimit($buttonCode.marketingCopyCard) && canEdit && !isApiCreate && !isWeimo && (isCommon ? hasCouponCreate : true) ? (
+      $getButtonLimit($buttonCode.marketingCopyCard) && canEdit && !isApiCreate && !isWeimo && (this.item.cardType == 3 && hasStoreCardAuth ? hasCouponCreate : true) ? (
         <a title="复制" limit-code={$buttonCode.marketingCopyCard} onClick={this.handler.bind(null, 6)}>
           <i class="iconfont icon-wxcard-copy" />
         </a>