Merge branch 'bugfix/卡券包权限bug' into dev

* bugfix/卡券包权限bug:
  卡包权限bug修复
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist

# Conflicts:
#	dist/index.html
#	dist/static/css/main.27160a7cf2dfb558bf481ec7d5fce909.css
#	dist/static/css/main.289ef9a92921ef08c9e9bf202ec39a21.css
#	dist/static/css/main.d71c2df8acf2b8c992246ba3b3e4b7b8.css
#	dist/static/js/ecm.09c6c06cb3314d6adea6.js
#	dist/static/js/ecm.763c5b056cf0a48875b2.js
#	dist/static/js/ecm.7d4fb175ac675c5a5d74.js
#	dist/static/js/ewash.1ff85c307f9e68524f34.js
#	dist/static/js/ewash.9359f90f8ce4a9d9d8bf.js
#	dist/static/js/ewash.feb0ffd2cfb795f0d746.js
#	dist/static/js/scan.0ddf1cf110c21976bb32.js
#	dist/static/js/scan.952dd795058a8320af99.js
#	dist/static/js/scan.cc6d123e6bb64892a5b5.js
#	dist/static/js/signIn.84b91fefa20d9462504c.js

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

@@ -36,7 +36,7 @@ export default Vue.component('render-temp', {
       </a>
     );
     const bind3 =
-      $getButtonLimit($buttonCode.marketingEditCard) && !isWeimo && !isCommon && !isApiCreate && hasCouponCreate ? (
+      $getButtonLimit($buttonCode.marketingEditCard) && !isWeimo && !isApiCreate && (isCommon ? hasCouponCreate : true) ? (
         <a title="编辑" limit-code={$buttonCode.marketingEditCard} onClick={this.handler.bind(null, 3)}>
           <i class="el-icon-edit" />
         </a>
@@ -44,7 +44,7 @@ export default Vue.component('render-temp', {
         ''
       );
     const bind4 =
-      $getButtonLimit($buttonCode.marketingDelCard) && canEdit && !isWeimo && !isCommon ? (
+      $getButtonLimit($buttonCode.marketingDelCard) && canEdit && !isWeimo && (isCommon ? hasCouponCreate : true) ? (
         <a title="删除" limit-code={$buttonCode.marketingDelCard} onClick={this.handler.bind(null, 4)}>
           <i class="el-icon-delete" />
         </a>
@@ -57,7 +57,7 @@ export default Vue.component('render-temp', {
       </a>
     );
     const bind6 =
-      $getButtonLimit($buttonCode.marketingCopyCard) && canEdit && !isApiCreate && !isWeimo && !isCommon && hasCouponCreate ? (
+      $getButtonLimit($buttonCode.marketingCopyCard) && canEdit && !isApiCreate && !isWeimo && (isCommon ? hasCouponCreate : true) ? (
         <a title="复制" limit-code={$buttonCode.marketingCopyCard} onClick={this.handler.bind(null, 6)}>
           <i class="iconfont icon-wxcard-copy" />
         </a>