ike-weblca-html 2.2.17 → 2.2.19

package/src/js/UserAgreement.js

@@ -1,5 +1,6 @@
-import {css, html, LitElement} from 'lit-element';
-import cookies from 'js-cookie'
+import {css, html, LitElement} from 'lit-element';
+import cookies from 'js-cookie'
+import { getResponseErrorMessage, notifyRequestError } from './requestError'
 
 let overlay;
 let modal;
@@ -10,12 +11,18 @@ const AcceptArgreement = async (url, id, handOk) => {
             method: 'POST', headers: {
                 Authorization: cookies.get("token")
             }
-        });
-        const jsonData = await response.json();
-        let data = jsonData.data; // 将获取到的数据保存到 data 属性中
-        handOk()
-    } catch (error) {
-        console.error('Error fetching data:', error);
+        });
+        const jsonData = await response.json();
+        const errorMessage = getResponseErrorMessage(response, jsonData, '确认用户协议失败');
+        if (errorMessage) {
+            notifyRequestError(errorMessage);
+            return;
+        }
+        let data = jsonData.data; // 将获取到的数据保存到 data 属性中
+        handOk()
+    } catch (error) {
+        console.error('Error fetching data:', error);
+        notifyRequestError('确认用户协议失败');
     }
 }
 

package/src/js/requestError.js

@@ -0,0 +1,24 @@
+export const REQUEST_ERROR_EVENT = 'ike-web-request-error'
+
+export function getResponseErrorMessage(response, payload, fallbackMessage) {
+  const code = payload && (payload.Code ?? payload.code)
+  const message = payload && (payload.Message || payload.message)
+
+  if (!response.ok) return message || fallbackMessage
+
+  if (code !== undefined && code !== null && Number(code) !== 200) {
+    return message || fallbackMessage
+  }
+
+  if (payload && payload.success === false) return message || fallbackMessage
+
+  return ''
+}
+
+export function notifyRequestError(message) {
+  window.dispatchEvent(
+    new CustomEvent(REQUEST_ERROR_EVENT, {
+      detail: { message },
+    })
+  )
+}