fix -- bug

.env

@@ -1,4 +1,5 @@
 VITE_BASE=/fe-student
+VITE_BASE_H5=/fe-student-h5
 VITE_BASE_API=
 VITE_OUTPUT_DIR=./dist
 VITE_FILE_PATH=/upload/

src/App.vue

@@ -36,22 +36,30 @@ import {useStore} from "vuex";
 import {onMounted} from "vue";
 import {useRoute} from "vue-router/dist/vue-router";
 import {USER_INFO} from "@/api/api";
+import {IsPhone} from "@/api/utils";
 
 console.log("版本2.1.6------------");
 const store = useStore();
-const {path} = useRoute();
+const { path } = useRoute();
 onMounted(() => {
-  path === '/login' || getUserInfo();
+  path === "/login" || getUserInfo();
+  if (IsPhone()) {
+    if (import.meta.env.MODE === "development") {
+      window.location.href = window.location.href.replace(import.meta.env.VITE_BASE, import.meta.env.VITE_BASE_H5).replace('5173','5174');
+    } else {
+      window.location.href = window.location.href.replace(import.meta.env.VITE_BASE, import.meta.env.VITE_BASE_H5)
+    }
+  }
 });
 
 function getUserInfo() {
-  if (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') {
+  if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") {
     request(USER_INFO, {}).then(res => {
       store.commit("SET_USER", res.data);
-    })
+    });
   } else {
     boeRequest(GET_USER_INFO).then((res) => {
-      res.result.avatar = res.result.avatar || '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
+      res.result.avatar = res.result.avatar || "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png";
       store.commit("SET_USER", res.result);
     });
   }
@@ -75,7 +83,7 @@ function getUserInfo() {
 
 .preNext {
   right: 115px !important;
-  margin-top:4px;
+  margin-top: 4px;
 }
 
 #container {

src/api/utils.js

@@ -26,3 +26,7 @@ export function useUserInfo(id) {
     })
     return userInfo
 }
+
+export function IsPhone() {
+  return /mobile/i.test(navigator.userAgent);
+}

src/store/index.js

@@ -1,90 +1,89 @@
-import {createStore} from 'vuex'
+import {createStore} from "vuex";
 import {PROJECT_PROCESS, ROUTER_PROCESS} from "@/api/api";
 import {request} from "@/api/request";
 import {TASK_TYPES} from "@/api/CONST";
 
 export default createStore({
-    state: {
+  state: {
-        userInfo: {},
+    userInfo: {},
-        projectInfo: {},
+    projectInfo: {},
-        routerInfo: {}
+    routerInfo: {}
+  },
+  getters: {},
+  mutations: {
+    SET_USER(state, userInfo) {
+      state.userInfo = userInfo;
     },
-    getters: {
+    SET_PROJECT_INFO(state, info) {
-
+      state.projectInfo = info;
     },
-    mutations: {
+    INIT_PROJECT_INFO(state) {
-        SET_USER(state, userInfo) {
+      if (state.projectInfo.status === -1) {
-            state.userInfo = userInfo
+        state.projectInfo.stageProcessList.forEach((t) => {
-        },
+          t.statusName = "已结束";
-        SET_PROJECT_INFO(state, info) {
+          t.taskProcessList?.forEach((s) => s.statusName = "已结束");
-            state.projectInfo = info
+        });
-        },
+        return;
-        INIT_PROJECT_INFO(state) {
+      }
-            if (state.projectInfo.status === -1) {
+      if (state.projectInfo.unlockMode === 1) {
-                state.projectInfo.stageProcessList.forEach((t) => {
+        state.projectInfo.stageProcessList.forEach((t) => {
-                    t.statusName = '已结束';
+          t.statusName = "进行中";
-                    t.taskProcessList?.forEach((s) => s.statusName = '已结束')
+          t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]);
-                })
+          t.taskProcessList?.every((s) => s.status === 1) && (t.statusName = "已完成");
-                return
+        });
-            }
+        return;
-            if (state.projectInfo.unlockMode === 1) {
+      }
-                state.projectInfo.stageProcessList.forEach((t) => {
+      state.projectInfo.stageProcessList?.some((t) => {
-                    t.statusName = '进行中'
+        t.statusName = "已完成";
-                    t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? '已完成' : TASK_TYPES.toName[s.type])
+        const stageState = t.taskProcessList?.some((s) => {
-                    t.taskProcessList?.every((s) => s.status === 1) && (t.statusName = '已完成')
+          s.unlock = true;
-                })
+          s.statusName = "已完成";
-                return
+          s.status == 2 ? "进行中" : (!s.status && (s.statusName = TASK_TYPES.toName[s.type]));
-            }
+          return state.projectInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag);
-            state.projectInfo.stageProcessList?.some((t) => {
+        });
-                t.statusName = '已完成'
+        stageState && (t.statusName = "进行中");
-                const stageState = t.taskProcessList?.some((s) => {
+        return stageState;
-                    s.unlock = true
+      });
-                    s.statusName = '已完成'
-                    s.status !== 1 && (s.statusName = TASK_TYPES.toName[s.type])
-                    return state.projectInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag)
-                })
-                stageState && (t.statusName = '进行中');
-                return stageState
-            })
-        },
-        SET_ROUTER_INFO(state, info) {
-            state.routerInfo = info
-        },
-        INIT_ROUTER_INFO(state) {
-            // state.routerInfo.unlockMode 1自由模式 2闯关模式 3 闯关模式 必修 flag true
-            if (state.routerInfo.status === -1) {
-                state.routerInfo.statusName = '已结束'
-                state.routerInfo.taskBoList.forEach((t) => t.statusName = '已结束')
-                return
-            }
-            state.routerInfo.statusName = '进行中'
-            if (state.routerInfo.unlockMode === 1) {
-                state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? '已完成' : TASK_TYPES.toName[s.type])
-                state.routerInfo.taskBoList?.every((s) => s.status === 1) && (state.routerInfo.statusName = '已完成')
-                return
-            }
-            state.routerInfo.statusName = '已完成'
-            state.routerInfo.taskBoList?.some((s) => {
-                s.unlock = true
-                s.statusName = '已完成'
-                s.status !== 1 && (s.statusName = TASK_TYPES.toName[s.type])
-                return state.routerInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag)
-            }) && (state.routerInfo.statusName = '进行中')
-        },
     },
-    actions: {
+    SET_ROUTER_INFO(state, info) {
-        getProjectInfo(content, {projectId}) {
+      state.routerInfo = info;
-             request(PROJECT_PROCESS, {projectId,type:1}).then(res => {
-                content.commit('SET_PROJECT_INFO', res.data)
-                content.commit('INIT_PROJECT_INFO')
-            })
-        },
-        getRouterInfo(content, {routerId,chapterId}) {
-             request(ROUTER_PROCESS, chapterId?{routerId,type:2,chapterId}:{routerId,type:2}).then(res => {
-                content.commit('SET_ROUTER_INFO', res.data)
-                content.commit('INIT_ROUTER_INFO')
-            })
-        },
     },
-    modules: {}
+    INIT_ROUTER_INFO(state) {
-})
+      // state.routerInfo.unlockMode 1自由模式 2闯关模式 3 闯关模式 必修 flag true
+      if (state.routerInfo.status === -1) {
+        state.routerInfo.statusName = "已结束";
+        state.routerInfo.taskBoList.forEach((t) => t.statusName = "已结束");
+        return;
+      }
+      state.routerInfo.statusName = "进行中";
+      if (state.routerInfo.unlockMode === 1) {
+        state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]);
+        state.routerInfo.taskBoList?.every((s) => s.status === 1) && (state.routerInfo.statusName = "已完成");
+        return;
+      }
+      state.routerInfo.statusName = "已完成";
+      state.routerInfo.taskBoList?.some((s) => {
+        s.unlock = true;
+        s.statusName = "已完成";
+        s.status == 2 ? "进行中" : (!s.status && (s.statusName = TASK_TYPES.toName[s.type]));
+        // s.status !== 1 && (s.statusName = TASK_TYPES.toName[s.type]);
+        return state.routerInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag);
+      }) && (state.routerInfo.statusName = "进行中");
+    },
+  },
+  actions: {
+    getProjectInfo(content, { projectId }) {
+      request(PROJECT_PROCESS, { projectId, type: 1 }).then(res => {
+        content.commit("SET_PROJECT_INFO", res.data);
+        content.commit("INIT_PROJECT_INFO");
+      });
+    },
+    getRouterInfo(content, { routerId, chapterId }) {
+      request(ROUTER_PROCESS, chapterId ? { routerId, type: 2, chapterId } : { routerId, type: 2 }).then(res => {
+        content.commit("SET_ROUTER_INFO", res.data);
+        content.commit("INIT_ROUTER_INFO");
+      });
+    },
+  },
+  modules: {}
+});