Commit ece073bf by 陈羽

Merge branch 'feature/弹窗推广' of http://git.gicdev.com/marketing-web/marketing into dev

parents e088c9af d740f0d3
......@@ -109,7 +109,7 @@
</div>
</div>
<el-form-item label="定向人群:" :prop="`popupMemberGroupList_${elIndex}`">
<vue-gic-member-group :defaltSelected="pop.popupMemberGroupList" :projectName="projectName" :headerList="headerList" :readonly="pop.activeStatus == 2" @handleDataTransferred="data => handleDataTransferred(data, elIndex)" @handleDataLeft="(selectedData, selectionToRemove) => handleDataLeft(selectedData, selectionToRemove, elIndex)"></vue-gic-member-group>
<vue-gic-member-group :max-limit="10" :defaltSelected="pop.popupMemberGroupList" :projectName="projectName" :headerList="headerList" :readonly="pop.activeStatus == 2" @handleDataTransferred="data => handleDataTransferred(data, elIndex)" @handleDataLeft="(selectedData, selectionToRemove) => handleDataLeft(selectedData, selectionToRemove, elIndex)"></vue-gic-member-group>
</el-form-item>
<div class="sort">
<el-popover placement="bottom" width="400" trigger="click" popper-class="pop_sort_popover" :disabled="pop.activeStatus == 2">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment