Merge branch 'main' of github.com:hainatravel/GHHub

src/main.jsx

@@ -30,11 +30,11 @@ import InvoiceDetail from "@/views/invoice/Detail";
 
 configure({ 
   useProxies: "ifavailable",
-  enforceActions: "always",
+  enforceActions: "observed",
   computedRequiresReaction: true,
+  observableRequiresReaction: false,
   reactionRequiresObservable: true,
-  observableRequiresReaction: true,
-  disableErrorBoundaries: true
+  disableErrorBoundaries: process.env.NODE_ENV == "production"
 });
 
 const router = createBrowserRouter([

src/stores/Auth.js

@@ -1,7 +1,7 @@
 import { makeAutoObservable, runInAction } from "mobx";
 import { fetchJSON, postForm } from '@/utils/request';
 import { HT_HOST } from "@/config";
-import { prepareUrl } from '@/utils/commons';
+import { isNotEmpty, prepareUrl } from '@/utils/commons';
 
 const KEY_LOGIN_TOKEN = 'KEY_LOGIN_TOKEN';
 
@@ -11,6 +11,9 @@ class Auth {
     makeAutoObservable(this, { rootStore: false });
     this.root = root;
     this.login.token = root.getSession(KEY_LOGIN_TOKEN);
+    if (isNotEmpty(this.login.token)) {
+      this.fetchUserDetail();
+    }
     setInterval(() => {
       // console.info('Auth.check.token.');
     }, 10000);
@@ -34,7 +37,7 @@ class Auth {
       });
   }
 
-  fetchUserDetail(userId) {
+  fetchUserDetail() {
     const fetchUrl = prepareUrl(HT_HOST + '/service-CooperateSOA/GetLinkManInfo')
       .append('token', this.login.token)
       .build();

src/views/Login.jsx

@@ -14,7 +14,7 @@ function Login() {
     authStore.valdateUserPassword(values.username, values.password)
       .then((userId) => {
         noticeStore.getBulletinUnReadCount(userId);
-        authStore.fetchUserDetail(userId)
+        authStore.fetchUserDetail()
           .then((user) => {
             // navigate(-1) is equivalent to hitting the back button.
             navigate("/reservation/newest");

src/views/reservation/Newest.jsx

@@ -49,14 +49,14 @@ function Newest() {
     if (reservation.guide === '') {
       return (
         <Space size="middle">
-          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Fill in</Button>
+          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Add</Button>
         </Space>
       );
     } else {
       return (
         <Space size="middle">
           <span>{reservation.guide}</span>
-          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Modify</Button>
+          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Edit</Button>
         </Space>
       );
     }
@@ -107,7 +107,7 @@ function Newest() {
       onSearchClick(1, 1);
     }
     return () => {
-      console.info('unmount...');
+      // unmount...
     };
   }, []);