diff --git a/src/components/form-item/main.js b/src/components/form-item/main.js index 6b74c980..f424f484 100644 --- a/src/components/form-item/main.js +++ b/src/components/form-item/main.js @@ -1,29 +1,24 @@ -import React from "react"; -import "./main.less"; +import React from "react" +import "./main.less" export default class filterSelect extends React.Component { static defaultProps = { required: "*" - }; + } constructor(props) { - super(props); + super(props) } render() { - const { labelname, prop, labelwidth, myClassName, id, required } = - this.props; + const { labelname, prop, labelwidth, myClassName, id, required, noLabel } = this.props return ( -
-
+
+
{labelname} - {required ? * : null} + {required ? * : null}
-
{this.props.children}
-
{this.props.expand}
+
{this.props.children}
+
{this.props.expand}
- ); + ) } } diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx index 68d13c0d..3f89e435 100644 --- a/src/components/knockGold/index.jsx +++ b/src/components/knockGold/index.jsx @@ -954,7 +954,7 @@ export default class addKnockGold extends Component { {/* 批量需改主体 */} {this.state.subjectList.length > 0 ? ( - + { return (
-
- +
+ 立减金平台批次号* */}
-
+
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js index 4a7d59c6..6db527ad 100644 --- a/src/pages/plan/add/edit.js +++ b/src/pages/plan/add/edit.js @@ -117,6 +117,7 @@ export default class add extends React.Component { res, (req, msg) => { try { + this.setState({ send_method: req.info.send_method }) //获取分销商 getReseller(req.info.reseller_id).then((res) => { handelResponse(res, (req, msg) => { @@ -173,6 +174,7 @@ export default class add extends React.Component { handelResponse( res, (req, msg) => { + this.setState({ send_method: req.info.send_method }) //获取分销商 getReseller(req.info.reseller_id).then((res) => { handelResponse(res, (req, msg) => { diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js index 84a37f51..25b45025 100644 --- a/src/pages/plan/add/step2.js +++ b/src/pages/plan/add/step2.js @@ -282,7 +282,7 @@ export default class acclist extends React.Component { submit() { let valide = false if (this.props.send_method == 2 && this.state.model.val && this.state.model.person.length < 1) { - Notify.error("请选择预警人") + Notify.error("请选择预警人3") return false } if (this.state.expiration_type == 2 && this.state.expiration_value.length < 1) { @@ -1314,7 +1314,6 @@ export default class acclist extends React.Component { - {this.state.isload && this.props.isSettlement === 1 ? ( ) : null} - {this.state.isload && this.props.isSettlement === 1 ? ( ) : null} - {this.state.isload ? ( ) : null} - - {this.props.send_method == 2 && this.state.isload ? ( + {this.state.isload && this.props.send_method == 2 ? ( <>
@@ -1499,7 +1495,6 @@ export default class acclist extends React.Component { ) : null} - 接口调取后有效期 - {this.state.model.expiration_type === "2" ? ( ) : null} - {this.state.model.expiration_type === "3" ? ( ) : null} - - {this.props.keyType === 1 ? ( <> @@ -1637,7 +1628,6 @@ export default class acclist extends React.Component { )} - - this.onLossChange(e)} value={this.state.model.allow_loss}> diff --git a/src/pages/plan/key/UseKeyAddEdit.jsx b/src/pages/plan/key/UseKeyAddEdit.jsx index 1be4b13c..ea72efe1 100644 --- a/src/pages/plan/key/UseKeyAddEdit.jsx +++ b/src/pages/plan/key/UseKeyAddEdit.jsx @@ -691,7 +691,7 @@ const UseKeyAddEdit = () => { // 商品弹窗提交 const exchangeCouponBtnPop = () => { if (model.val && model.person.length < 1) { - Notify.error("请选择预警人") + Notify.error("请选择预警人1") return false } // 优惠券数据 @@ -849,7 +849,7 @@ const UseKeyAddEdit = () => { // 提交审核按钮 const examineBtn = () => { if (model.val && model.person.length < 1) { - Notify.error("请选择预警人") + Notify.error("请选择预警人2") return false }