返回，作业时间，查看

src/views/ballot/BallotPage.vue

@@ -16,14 +16,10 @@
       </div>
 -->
 <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <div class="debateTitle">【投票】{{ dataInfo?.voteName }}</div>

src/views/debate/DebatePage.vue

@@ -15,14 +15,10 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <div class="debateTitle">

src/views/discuss/DiscussPage.vue

@@ -29,14 +29,10 @@
         </div>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/discussdetail/DiscussDetail.vue

@@ -30,14 +30,10 @@
       </div>-->
 
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div> 
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/examination/ExamPage.vue

@@ -29,14 +29,10 @@
         </div>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/faceteach/FaceTeach.vue

@@ -92,7 +92,7 @@
               <div class="box"></div>
             </div>
             <div style="display: flex; align-items: center">
-              <div class="content" v-html="data.planDto?.description"></div>
+              <div class="content" v-html="data.offcourseDto?.intro"></div>
             </div>
           </div>
         </div>
@@ -112,10 +112,11 @@
               >
                 此课程无附件
               </div>
+              <div  v-else>
               <div 
                 v-for="(el, index) in JSON.parse(data.planDto?.attach)"
                 :key="index"
-                v-if="data.planDto"
+               
                 class="enclosure"
                 :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
               >
@@ -159,6 +160,7 @@
                   </div>
                 </div>
               </div>
+              </div>
             </el-tab-pane>
             <el-tab-pane label="课程作业" name="second">
               <div
@@ -186,11 +188,12 @@
                 <div v-if="isEndSubMitWork()" class="submit" style="background: #999">
                   已结束
                 </div>
-                <div 
+                <div v-else>
-                  :style="{background: new Date(data.planDto.beginTime).getTime() > new Date().getTime()?'#999':''}"
+                <div  :style="{background: new Date(data.planDto.beginTime).getTime() > new Date().getTime()?'#999':''}"
-                  v-else class="submit" @click="toWork" v-if="data.workDto?.workId">
+                   class="submit" @click="toWork" v-if="data.workDto?.workId">
                   交作业
                 </div>
+                </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程考试" name="third">

src/views/homework/HomeworkPage.vue

@@ -48,11 +48,12 @@
 								</div>
 							</div>
 						</div>
+						<div v-if="!dayjs(data?.submitEndTime).isSameOrBefore(dayjs())" >
 						<UploadImg v-model:value="fileList" ref="uploadRef">
 							<button class="shangchuan" style="cursor: pointer">
 								上传
 							</button>
-						</UploadImg>
+						</UploadImg></div>
 						<div class="uploadDetail"
 							:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
 							@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
@@ -110,14 +111,15 @@
 						</div>
 
 						<div class="join">
-							<el-input v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
+							<el-input :disabled ="dayjs(data?.submitEndTime).isSameOrBefore(dayjs())"   v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
 								type="textarea" />
 						</div>
+						<div v-if="!dayjs(data?.submitEndTime).isSameOrBefore(dayjs())" >
 						<div style="display: flex; justify-content: center">
 							<button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : ""
 							}}提交</button>
 						</div>
-
+						</div>
 
 
 
@@ -179,16 +181,26 @@
 }}
 					</div>
 					<div class="endtime clearfix">
-						<div class="endtimetext">
+
-							距离结束还有&nbsp;&nbsp;
+
-							<span class="te">{{
+
-									parseInt(
+						<div v-if="dayjs(data?.submitEndTime).isSameOrBefore(dayjs())" class="endtimetext">
-										dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60
+							改任务已结束
-									)
-							}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
-		dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60
-}}</span>&nbsp;&nbsp;分钟
 						</div>
+
+
+							<div v-else class="endtimetext">
+													距离结束还有&nbsp;&nbsp;
+													<span class="te">{{
+															parseInt(
+																dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60
+															)
+													}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
+								dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60
+						}}</span>&nbsp;&nbsp;分钟
+												</div>
+
+
 					</div>
 				</div>
 				<div class="righttitle">

src/views/liveBroadcast/LiveBroadcast.vue

@@ -16,15 +16,10 @@
         <button class="btn btn02" style="margin-left: 6px"></button> 
       </div>-->
       <div class="return">
-        <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-          <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-            class="img2"
+				</div>
-            style="margin-right: 22px"
+			</div>
-            src="../../assets/image/return.png"
-          />
-          <div class="text">返回</div>
-        </div>
-      </div>
     </div>
     <!-- 面包屑导航 -->
 

src/views/moreActive/MoreActive.vue

@@ -15,15 +15,10 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
       <div class="return">
-        <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-          <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-            class="img2"
+				</div>
-            style="margin-right: 22px"
+			</div>
-            src="../../assets/image/return.png"
-          />
-          <div class="text">返回</div>
-        </div>
-      </div>
     </div>
     <!-- 面包屑导航 -->
 

src/views/project/ProjectDetails.vue

@@ -8,8 +8,7 @@
 
 			<div class="return">
 				<div style="display: flex" @click="returnclick">
-					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-					<div style="cursor: pointer;" class="text">返回</div>
 				</div>
 			</div>
 		</div>

src/views/roadmap/PathDetails.vue

@@ -8,18 +8,21 @@
 
       <div class="return">
 				<div style="display: flex" @click="returnclick">
-					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-					<div style="cursor: pointer;" class="text">返回</div>
 				</div>
 			</div>
+
+     
     </div>
     <!-- 面包屑导航 -->
+
     <div class="pdname">
       {{ userInfo.bandDesc }}    
-      <span @click="introductionPro"  style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
+      <el-popover ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
-				<span style="position: relative;top:1px;left:-3px;cursor: pointer;">></span>
+    <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
-			</span>
+  </el-popover>
     </div>
+  
     <!-- 详细信息 -->
     <div class="detailinfo">
       <div class="detailL">
@@ -367,10 +370,7 @@ const path = {1: "path"};
 const dialogVisible = ref(false);
 const dialogVisibleTip = ref('');
 
-function introductionPro() {
+
-	dialogVisibleTip.value =data.value.remark;
-	dialogVisible.value = true;
-}
 
 const types = ref({
   typeName: {
@@ -756,5 +756,9 @@ function whiteTypes(type) {
       }
     }
   }
+  .jianjie{
+    text-align:justify;
+    line-height:2,
+  }
 }
 </style>

src/views/survey/SurveyDetail.vue

@@ -27,16 +27,11 @@
               src="../../assets/image/next.png"
           />
         </div>-->
-      <div class="return">
+        <div class="return">
-        <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-          <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-            class="img2"
+				</div>
-            style="margin-right: 22px"
+			</div>
-            src="../../assets/image/return.png"
-          />
-          <div class="text" style="color: #fff">返回</div>
-        </div>
-      </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->