Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx

@@ -414,15 +414,46 @@ function CreditScoreMgm() {
       if (e.status == 20000) {
         setPayVisible(true)
         setPayData(e.data)
+      }else {
+        message.error(e.message)
       }
     })
   };
+  function flatten(arr) {
+    while (arr.some(i => Array.isArray(i))) {
+      arr = [].concat(...arr);
+    }
+    return arr;
+  }
   // 充值规则配置修改
   const getRechargeRulesUpdate = (e) => {
+    let flag = []
+    let arr = []
+    e.list.map((item) => {
+      if (item.recharge == null || item.recharge == '') {
+        flag.push(false)
+      } else {
+        arr.push(item.recharge)
+        item.children.map((res) => {
+          if (res.couponId == null || res.couponId == '' || res.num == null || res.num == '') {
+            flag.push(false)
+          }
+        })
+      }
+    })
+    if (flatten(flag).some(ele => ele === false)) {
+      message.error("请填写完整！")
+      return
+    }
+    if (arr.length != [...new Set(arr)].length) {
+      message.error("每个规则对应的充值金额不能相同，请修改")
+      return
+    }
     ajax.getRechargeRulesUpdate(e).then((e) => {
       if (e.status == 20000) {
         message.success(e.message)
-        return 1
+        setPayVisible(false);
+        //return 1
       }
     })
   };
@@ -432,6 +463,8 @@ function CreditScoreMgm() {
       if (e.status == 20000) {
         message.success(e.message)
         return 1
+      }else {
+        message.error(e.message)
       }
     })
   };
@@ -904,7 +937,7 @@ function CreditScoreMgm() {
                 onChange={(e) => {
                   let arr = payData
                   arr.content = e.target.value
-                  setFlag(flag+1)
+                  setFlag(flag + 1)
                   setPayData(arr)
                 }} />
             </div>