diff --git a/src/pages/exchangecode/exchangecodeAdd/index.jsx b/src/pages/exchangecode/exchangecodeAdd/index.jsx index 3f67d0e2..c433eb41 100644 --- a/src/pages/exchangecode/exchangecodeAdd/index.jsx +++ b/src/pages/exchangecode/exchangecodeAdd/index.jsx @@ -324,6 +324,22 @@ export default class exchangeAdd extends React.Component { } } + /* 获取直连天下商品数据 */ + getProductInfoSelectData(reseller_id) { + return new Promise((resolve, reject) => { + let param = { + reseller_id: reseller_id + } + getProductInfoSelect(param).then((res) => { + if (res.code === 200) { + resolve(res.data.data) + } else { + reject([]) + } + }) + }) + } + // 立减金 加款后 商品范围列表数据进行变动 getTableList() { if (sessionStorage.getItem("addMoneyData")) { @@ -929,7 +945,8 @@ export default class exchangeAdd extends React.Component { } onDisabledTime = (date) => { - const min = new Date() + let step1 = JSON.parse(sessionStorage.getItem("knockGold_effectDate")) + const min = new Date(step1.begin_time) const hour = min.getHours() const minute = min.getMinutes() const second = min.getSeconds() @@ -1004,22 +1021,6 @@ export default class exchangeAdd extends React.Component { }) } - // 获取直连天下商品数据 - getProductInfoSelectData(reseller_id) { - return new Promise((resolve, reject) => { - let param = { - reseller_id: reseller_id - } - getProductInfoSelect(param).then((res) => { - if (res.code === 200) { - resolve(res.data.data) - } else { - reject([]) - } - }) - }) - } - /* 商品范围列表编辑 */ productEditShow(rowData) { if (this.state.direct_reseller_id > 0) { diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js index bcfdf969..55d98d62 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/bottomBar.js @@ -1,10 +1,13 @@ import React from 'react'; -import { ColorPicker, Notify, RadioGroup, RadioButton } from 'zent'; +import { ColorPicker, Notify, RadioGroup, RadioButton, Switch, ImageUpload } from 'zent'; import "@/assets/comm.css" import Form from "@/components/form/main" import FormItem from "@/components/form-item/main" import { uploadImg, handelResponse } from "@/assets/api.js" import Ipt from "@/components/input/main" +import '@/assets/comm.css' +import './comm.less' + export default class edittemplate extends React.Component { constructor(props) { super(props) @@ -12,9 +15,10 @@ export default class edittemplate extends React.Component { model: { top_image: "", list: "2", - font_color: "#f1f2f3", + font_color: "#000000", button_color: "#FACD6A", - describe: { type: "", content: "", bg_image: '' } + describe: { type: "", content: "", bg_image: '' }, + checkedLarge: false } } } @@ -63,12 +67,8 @@ export default class edittemplate extends React.Component { } }; - //悬浮富文本 - getsusEditext(c) { - let model1 = this.state.model; - model1.describe.content = c; - this.setState({ model: model1 }); - this.props.seteditorHtml(c); + handleChangeLarge = checked => { + this.setState({ checkedLarge: checked }); } //富文本 getEditext(c) { @@ -196,7 +196,7 @@ export default class edittemplate extends React.Component { } render() { return ( -