Merge branch 'develop' into manage-release

src/api/api.js

@@ -124,7 +124,10 @@ export const PostList = `/statement/list`
 export const QueryEvaluationTaskStatusOne = `/evaluation/queryEvaluationTaskStatusOne`
 
 // 投票浏览和参与数目
-export const EditVoteInvolvedAndBrowse = `/vote/editVoteInvolvedAndBrowse post` 
+export const EditVoteInvolvedAndBrowse = `/vote/editVoteInvolvedAndBrowse post`
+
+//查询路径关卡列表
+export const ROUTER_DETAIL_CHAPTER_LIST = `/stu/router/chapterPcList`
 
 
 

src/views/ballot/BallotPage.vue

@@ -99,6 +99,7 @@
                       style="width: 140px; height: 140px; border-radius: 8px"
                       :src="value.optionPictureAddress"
                     />
+                    <div v-else-if="isExistImg(item.optionDetailList)" style="width: 140px; height: 140px; border-radius: 8px"></div>
                     <div class="radio">
                       <label @click="choiceQuestion(item,value)">
                         <div class="radio-img">
@@ -219,6 +220,18 @@ const choiceQuestion = (item, value) => {
   item.optionDetailList?.forEach(t => t.isAnswer = false);
   value.isAnswer = true;
 };
+// 判断当前题目中是否有的选项有图片有的没有
+const isExistImg = (data) => {
+  let exist = false;
+  data.forEach((i,n)=>{
+    console.log(i,n)
+    if(i.optionPictureAddress){
+      exist = true;
+      return exist;
+    }
+  })
+  return exist;
+}
 // 提交投票
 const submitVote = () => {
   let nowTime = new Date().getTime();

src/views/project/ProjectDetails.vue

@@ -267,7 +267,7 @@
             </div>
             <!-- 学员列表 -->
             <div>
-              <div v-for="(item, i) in tableRankData" :key="i"
+              <div v-for="(item, i) in tableRankData.slice(0,5)" :key="i"
                 style="display: flex;justify-content: center;align-items: center;width: 100%;position: relative;top:-60px;margin-bottom: 38px;">
                 <div
                   style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;position: relative;">
@@ -290,7 +290,7 @@
               </div>
 
               <!-- 我的排名 -->
-              <div v-if="myIndex > tableRankData.length"
+              <div v-if="myIndex > 5"
                 style="display: flex;justify-content: center;align-items: center;width: 100%;position: relative;top:-60px;margin-bottom: 38px;">
                 <div
                   style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;">
@@ -306,7 +306,7 @@
                 </div>
               </div>
 
-              <div v-if="myIndex > tableRankData.length"
+              <div v-if="myIndex > 5"
                 style="display: flex;justify-content: center;align-items: center;width: 100%;position: relative;top:-60px;margin-bottom: 38px;">
                 <div
                   style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;">
@@ -407,7 +407,6 @@ const tabChange = (tabs) => {
     myIndex.value = res.data.myIndex
     myPoint.value = res.data.myPointsCount
   })
-  tableRankData.value = 12
 }
 const myIndex = ref('')
 const myPoint = ref('')

src/views/roadmap/LearnPath.vue

@@ -52,7 +52,7 @@
               </div>
             </div>
             <template #reference>
-              <div class="titleR">进入未完成任务</div>
+<!--              <div class="titleR">进入未完成任务</div>-->
             </template>
           </el-popover>
         </div>

src/views/roadmap/PathChapterDetails.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="mapdetail">
+    <PathDetailImage
+      :img="data?.picUrl"
+      :detail="data"
+    ></PathDetailImage>
+  </div>
+</template>
+<script setup>
+import PathDetailImage from "@/components/PathDetailImage.vue";
+import {useRequest} from "@/api/request";
+import {ROUTER_DETAIL_CHAPTER_LIST} from "@/api/api";
+import {useRoute} from "vue-router/dist/vue-router";
+
+const {query:{routerId}} = useRoute()
+const {data} = useRequest(ROUTER_DETAIL_CHAPTER_LIST,{routerId})
+
+</script>
+
+<style lang="scss">
+.mapdetail {
+  width: calc(100% - 107px);
+  min-height: 577px;
+  background: rgba(242, 245, 247, 0.6);
+  margin-top: 26px;
+  border-radius: 8px;
+  margin-left: 53px;
+  margin-right: 54px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>