From a4eb626a18a9c185f84dc3296be49a4ec417d215 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 28 Feb 2023 10:54:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                        |  2 +-
 .env.boe                                    |  2 +-
 .env.prod                                   |  2 +-
 .env.release                                |  2 +-
 .env.test                                   |  2 +-
 src/App.vue                                 |  2 +-
 src/components/PathDetailImage.vue          | 26 +++++++++++++++++----
 src/views/projectdetails/ProjectPath.vue    |  2 +-
 src/views/projectdetails/projectDetails.vue | 20 ++++++++++++----
 9 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index 7d3ffd4..62cc23c 100644
--- a/.env
+++ b/.env
@@ -16,7 +16,7 @@ VITE_BOE_API_URL=https://u-pre.boe.com
 
 VITE_TASK_WHITE_TYPE=-8-,-12-,-13-
 # boe域名
-VUE_APP_BOE_API_URL=//u-pre.boe.com
+VITE_BOE_BASE_URL=//u-pre.boe.com
 #评论上传图片
 VITE_IMG=/manageApi
 VITE_BASE_FILE_PATH=/fe-student-h5/upload
\ No newline at end of file
diff --git a/.env.boe b/.env.boe
index aa80821..0501c79 100644
--- a/.env.boe
+++ b/.env.boe
@@ -8,6 +8,6 @@ VITE_BOE_TEST_OUT_DETAIL_URL=//u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id=
 
 VITE_BOE_API_URL=https://u-pre.boe.com
-VUE_APP_BOE_API_URL=//u-pre.boe.com
+VITE_BOE_BASE_URL=//u-pre.boe.com
 
 VITE_IMG=/manageApi
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
index 4320f82..5d845d0 100644
--- a/.env.prod
+++ b/.env.prod
@@ -13,6 +13,6 @@ VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc/forward?to=/student-h5
 VITE_BOE_API_URL=https://u.boe.com
 
 VITE_TASK_WHITE_TYPE=-8-,-12-,-13-
-VUE_APP_BOE_API_URL=//u.boe.com
+VITE_BOE_BASE_URL=//u.boe.com
 
 VITE_IMG=/manageApi
\ No newline at end of file
diff --git a/.env.release b/.env.release
index a74ee91..bafc02c 100644
--- a/.env.release
+++ b/.env.release
@@ -10,6 +10,6 @@ VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc-release/mobile/pages/exam/exam?id=
 VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc-release/forward?to=/student-h5-release
 
 VITE_BOE_API_URL=https://u.boe.com
-VUE_APP_BOE_API_URL=//u.boe.com
+VITE_BOE_BASE_URL=//u.boe.com
 
 VITE_IMG=/manageApi-release
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 6895973..ca16bbf 100644
--- a/.env.test
+++ b/.env.test
@@ -3,4 +3,4 @@ VITE_BASE_API=/manageApi
 
 VITE_OUTPUT_DIR=./docker/dist
 VITE_BOE_API_URL=//u-pre.boe.com
-VUE_APP_BOE_API_URL=//u-pre.boe.com
\ No newline at end of file
+VITE_BOE_BASE_URL=//u-pre.boe.com
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index fd92786..58810a6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi";
 import { getCookie } from "@/api/utils";
 
 import { USER_INFO } from "@/api/api";
-console.log("版本1.2.3------------");
+console.log("版本1.2.5------------");
 const store = useStore();
 const router = useRouter();
 
diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue
index c64cff1..9530c87 100644
--- a/src/components/PathDetailImage.vue
+++ b/src/components/PathDetailImage.vue
@@ -29,7 +29,7 @@
 <script setup>
 import { computed, defineProps, ref, watch } from "vue";
 import { useRouter } from "vue-router/dist/vue-router";
-import { ElLoading } from "element-plus";
+import { ElLoading, ElMessage } from "element-plus";
 import { ROUTERTASK_LIST } from "@/api/api";
 import { usePage, useRequest } from "@/api/request";
 const listheight = document.body.clientHeight - 300 + "px";
@@ -103,10 +103,26 @@ const { data } = useRequest(ROUTERTASK_LIST, { routerId: props.routerId });
 console.log("data", data);
 let current = ref(null);
 watch(data, () => {
-  data.value.list.reverse();
-  current.value = data.value.list.findIndex(
-    (e) => e.id === data.value.currentChapterId
-  );
+  // console.log(
+  //   "import.meta.env.VITE_BOE_BASE_URL",
+  //   import.meta.env.VITE_BOE_BASE_URL
+  // );
+  if (data.value && data.value.list) {
+    data.value.list.reverse();
+    current.value = data.value.list.findIndex(
+      (e) => e.id === data.value.currentChapterId
+    );
+  } else {
+    ElMessage.warning("您不是此学习路径的学员");
+    // router.push({
+    //   path: import.meta.env.VITE_BOE_BASE_URL + "/mobile/pages/index/index",
+    // });
+    window.open(
+      import.meta.env.VITE_BOE_BASE_URL + "/mobile/pages/index/index",
+      "_self"
+    );
+  }
+
   closeLoading();
 });
 // const current = computed(() => {
diff --git a/src/views/projectdetails/ProjectPath.vue b/src/views/projectdetails/ProjectPath.vue
index 3bc05a4..9b5909f 100644
--- a/src/views/projectdetails/ProjectPath.vue
+++ b/src/views/projectdetails/ProjectPath.vue
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-01-19 11:28:11
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-27 15:34:11
+ * @LastEditTime: 2023-02-28 09:56:55
  * @FilePath: /stu_h5/src/views/projectdetails/ProjectPath.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
diff --git a/src/views/projectdetails/projectDetails.vue b/src/views/projectdetails/projectDetails.vue
index 1b5a488..612f0ea 100644
--- a/src/views/projectdetails/projectDetails.vue
+++ b/src/views/projectdetails/projectDetails.vue
@@ -172,13 +172,25 @@ const { data } = useRequest(PROJECT_PROCESS, {
 watch(
   () => data.value.stageProcessList,
   () => {
-    data.value.stageProcessList.forEach((t) => {
-      t.stageStatusName = getTaskStatus(t);
-    });
-    console.log("改变data", data);
+    if (data.value.stageProcessList) {
+      data.value.stageProcessList.forEach((t) => {
+        t.stageStatusName = getTaskStatus(t);
+      });
+      console.log("改变data", data);
+    }
   },
   { deep: true }
 );
+watch(data, () => {
+  console.log("data.value.projectId", data.value.projectId);
+  if (!data.value.projectId) {
+    ElMessage.warning("您不是此项目的学员");
+    window.open(
+      import.meta.env.VITE_BOE_BASE_URL + "/mobile/pages/index/index",
+      "_self"
+    );
+  }
+});
 
 function getTaskStatus(d) {
   if (data.value.status !== 3) {