Merge branch 'develop' into manage-release

src/components/img/UploadImgHomeWork.vue

@@ -51,10 +51,15 @@ function handleChange(file) {
   f.uid = file.uid; 
   file.raw = f;  
   console.log(file.raw)
-  if(file.raw.name.includes('.mp4') || file.raw.name.includes('.jpeg')){
+  if(file.raw.name.includes('.mp4') || file.raw.name.includes('.MP4')){
     files.value = []
     emit('update:value', files.value)
-    ElMessage.error(`暂不支持此格式文件上传`);
+    ElMessage.error(`暂不支持视频文件上传`);
+    return
+  }else if(file.raw.name.includes('.jpeg') || file.raw.name.includes('.JPEG')){
+    files.value = []
+    emit('update:value', files.value)
+    ElMessage.error(`暂不支持jpeg格式图片文件上传`);
     return
   }else{
     imageRef.value.submit();

src/store/index.js

@@ -38,8 +38,8 @@ export default createStore({
         const stageState = t.taskProcessList?.some((s) => {
           s.unlock = true;
           s.statusName = "已完成";
-          s.status === 2 ? (s.statusName = "进行中") : (!s.status && (s.statusName = TASK_TYPES.toName[s.type]));
-          return state.projectInfo.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag);
+          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;

src/views/faceteach/FaceTeachSignUp.vue

@@ -277,12 +277,12 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="材料下载" name="four" >
-              <div v-if="data.offcourseDto?.attach == ''"
+              <div v-if="data.planDto?.attach == ''"
                    style="font-size: 14px;font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px; margin-top: 20px;">
                 此课程无附件
               </div>
               <div v-else>
-                <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
+                <div v-for="(el, index) in formateArr(data.planDto.attach)" :key="index" class="enclosure"
                      :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
                   <div class="enclosureL">
                     <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{
@@ -294,12 +294,12 @@
                   </div>
                   <div class="download">
                     <img style="width: 16px; height: 15px" src="../../assets/image/download.png"/>
-                    <div style="margin-left: 5px;color:#999;">
-                      下载
-                    </div>
-                    <!-- <div style="margin-left: 5px;color:#999;" @click="download(el)">
+                    <!-- <div style="margin-left: 5px;color:#999;">
                       下载
                     </div> -->
+                    <div style="margin-left: 5px;color:#2478ff;" @click="download(el)">
+                      下载
+                    </div>
                   </div>
                 </div>
               </div>
@@ -372,9 +372,10 @@ const {activeName, enclosure, isAllowSign} = toRefs(state);
 const handleClick = (tab, event) => {
   console.log("附件", tab, event);
 };
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const download = (url) => {
-  // console.log('下载url',url)
-  window.open(url);
+  console.log('下载url',fielPath.value+url)
+  window.open(fielPath.value+url);
 };
 const downloads = (url) => {
   ElMessage.warning("未在有效时间范围内，请耐心等待！");

src/views/project/ProjectDetails.vue

@@ -364,7 +364,7 @@ const { commit, dispatch, state } = useStore()
 const store = useStore()
 const userInfo = computed(() => state.userInfo)
 const data = computed(() => state.projectInfo)
-
+console.log(data)
 onMounted(() => {
   dispatch('getProjectInfo', { projectId })
 })