Merge branch 'develop' into 'master'

Develop

See merge request !2

src/components/PathDetailImage.vue

@@ -143,44 +143,28 @@ const calulatePosition = (list) => {
   return arr;
 };
 
-function toDetail(i) {
+function canStudy(setting,current){
-  // 预览和学习设置
+  const arr = setting?.split(',')
-  let previewSetting = props.detail.previewSetting;
+  if (arr && arr.length===2){
-  let studySetting = props.detail.studySetting;
+    return current >= arr[0] && current <= arr[1]
-  let isStudy = false;
-  let chapterId = props.detail.chapterDtoList[i].id;
-  console.log(studySetting);
-  if (previewSetting == null) {
-    // 如果未设置预览 则只可以看当前关卡 其余关卡不让点击
-    if (current.value !== i) {
-      ElMessage.warning("当前关卡不可预览");
-      return;
-    }
-    isStudy = true;
-  } else {
-    if (current.value !== i) {
-      let lookArr = [];
-      lookArr = previewSetting.split(",");
-      if ((i + 1) >= lookArr[0] && (i + 1) <= lookArr[1]) {
-        if (studySetting !== null) {
-          let studyArr = [];
-          studyArr = studySetting.split(",");
-          if ((i + 1) >= studyArr[0] && (i + 1) <= studyArr[1]) {
-            isStudy = true;
-          } else {
-            isStudy = false;
-          }
-        } else {
-          isStudy = false;
-        }
-      } else {
-        ElMessage.warning("当前关卡不可预览");
-        return;
-      }
-    } else {
-      isStudy = true;
-    }
   }
+  return false
+}
+function toDetail(i) {
+  const realIndex = props.detail.chapterDtoList.findIndex(e => e.id === showList.value[i].id);
+  // 预览和学习设置
+  let isStudy = true;
+  if(current.value !== i && !canStudy(props.detail.previewSetting,realIndex+1) && !canStudy(props.detail.studySetting,realIndex+1)){
+    ElMessage.warning("当前关卡不可预览");
+    return;
+  }
+  if(current.value !== i && canStudy(props.detail.previewSetting,realIndex+1)){
+    isStudy = false
+  }
+  if(current.value !== i && canStudy(props.detail.studySetting,realIndex+1)){
+    isStudy = true
+  }
+  const chapterId = showList.value[i].id;
   (import.meta.env.MODE === "development" || import.meta.env.MODE === "test")
     ? router.push({
       path: "/pathdetails",