Merge branch 'feature/卡券、智能营销商品选择器调整'

index.html

@@ -34,7 +34,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js"></script><!-- 数据导出 -->
     <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
-    <script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.27.js"></script>
+    <script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.29.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.3.js"></script><!-- 数据对话 -->

src/views/ecm/form.vue

@@ -528,7 +528,7 @@
 
     <!-- 消费商品dialog -->
     <el-dialog title="适用商品" :visible.sync="xxSysp.visible" width="690px">
-      <vue-gic-goods-selector ref="selector" :projectName="projectName"></vue-gic-goods-selector>
+      <vue-gic-goods-selector ref="selector" :projectName="projectName" isCoupon></vue-gic-goods-selector>
       <div slot="footer" class="dialog-footer">
         <el-button @click="xxSysp.visible = false">{{ !isAdd ? '关闭' : '取消' }}</el-button>
         <el-button v-if="isAdd" type="primary" @click="xxSyspConfirm">确定</el-button>