✨ feat: 新增自定义计划id、立减金核销通知功能

scripts/test.js

@@ -1,17 +1,17 @@
 // Do this as the first thing so that any code reading it knows the right env.
 // 测试
-// process.env.BABEL_ENV = "test"
-// process.env.NODE_ENV = "test"
-// process.env.BASE_URL = "http://test.marketapi.1688sup.com"
-// process.env.UNIFIED_API = "http://api.test.user.1688sup.com/v1"
-// process.env.UNIFIED_URL = "http://test.user.1688sup.com/#/login"
-
-// 镜像
 process.env.BABEL_ENV = "test"
 process.env.NODE_ENV = "test"
-process.env.BASE_URL = "http://pre.marketapi.1688sup.com"
+process.env.BASE_URL = "http://test.marketapi.1688sup.com"
-process.env.UNIFIED_API = "http://api.gray.user.1688sup.com/v1"
+process.env.UNIFIED_API = "http://api.test.user.1688sup.com/v1"
-process.env.UNIFIED_URL = "http://gray.user.1688sup.com/#/login"
+process.env.UNIFIED_URL = "http://test.user.1688sup.com/#/login"
+
+// 镜像
+// process.env.BABEL_ENV = "test"
+// process.env.NODE_ENV = "test"
+// process.env.BASE_URL = "http://pre.marketapi.1688sup.com"
+// process.env.UNIFIED_API = "http://api.gray.user.1688sup.com/v1"
+// process.env.UNIFIED_URL = "http://gray.user.1688sup.com/#/login"
 
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will

src/pages/distributor/merchant/index.jsx

@@ -261,6 +261,7 @@ export default function Merchant() {
                 }
               >
                 <Checkbox value={"KEY.USED"}>key码核销通知</Checkbox>
+                <Checkbox value={"VOUCHER.USED"}>立减金核销通知</Checkbox>
               </Checkbox.Group>
             </FormItem>
           </Form>

src/pages/plan/add/edit.js

@@ -40,7 +40,6 @@ export default class add extends React.Component {
         { id: 3, title: "落地页", child: [{ step: 1, title: "绑定落地页" }] }
       ],
       phone_list: [],
-
       email_list: [],
       phone: "",
       email: "",

src/pages/plan/add/step1.js

@@ -26,6 +26,7 @@ export default class accList extends React.Component {
         reseller: null,
         return_id: "1",
         date_time: ["", ""],
+        stock_id: null,
         settlement_type: null
       },
       settlementOptions: [],
@@ -80,6 +81,7 @@ export default class accList extends React.Component {
     model.title = data.title
     model.type = parseInt(data.type)
     model.return_id = data.return_type
+    model.stock_id = data.stock_id
 
     model.reseller = {
       key: data.reseller_id,
@@ -117,10 +119,15 @@ export default class accList extends React.Component {
     if (this.refs.form1.validator()) {
       if (this.state.model.date_time[1] == "") {
         Notify.error("结束日期不能为空")
-        return
+        return false
+      }
+      if (this.state.model.stock_id && !/^\d+$/.test(this.state.model.stock_id)) {
+        Notify.error("请输入有纯数字组成的计划编号")
+        return false
       }
       let data = {}
       data.title = this.state.model.title
+      data.stock_id = this.state.model.stock_id
       data.type = parseInt(this.state.model.type)
       data.return_type = 1
       data.reseller_id = this.state.model.reseller.key
@@ -298,6 +305,29 @@ export default class accList extends React.Component {
               alignment={"left"}
             />
           </FormItem>
+          <FormItem labelname="营销计划编号" prop="stock_id" id="stock_id" required="">
+            <Ipt
+              disabled={this.props.disabled}
+              onChange={(e) => {
+                let model2 = this.state.model
+                model2.stock_id = e
+                this.setState({ model: model2 })
+              }}
+              onClearItem={(e) => {
+                let model2 = this.state.model
+                model2.stock_id = ""
+                this.setState({ model: model2 })
+              }}
+              value={this.state.model.stock_id}
+              countShow={false}
+              placeholder={"请输入"}
+              labelWidth={"0px"}
+              maxLength={12}
+              height={"36px"}
+              width={"520px"}
+              alignment={"left"}
+            />
+          </FormItem>
 
           <FormItem labelname="计划类型" prop="type" id="type">
             <RadioGroup