diff --git a/src/components/combining/index.jsx b/src/components/combining/index.jsx index 5c2abf0c..e47cdec2 100644 --- a/src/components/combining/index.jsx +++ b/src/components/combining/index.jsx @@ -202,7 +202,7 @@ const Combining = forwardRef((props, ref) => { setInfo({ quantity, is_webview: Number(is_webview) || 0, - timer_show: Number(timer_show) || 1, + timer_show: timer_show == 0 ? 0 : 1, instructionType: Number(group_info.instructionType) || 1, code_name: title, date_time: [begin_time, end_time], diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx index fa43c7ee..787702ef 100644 --- a/src/components/knockGold/index.jsx +++ b/src/components/knockGold/index.jsx @@ -128,6 +128,7 @@ export default class addKnockGold extends Component { let model = this.state.model model.entry_time[0] = this.props.data.time_limit.effect_time.start_time model.entry_time[1] = this.props.data.time_limit.effect_time.end_time + model.timer_show = this.props.data.time_limit.timer_show == 0 ? 0 : 1 model.instruction = this.props.data.instruction model.fixed_time[0] = this.props.data.time_limit.use_time.fiexd_time?.start_time @@ -204,7 +205,6 @@ export default class addKnockGold extends Component { } model.weight = String(this.props.data.weight) model.is_webview = Number(this.props.data.is_webview) || 0 - model.timer_show = Number(this.props.data.timer_show) || 1 model.early_per = this.props.data.early_per.map((item) => String(item)) model.channel = String(this.props.data.channel) model.natural_limit = String(this.props.data.natural_limit) @@ -505,7 +505,6 @@ export default class addKnockGold extends Component { mobile: key })) transformData.is_webview = this.state.model.is_webview - transformData.timer_show = this.state.model.timer_show transformData.weight = this.state.model.weight transformData.receive_conf = { type: this.state.model.receive_type, @@ -517,6 +516,8 @@ export default class addKnockGold extends Component { end_time: this.state.model.entry_time[1] }, + timer_show: this.state.model.timer_show, + receive_time: { start_time: this.state.model.timer[0], end_time: this.state.model.timer[1] diff --git a/src/pages/exchangecode/combiningAdd/index.jsx b/src/pages/exchangecode/combiningAdd/index.jsx index 5a124c2d..a73d73bc 100644 --- a/src/pages/exchangecode/combiningAdd/index.jsx +++ b/src/pages/exchangecode/combiningAdd/index.jsx @@ -149,7 +149,7 @@ export default class combiningAdd extends React.Component { let codeInfo = { code_name: reqCopy.title, is_webview: Number(is_webview) || 0, - timer_show: Number(timer_show) || 1, + timer_show: timer_show == 0 ? 0 : 1, issued: reqCopy.quantity, instructionType: Number(reqCopy.group_info.instructionType) || 1, stock: reqCopy.stock,