feat: 接口联调完成

config/env.config.js

@@ -2,15 +2,15 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 
 const envAPi = {
-  api: '//backstms-test4.liangkebang.net',
-  kdspOpApi: 'https://kdsp-operation-test4.liangkebang.net',
-  kdspApi: 'https://sc-op-api-test4.liangkebang.net',
-  goodsApi: 'https://sc-op-api-test4.liangkebang.net',
-  querysApi: 'https://sc-settlement-api-test4.liangkebang.net',
+  api: '//backstms-vcc3.liangkebang.net',
+  kdspOpApi: 'https://kdsp-operation-vcc3.liangkebang.net',
+  kdspApi: 'https://sc-op-api-vcc3.liangkebang.net',
+  goodsApi: 'https://sc-op-api-vcc3.liangkebang.net',
+  querysApi: 'https://sc-settlement-api-vcc3.liangkebang.net',
   // goodsApi: '//192.168.188.111:7000',
-  prologueDomain: 'https://mall-test4.liangkebang.net',
+  prologueDomain: 'https://mall-vcc3.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',
-  opapiHost: 'https://opapi-test4.liangkebang.net',
+  opapiHost: 'https://opapi-vcc3.liangkebang.net',
 };
 
 const prodApi = {

src/pages/password/index.jsx

 import React, { useRef, useState } from 'react';
-import { Form, Input, Button, Checkbox, Card } from 'antd';
+import { Form, Input, Button, Checkbox, Card, notification } from 'antd';
 import { history } from 'umi';
+import { da } from 'date-fns/locale';
 import styles from './style.less';
+import { passwordRule, resetPassword } from './service';
 
 const Password = props => {
   const formRef = useRef();
-  const onFinish = values => {
-    console.log('Success:', values);
-  };
-
-  const onFinishFailed = errorInfo => {
-    console.log('Failed:', errorInfo);
-  };
-
+  const [loading, setLoading] = useState(false);
   const goHome = () => {
     formRef.current.resetFields();
     history.push('/');
   };
+  const submit = async record => {
+    const data = await resetPassword({
+      password: record.password,
+      newPassword: record.newPassword,
+    });
+    if (data.code === 2000) {
+      notification.success({
+        message: '修改成功',
+      });
+      setTimeout(() => {
+        goHome();
+      }, 1000);
+      setLoading(false);
+    } else {
+      setLoading(false);
+      notification.error({
+        message: data.detail || data.msg,
+      });
+    }
+  };
+  const rule = async record => {
+    const data = await passwordRule({ password: record.newPassword });
+    if (data.code === 2000) {
+      submit(record);
+    } else {
+      setLoading(false);
+      notification.warning({
+        message: data.detail || data.msg,
+      });
+    }
+  };
+  const onFinish = values => {
+    setLoading(true);
+    rule(values);
+  };
   return (
     <div className={styles.div}>
       <Card className={styles.card}>
@@ -24,37 +54,36 @@ const Password = props => {
         <Form
           initialValues={{ remember: true }}
           onFinish={onFinish}
-          onFinishFailed={onFinishFailed}
           autoComplete="off"
           className={styles.form}
           ref={formRef}
         >
-          <Form.Item name="val" rules={[{ required: true, message: '请输入原密码!' }]}>
+          <Form.Item name="password" rules={[{ required: true, message: '请输入原密码!' }]}>
             <Input.Password placeholder="输入原密码" />
           </Form.Item>
           <Form.Item
-            name="loginpass"
+            name="newPassword"
             rules={[
               { required: true, message: '请输入新密码！' },
               {
                 message: '至少13最多18位且必须包含大小写字母、数字和特殊字符',
-                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&])[A-Za-z\d$@$!%*?&]{13,18}/,
+                pattern: /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{13,18}/,
               },
             ]}
           >
             <Input.Password placeholder="输入新密码" maxLength={18} />
           </Form.Item>
           <Form.Item
-            name="cfmloginpass"
+            name="newPasswordAgain"
             rules={[
               { required: true, message: '请输入新密码！' },
               {
                 message: '至少13位最多18位且必须包含大小写字母、数字和特殊字符',
-                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&])[A-Za-z\d$@$!%*?&]{13,18}/,
+                pattern: /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{13,18}/,
               },
               ({ getFieldValue }) => ({
-                validator(rule, value) {
-                  if (value && getFieldValue('loginpass') !== value) {
+                validator(val, value) {
+                  if (value && getFieldValue('newPassword') !== value) {
                     // eslint-disable-next-line prefer-promise-reject-errors
                     return Promise.reject('两次密码输入不一致');
                   }
@@ -66,7 +95,7 @@ const Password = props => {
             <Input.Password placeholder="输入新密码" maxLength={18} />
           </Form.Item>
           <Form.Item className={styles.btn}>
-            <Button type="primary" htmlType="submit">
+            <Button type="primary" htmlType="submit" loading={loading}>
               {' '}
               确认修改
             </Button>

src/pages/password/service.js

+import request from '@/utils/request';
+import config from '../../../config/env.config';
+
+const { kdspApi } = config;
+
+// 商户后台密码修改-校验
+export async function passwordRule(params) {
+  const data = await request.post('/admin/stms/user/ex/validate-password-rule', {
+    prefix: kdspApi,
+    data: params,
+  });
+  return data;
+}
+
+// 商户后台密码修改
+export async function resetPassword(params) {
+  const data = await request.post('/admin/stms/user/ex/supply/reset-password', {
+    prefix: kdspApi,
+    data: params,
+  });
+  return data;
+}

src/services/login.js

@@ -14,3 +14,15 @@ export async function getFakeCaptcha(mobile) {
 export async function getResFreshToen(token) {
   return request(`/oauth/refreshtoken?refreshtoken=${token}`);
 }
+// 商户后台密码修改-校验
+export async function passwordRule(params) {
+  return request.post('/user/ex/validate-password-rule', {
+    data: params,
+  });
+}
+
+// 商户后台密码修改
+export async function resetPassword(params) {
+  const data = await request.post('/user/ex/supply/reset-password', { data: params });
+  return data;
+}