@@ -9,15 +9,12 @@
<el-tabs v-model="activeName">
<el-tab-pane label="实时发放" name="realTime" :key="'info'">
<child1></child1>
-
</el-tab-pane>
<el-tab-pane label="按发放方式" name="issue" :key="'issue'">
<child2></child2>
<el-tab-pane label="按优惠券类" name="model" :key="'pay'">
<child3></child3>
</el-tabs>
</div>
@@ -189,7 +189,7 @@
<el-form-item
prop="isMarket"
- label="是否叠加营销方案"
+ label="是否叠加优惠方案"
:required="settingForm.cardEnabledFlag == 1"
>
<el-radio-group v-model="settingForm.isMarket">