|
|
@@ -160,7 +160,7 @@
|
|
|
top="10vh"
|
|
|
:close-on-click-modal="false" @before-close="closeModal" @close="closeModal"
|
|
|
>
|
|
|
- <CommAdd ref="child" :voucherList="voucherList" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm" />
|
|
|
+ <CommAdd ref="child" :voucher-list="voucherList" :show-tinymce="showTinymce" :product-id="commId" @cancel="cancelForm" />
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -230,9 +230,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- created () {
|
|
|
- getVoucher().then(res => { // 获取可选的代金卷，用于创建和修改商品时定义代金卷的使用规则
|
|
|
+ created() {
|
|
|
+ getVoucher().then((res) => { // 获取可选的代金卷，用于创建和修改商品时定义代金卷的使用规则
|
|
|
this.voucherList = res.data
|
|
|
+ this.voucherList.push({
|
|
|
+ voucherName: '不使用代金卷',
|
|
|
+ updateTime: '123123123123',
|
|
|
+ ratio: 'xxx',
|
|
|
+ enabled: '666',
|
|
|
+ id: '0',
|
|
|
+ desc: '不支持代金卷'
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
mounted() {
|
zweiqin