message-verify 1.0.1-beta.13 → 1.0.1-beta.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/main.js +7 -3
  2. package/dist/verify-modal.js +13 -7
  3. package/package.json +1 -1
  4. package/src/main.tsx +7 -3
  5. package/src/verify-modal.tsx +13 -7
package/dist/main.js CHANGED
@@ -11,6 +11,12 @@ const config = {
11
11
  "forcedJSONParsing": true,
12
12
  "clarifyTimeoutError": false
13
13
  },
14
+ // "transformRequest": [
15
+ // null
16
+ // ],
17
+ // "transformResponse": [
18
+ // null
19
+ // ],
14
20
  "timeout": 0,
15
21
  "xsrfCookieName": "XSRF-TOKEN",
16
22
  "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -19,9 +25,7 @@ const config = {
19
25
  "headers": {
20
26
  "Accept": "application/json, text/plain, */*",
21
27
  "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
22
- "Content-Type": "application/json",
23
- "sms-code": "121212",
24
- "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
28
+ "Content-Type": "application/json"
25
29
  },
26
30
  "url": "/classification/admin/level/edit",
27
31
  "method": "post",
package/dist/verify-modal.js CHANGED
@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
11
11
  const [captchaImage, setCaptchaImage] = useState('');
12
12
  const [captchCode, setCaptchCode] = useState('');
13
13
  const [captchaKey, setCaptchaKey] = useState('');
14
- const { data, http, lang, api = '/admin/sms/send', response } = props || {};
14
+ const { data, http, lang, api = '/admin/sms/send', config, response } = props || {};
15
15
  const dataObj = JSON.parse(data || '{}');
16
16
  const { mobile, verifyCodeKey } = dataObj || {};
17
17
  const getKey = async () => {
@@ -58,7 +58,9 @@ const CreateMessageVerifyModal = ({ props }) => {
58
58
  return;
59
59
  }
60
60
  message.success(t('sendSuccess', lang));
61
+ // 重置倒计时、验证码
61
62
  setCountdown(60);
63
+ setOtp('');
62
64
  };
63
65
  return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
64
66
  setVisible(false);
@@ -67,23 +69,27 @@ const CreateMessageVerifyModal = ({ props }) => {
67
69
  setOtp(val);
68
70
  if (val.length === 6) {
69
71
  try {
70
- const res = await axios({
71
- ...response?.config,
72
+ const res = await http({
73
+ ...config,
72
74
  headers: {
73
- ...axios.defaults.headers.common,
75
+ ...http.defaults.headers.common,
74
76
  'sms-code': val,
75
77
  'sms-code-key': verifyCodeKey,
76
- 'Content-Type': response?.config.headers['Content-Type'],
78
+ 'Content-Type': config.headers['Content-Type'],
77
79
  }
78
80
  });
79
- console.log('res', res);
80
- const { code, detail } = response?.data?.status || {};
81
+ console.log('组件打印res', res);
82
+ const { data: { status: { code, detail } } } = res || {};
81
83
  if (code !== 0) {
84
+ console.log('失败了');
82
85
  const detailObj = JSON.parse(detail || '{}');
86
+ console.log('detailObj', detailObj);
83
87
  message.error(detailObj?.message || t('sendFailed', lang));
88
+ setVisible(false);
84
89
  return;
85
90
  }
86
91
  else {
92
+ console.log('成功了');
87
93
  // message.success(t('verifySuccess', lang));
88
94
  setVisible(false);
89
95
  return Promise.resolve(response);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.1-beta.13",
3
+ "version": "1.0.1-beta.15",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
package/src/main.tsx CHANGED
@@ -13,6 +13,12 @@ const config = {
13
13
  "forcedJSONParsing": true,
14
14
  "clarifyTimeoutError": false
15
15
  },
16
+ // "transformRequest": [
17
+ // null
18
+ // ],
19
+ // "transformResponse": [
20
+ // null
21
+ // ],
16
22
  "timeout": 0,
17
23
  "xsrfCookieName": "XSRF-TOKEN",
18
24
  "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -21,9 +27,7 @@ const config = {
21
27
  "headers": {
22
28
  "Accept": "application/json, text/plain, */*",
23
29
  "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
24
- "Content-Type": "application/json",
25
- "sms-code": "121212",
26
- "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
30
+ "Content-Type": "application/json"
27
31
  },
28
32
  "url": "/classification/admin/level/edit",
29
33
  "method": "post",
package/src/verify-modal.tsx CHANGED
@@ -12,7 +12,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
12
12
  const [captchaImage, setCaptchaImage] = useState<string>('');
13
13
  const [captchCode, setCaptchCode] = useState<string>('');
14
14
  const [captchaKey, setCaptchaKey] = useState<string>('');
15
- const { data, http, lang, api='/admin/sms/send', response } = props || {};
15
+ const { data, http, lang, api='/admin/sms/send', config, response } = props || {};
16
16
  const dataObj = JSON.parse(data || '{}');
17
17
  const { mobile, verifyCodeKey } = dataObj || {};
18
18
 
@@ -60,7 +60,9 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
60
60
  return;
61
61
  }
62
62
  message.success(t('sendSuccess', lang));
63
+ // 重置倒计时、验证码
63
64
  setCountdown(60);
65
+ setOtp('');
64
66
  }
65
67
 
66
68
  return (
@@ -82,22 +84,26 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
82
84
  setOtp(val);
83
85
  if (val.length === 6) {
84
86
  try {
85
- const res = await axios({
86
- ...response?.config,
87
+ const res = await http({
88
+ ...config,
87
89
  headers: {
88
- ...axios.defaults.headers.common,
90
+ ...http.defaults.headers.common,
89
91
  'sms-code': val,
90
92
  'sms-code-key': verifyCodeKey,
91
- 'Content-Type': response?.config.headers['Content-Type'],
93
+ 'Content-Type': config.headers['Content-Type'],
92
94
  }
93
95
  });
94
- console.log('res', res);
95
- const { code, detail } = response?.data?.status || {};
96
+ console.log('组件打印res', res);
97
+ const {data: {status: {code, detail}}} = res || {} as any;
96
98
  if (code !== 0) {
99
+ console.log('失败了')
97
100
  const detailObj = JSON.parse(detail || '{}');
101
+ console.log('detailObj', detailObj);
98
102
  message.error(detailObj?.message || t('sendFailed', lang));
103
+ setVisible(false);
99
104
  return;
100
105
  } else {
106
+ console.log('成功了')
101
107
  // message.success(t('verifySuccess', lang));
102
108
  setVisible(false);
103
109
  return Promise.resolve(response);