Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into develop

src/views/discussdetail/DiscussDetail.vue

@@ -118,7 +118,7 @@
               <div
                 class="imgone"
                 :style="{
-                  backgroundImage: `url('${img.url}')`,
+                  backgroundImage: `url('${fielPath}${img.url}')`,
                   marginLeft: '15px',
                 }"
               ></div>
@@ -143,7 +143,7 @@
         <div class="bottom">
           <div v-for="(row, i) in commontList" :key="i" style="margin-bottom: 24px;">
             <div class="header">
-              <img :src="row.studentAvatar" alt="" srcset="" class="avator">
+              <img :src="row.studentAvatar.includes('upload') ? row.studentAvatar : fielPath+row.studentAvatar" alt="" srcset="" class="avator">
               <div class="id">{{ row.createName }}</div>
               <div class="showCareer">{{row.studentJobName}}</div>
               <div class="idThink"></div>
@@ -156,7 +156,7 @@
               </div>
               <div style="display:flex;margin-top: 12px;margin-bottom: 12px;">
                 <div v-if="row.img" v-for="(rowimg, index) in row.img.split(',')" :key="index" style="width:55px;height:55px;margin-right: 12px;">
-                  <img class="image" style="width:55px;height:55px;border-radius: 4px;" :src="rowimg"  />
+                  <img class="image" style="width:55px;height:55px;border-radius: 4px;" :src="fielPath+rowimg"  />
                 </div>
               </div>
               <div class="intime">{{ row.ctime }}</div>
@@ -184,16 +184,16 @@
               <div v-if="row.children.length!==0" :style="{height:spreadReply==i ? 'auto' : 210 +'px',overflow:'hidden',position: 'relative'}">
                 <div v-for="(replay, j) in row.children" :key="j">
                   <div class="reply">
-                    <img :src="replay.studentAvatar" alt="" srcset="" class="sameava avaone">
+                    <img :src="replay.studentAvatar.includes('upload') ? replay.studentAvatar :  fielPath+replay.studentAvatar" alt="" srcset="" class="sameava avaone">
                     <div class="sameuser">{{ replay.studentName }}</div>
                     <div class="centerreply">回复</div>
-                    <img :src="replay.targetStudentAvatar" alt="" srcset="" class="sameava avaone">
+                    <img :src="replay.targetStudentAvatar.includes('upload') ? replay.targetStudentAvatar : fielPath+replay.targetStudentAvatar" alt="" srcset="" class="sameava avaone">
                     <div class="sameuser">{{ replay.targetStudentName }}</div>
                     <div class="replytime">{{ replay.createTime }}</div>
                   </div>
                   <div style="display:flex;margin-top: 12px;margin-bottom: 12px;">
                     <div v-if="replay.img" v-for="(rowimg, index) in replay.img.split(',')" :key="index" style="width:65px;height:65px;margin-right: 7px;">
-                      <img class="image" style="width:65px;height:65px;border-radius: 4px;" :src="rowimg"  />
+                      <img class="image" style="width:65px;height:65px;border-radius: 4px;" :src="fielPath+rowimg"  />
                     </div>
                   </div>
                   <div class="mainreply">
@@ -263,7 +263,7 @@
                     <div
                       class="imgone"
                       :style="{
-                        backgroundImage: `url('${img.url}')`,
+                        backgroundImage: `url('${fielPath}${img.url}')`,
                         marginLeft: '15px',
                       }"
                     ></div>
@@ -324,6 +324,7 @@ import UploadPostImg from "@/components/img/UploadPostImg.vue";
 
 const router = useRouter();
 const refInput =ref()
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const getFocus = () => {
   refInput.value.focus()
 }

src/views/faceteach/FaceTeachSignUp.vue

@@ -39,7 +39,16 @@
             <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
           </div>
           <div class="time" style="margin-top: 37px">
-            <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" v-if="data.hasTask || data.planDto.applyFlag" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">{{data.isSignUp?'已报名':'立即报名'}}</botton>
+            <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" v-if="data.hasTask || data.planDto.applyFlag" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">
+              {{
+              data.isSignUp?
+              data.isRefused?'审核拒绝':'已报名'
+                :'立即报名'
+              }}
+            </botton>
+            <botton v-if="data.isRefused" class="btn" style="margin-right: 20px;width: 160px;height: 46px;" @click="onLineOnceSignUp">
+              重新报名
+            </botton>
           </div>
         </div>
       </div>
@@ -550,6 +559,12 @@ function onLineSignUp() {
   ElMessage.success("报名成功");
 }
 
+function onLineOnceSignUp() {
+  request(FACETEACH_SIGNUP, {courseId})
+  data.value.isSignUp = true
+  ElMessage.success("报名成功");
+}
+
 function formateArr(strs) {
   let arrs = strs.split(',')
   console.log('112233', arrs)

src/views/testscore/ExternalExamination.vue

@@ -60,7 +60,7 @@
               <!-- <div style="display: flex; align-items: center"></div> -->
               <div class="all" style="font-size:14px;color:rgba(51, 51, 48, 1);">
                 <div>
-                    {{ state.datainfo.externalExplain ? state.datainfo.externalExplain : "暂无考试说明" }}
+                    {{ state.datainfo.examinationExplain ? state.datainfo.examinationExplain : "暂无考试说明" }}
                 </div>
               </div>            
             </div>