diff --git a/src/components/combining/index.jsx b/src/components/combining/index.jsx index eea33c6c..6b16c49f 100644 --- a/src/components/combining/index.jsx +++ b/src/components/combining/index.jsx @@ -77,7 +77,8 @@ const Combining = forwardRef((props, ref) => { timer: [], group_cover: "", group_image: [], - instructionType: 1 + instructionType: 1, + is_webview: 0 } } @@ -199,9 +200,10 @@ const Combining = forwardRef((props, ref) => { }) const { quantity, group_info, title, begin_time, end_time } = propsData - const { channel, receive_mode, instruction, group_image, time_limit } = group_info + const { channel, receive_mode, instruction, group_image, time_limit, is_webview } = group_info setInfo({ quantity, + is_webview: Number(is_webview), instructionType: Number(group_info.instructionType) || 1, code_name: title, date_time: [begin_time, end_time], @@ -234,6 +236,7 @@ const Combining = forwardRef((props, ref) => { recharge_type: 2, group_info: { type: 2, + is_webview: info.is_webview, instructionType: info.instructionType, quantity: info.quantity, group_cover: "", @@ -444,6 +447,19 @@ const Combining = forwardRef((props, ref) => { + {info.channel == 2 ? ( + + { + setInfo({ is_webview: target.value }) + }} + value={info.is_webview} + > + 小程序 + 公众号 + + + ) : null} {info.channel == 1 ? ( - {this.state.model.channel == 2 ? ( + {this.state.model.channel == 2 && !this.props.combining ? ( { diff --git a/src/pages/exchangecode/combiningAdd/index.jsx b/src/pages/exchangecode/combiningAdd/index.jsx index 4d80ebb0..adaae0a2 100644 --- a/src/pages/exchangecode/combiningAdd/index.jsx +++ b/src/pages/exchangecode/combiningAdd/index.jsx @@ -143,11 +143,12 @@ export default class combiningAdd extends React.Component { let reqCopy = cloneDeep(req) this.codeStatus = req.status const resData = this.transFormData(reqCopy.goods) - const { channel, receive_mode, instruction, group_image, time_limit } = + const { channel, receive_mode, instruction, group_image, time_limit, is_webview } = reqCopy.group_info reqCopy.goods = resData let codeInfo = { code_name: reqCopy.title, + is_webview: Number(is_webview), issued: reqCopy.quantity, instructionType: Number(reqCopy.group_info.instructionType) || 1, stock: reqCopy.stock, @@ -423,6 +424,7 @@ export default class combiningAdd extends React.Component { restrict: 1, group_info: { type: 2, + is_webview: codeInfo.is_webview, quantity: codeInfo.quantity, instructionType: codeInfo.instructionType, group_cover: "", @@ -473,6 +475,7 @@ export default class combiningAdd extends React.Component { recharge_type: 2, group_info: { type: 2, + is_webview: codeInfo.is_webview, quantity: codeInfo.quantity, instructionType: codeInfo.instructionType, group_cover: "", @@ -1058,6 +1061,19 @@ export default class combiningAdd extends React.Component { + {this.state.codeInfo.channel == 2 ? ( + + { + this.handleChange(target.value, "is_webview") + }} + value={this.state.codeInfo.is_webview} + > + 小程序 + 公众号 + + + ) : null} {this.state.codeInfo.channel == 1 ? ( { timer_type: 1, channel: "1", receive_mode: 1, - instructionType: 1 + instructionType: 1, + is_webview: 0 }, isload: false, tempdata: [],