会员中心学习时间不显示天

Merge pull request !3 from 白书科技/fix/0922

package.json

@@ -28,9 +28,11 @@
   "devDependencies": {
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.11",
+    "@vitejs/plugin-legacy": "^4.1.1",
     "@vitejs/plugin-react-swc": "^3.0.0",
     "rollup-plugin-gzip": "^3.1.0",
     "sass": "^1.59.3",
+    "terser": "^5.19.4",
     "typescript": "^4.9.3",
     "vite": "^4.2.0"
   }

src/api/login.ts

@@ -10,3 +10,10 @@ export function login(email: string, password: string) {
 export function logout() {
   return client.post("/api/v1/auth/logout", {});
 }
+
+export function loginLdap(email: string, password: string) {
+  return client.post("/api/v1/auth/login/ldap", {
+    username: email,
+    password: password,
+  });
+}

src/main.scss

@@ -1,5 +1,3 @@
-@import "./assets/iconfont/iconfont.css";
-
 body {
   margin: 0;
 }

src/main.tsx

@@ -2,6 +2,7 @@ import ReactDOM from "react-dom/client";
 import { Provider } from "react-redux";
 import store from "./store";
 import { BrowserRouter } from "react-router-dom";
+import "./assets/iconfont/iconfont.css";
 import "./main.scss";
 import App from "./App";
 import AutoScorllTop from "./AutoTop";

src/pages/init/index.tsx

@@ -24,6 +24,7 @@ export const InitPage = (props: Props) => {
     if (props.configData) {
       let config: SystemConfigStoreInterface = {
         //系统配置
+        "ldap-enabled": props.configData["ldap-enabled"],
         systemApiUrl: props.configData["system-api-url"],
         systemH5Url: props.configData["system-h5-url"],
         systemLogo: props.configData["system-logo"],

src/pages/login/index.tsx

@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Button, Toast, Input, Image } from "antd-mobile";
 import styles from "./index.module.scss";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { login, system, user } from "../../api/index";
 import { setToken } from "../../utils/index";
@@ -19,6 +19,7 @@ const LoginPage = () => {
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const [bodyHeight, setBodyHeight] = useState(0);
+  const systemConfig = useSelector((state: any) => state.systemConfig.value);
 
   useEffect(() => {
     document.title = "登录";
@@ -29,7 +30,7 @@ const LoginPage = () => {
   const loginSubmit = async (e: any) => {
     if (!email) {
       Toast.show({
-        content: "请输入学员邮箱账号",
+        content: "请输入邮箱或UID",
       });
       return;
     }
@@ -47,17 +48,32 @@ const LoginPage = () => {
       return;
     }
     setLoading(true);
-    try {
+    if (systemConfig["ldap-enabled"] === "1") {
-      let res: any = await login.login(email, password);
+      try {
-      setToken(res.data.token); //将token写入本地
+        let res: any = await login.loginLdap(email, password);
-      await getSystemConfig(); //获取系统配置并写入store
+        setToken(res.data.token); //将token写入本地
-      await getUser(); //获取登录用户的信息并写入store
+        await getSystemConfig(); //获取系统配置并写入store
-      setLoading(false);
+        await getUser(); //获取登录用户的信息并写入store
-      navigate("/member", { replace: true });
+        setLoading(false);
-    } catch (e) {
+        navigate("/member", { replace: true });
-      console.error("错误信息", e);
+      } catch (e) {
-      setLoading(false);
+        console.error("错误信息", e);
+        setLoading(false);
+      }
+    }else{
+      try {
+        let res: any = await login.login(email, password);
+        setToken(res.data.token); //将token写入本地
+        await getSystemConfig(); //获取系统配置并写入store
+        await getUser(); //获取登录用户的信息并写入store
+        setLoading(false);
+        navigate("/member", { replace: true });
+      } catch (e) {
+        console.error("错误信息", e);
+        setLoading(false);
+      }
     }
+    
   };
 
   const getUser = async () => {
@@ -70,6 +86,7 @@ const LoginPage = () => {
     if (configRes.data) {
       let config: SystemConfigStoreInterface = {
         //系统配置
+        "ldap-enabled": configRes.data["ldap-enabled"],
         systemApiUrl: configRes.data["system-api-url"],
         systemH5Url: configRes.data["system-h5-url"],
         systemLogo: configRes.data["system-logo"],
@@ -110,7 +127,7 @@ const LoginPage = () => {
         <div className={styles["input-box"]}>
           <Input
             className={styles["input-item"]}
-            placeholder="请输入学员邮箱账号"
+            placeholder="请输入邮箱或UID"
             value={email}
             onChange={(val) => {
               setEmail(val);

src/pages/member/index.tsx

@@ -22,10 +22,8 @@ const MemberPage = () => {
       url: "",
     },
   ]);
-  const [learnTodayDay, setLearnTodayDay] = useState(0);
   const [learnTodayHour, setLearnTodayHour] = useState(0);
   const [learnTodayMin, setLearnTodayMin] = useState(0);
-  const [learnTotalDay, setLearnTotalDay] = useState(0);
   const [learnTotalHour, setLearnTotalHour] = useState(0);
   const [learnTotalMin, setLearnTotalMin] = useState(0);
   const user = useSelector((state: any) => state.loginUser.value.user);
@@ -60,19 +58,17 @@ const MemberPage = () => {
       setStats(res.data.stats);
       let todayData = studyTimeFormat(res.data.stats.today_learn_duration);
       if (todayData) {
-        setLearnTodayDay(todayData[0]);
+        setLearnTodayHour(todayData[0]);
-        setLearnTodayHour(todayData[1]);
+        setLearnTodayMin(todayData[1]);
-        setLearnTodayMin(todayData[2]);
+        if (todayData[1] === 0 && todayData[2] > 0) {
-        if (todayData[2] === 0 && todayData[3] > 0) {
           setLearnTodayMin(1);
         }
       }
       let totalData = studyTimeFormat(res.data.stats.learn_duration);
       if (totalData) {
-        setLearnTotalDay(totalData[0]);
+        setLearnTotalHour(totalData[0]);
-        setLearnTotalHour(totalData[1]);
+        setLearnTotalMin(totalData[1]);
-        setLearnTotalMin(totalData[2]);
+        if (totalData[1] === 0 && totalData[2] > 0) {
-        if (totalData[2] === 0 && totalData[3] > 0) {
           setLearnTodayMin(1);
         }
       }
@@ -191,11 +187,6 @@ const MemberPage = () => {
         <div className={styles["stats-content"]}>
           <div className={styles["stat-item"]}>
             <span className={styles["time"]}>
-              {learnTodayDay > 0 && (
-                <>
-                  <strong>{learnTodayDay} </strong>天
-                </>
-              )}
               <strong> {learnTodayHour} </strong>时
               <strong> {learnTodayMin} </strong>分
             </span>
@@ -203,11 +194,6 @@ const MemberPage = () => {
           </div>
           <div className={styles["stat-item"]}>
             <span className={styles["time"]}>
-              {learnTotalDay > 0 && (
-                <>
-                  <strong>{learnTotalDay} </strong>天
-                </>
-              )}
               <strong> {learnTotalHour} </strong>时
               <strong> {learnTotalMin} </strong>分
             </span>

src/store/system/systemConfigSlice.ts

@@ -1,6 +1,7 @@
 import { createSlice } from "@reduxjs/toolkit";
 
 type SystemConfigStoreInterface = {
+  "ldap-enabled": string;
   systemApiUrl: string;
   systemPcUrl: string;
   systemH5Url: string;
@@ -16,6 +17,7 @@ type SystemConfigStoreInterface = {
 };
 
 let defaultValue: SystemConfigStoreInterface = {
+  "ldap-enabled": "",
   systemApiUrl: "",
   systemPcUrl: "",
   systemH5Url: "",

src/utils/index.ts

@@ -54,7 +54,6 @@ export function changeAppUrl(str: string) {
 export function studyTimeFormat(dateStr: number) {
   var d = moment.duration(dateStr / 1000, "seconds");
   let value = [];
-  value.push(Math.floor(d.asDays()));
   value.push(d.hours());
   value.push(d.minutes());
   value.push(d.seconds());

vite.config.ts

@@ -1,13 +1,22 @@
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react-swc";
 import gzipPlugin from "rollup-plugin-gzip";
+import legacy from "@vitejs/plugin-legacy";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   server: {
     host: "0.0.0.0",
   },
-  plugins: [react()],
+  plugins: [
+    react(),
+    legacy({
+      targets: ["chrome 52"],
+      additionalLegacyPolyfills: ["regenerator-runtime/runtime"],
+      renderLegacyChunks: true,
+      modernPolyfills: true,
+    }),
+  ],
   build: {
     rollupOptions: {
       plugins: [gzipPlugin()],