Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

# Conflicts:
#	dist/css/chunk-17d6333f.1386eb38.css
#	dist/index.html
#	dist/js/app.5983b027.js
#	dist/js/app.98e2a87b.js
#	dist/js/app.ef5d6061.js
#	dist/js/chunk-16f87b92.a5367d11.js
#	dist/js/chunk-2e6464ca.514f74a5.js
#	dist/js/chunk-5866ea6d.ad55dcb2.js
#	dist/js/chunk-9296abfa.7015f53c.js

dist/css/card-package.2db45bda.css → dist/css/card-package.7a79b96b.css

-.ml40[data-v-4e6a2810]{margin-left:40px}.filter-block[data-v-4e6a2810]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4e6a2810]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4e6a2810]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4e6a2810]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4e6a2810]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-13c6476e]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-13c6476e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
+.ml40[data-v-4e6a2810]{margin-left:40px}.filter-block[data-v-4e6a2810]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4e6a2810]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4e6a2810]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4e6a2810]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4e6a2810]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-328ceb6e]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-328ceb6e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file

public/index.html

@@ -48,7 +48,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
     <script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
     <script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.11.js"></script><!-- 输入框 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.7.js"></script><!-- 福利选择器 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.11.js"></script><!-- 福利选择器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
     <script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
   </body>

src/views/card/card-package/form.vue

@@ -37,7 +37,7 @@
         <el-tooltip content="若添加的卡券为固定有效期，仅允许添加和有效期限时间重合的卡券" placement="bottom" slot="label" open-delay="200">
           <span class="tooltip-icon">添加卡券</span>
         </el-tooltip>
-        <el-button class="dashed" :disabled="couponList.length > 10" @click="showSelector = true">添加卡券 {{ couponList.length }}/{{ 10 }}</el-button>
+        <el-button class="dashed" :disabled="couponList.length >= 10" @click="showSelector = true">添加卡券 {{ couponList.length }}/{{ 10 }}</el-button>
         <div class="imitation-table mt20" v-if="couponList.length" style="width:100%;" v-loading="cardLoading">
           <el-row class="thead">
             <el-col :span="5">卡券名称</el-col>