diff --git a/src/components/combining/index.jsx b/src/components/combining/index.jsx index a1cd5074..ea0ccb86 100644 --- a/src/components/combining/index.jsx +++ b/src/components/combining/index.jsx @@ -216,6 +216,10 @@ const Combining = forwardRef((props, ref) => { instructionType: Number(group_info.instructionType) || 1, code_name: title, date_time: [begin_time, end_time], + period_type: String(propsData.period_type) || '1', + // period_num: propsData.period_num || 1, + period_day: propsData.period_day || '', + period_fixed_receive_time: propsData.period_fixed_receive_time || '', channel, receive_mode: Number(receive_mode), instruction, @@ -229,10 +233,6 @@ const Combining = forwardRef((props, ref) => { } ] : [], - period_type: String(group_info.period_type) || '1', - // period_num: group_info.period_num || 1, - period_day: group_info.period_day || '', - period_fixed_receive_time: group_info.period_fixed_receive_time || '', timer: [time_limit.receive_time.start_time, time_limit.receive_time.end_time] }) sessionStorage.setItem("knockGoldData", JSON.stringify(propsData.product.reduce)) @@ -247,6 +247,10 @@ const Combining = forwardRef((props, ref) => { quantity: info.quantity, restrict: 1, recharge_type: 2, + period_type: String(info.period_type) || '1', + // period_num: info.period_num || 1, + period_day: info.period_day || '', + period_fixed_receive_time: info.period_fixed_receive_time || '', group_info: { type: 2, is_webview: info.is_webview, @@ -257,10 +261,10 @@ const Combining = forwardRef((props, ref) => { instruction: info.instruction, receive_mode: info.receive_mode, channel: info.channel, - period_type: String(info.period_type) || '1', + // period_type: String(info.period_type) || '1', // period_num: info.period_num || 1, - period_day: info.period_day || '', - period_fixed_receive_time: info.period_fixed_receive_time || '', + // period_day: info.period_day || '', + // period_fixed_receive_time: info.period_fixed_receive_time || '', time_limit: { timer_show: info.timer_show, effect_time: { diff --git a/src/pages/exchangecode/combiningAdd/index.jsx b/src/pages/exchangecode/combiningAdd/index.jsx index cad60820..8ecb0036 100644 --- a/src/pages/exchangecode/combiningAdd/index.jsx +++ b/src/pages/exchangecode/combiningAdd/index.jsx @@ -423,6 +423,9 @@ export default class combiningAdd extends React.Component { range: range, recharge_type: 2, restrict: 1, + period_type: String(codeInfo.period_type) || '1', + period_day: codeInfo.period_day || '', + period_fixed_receive_time: codeInfo.period_fixed_receive_time || '', group_info: { type: 2, is_webview: codeInfo.is_webview, @@ -433,9 +436,9 @@ export default class combiningAdd extends React.Component { instruction: codeInfo.instruction, receive_mode: codeInfo.receive_mode, channel: codeInfo.channel, - period_type: String(codeInfo.period_type) || '1', - period_day: codeInfo.period_day || '', - period_fixed_receive_time: codeInfo.period_fixed_receive_time || '', + // period_type: String(codeInfo.period_type) || '1', + // period_day: codeInfo.period_day || '', + // period_fixed_receive_time: codeInfo.period_fixed_receive_time || '', time_limit: { timer_show: codeInfo.timer_show, effect_time: { @@ -485,9 +488,9 @@ export default class combiningAdd extends React.Component { type: 2, is_webview: codeInfo.is_webview, quantity: codeInfo.quantity, - period_type: String(codeInfo.period_type) || '1', - period_day: codeInfo.period_day || '', - period_fixed_receive_time: codeInfo.period_fixed_receive_time || '', + // period_type: String(codeInfo.period_type) || '1', + // period_day: codeInfo.period_day || '', + // period_fixed_receive_time: codeInfo.period_fixed_receive_time || '', instructionType: codeInfo.instructionType, group_cover: "", group_image: codeInfo.group_image[0] ? codeInfo.group_image[0].src : "", @@ -610,6 +613,11 @@ export default class combiningAdd extends React.Component { return false } + if(this.state.codeInfo.period_type == "2" && !this.state.codeInfo.period_fixed_receive_time) { + Notify.error("请输入周期规则时间") + return + } + /* 编辑状态 */ if (this.state.isState === 2) { if (this.state.uploading) {