更新显示

src/views/audition/ArrangeWork.vue

@@ -24,7 +24,11 @@
         <van-field rows="4" v-model="content" maxlength="600" show-word-limit type="textarea" placeholder="请输入训练内容" />
       </div>
     </div>
-    <van-cell class="endTime" title="训练提交截止时间" @click="onEndTime" is-link readonly placeholder="请选择截止时间" >
+    <van-cell class="endTime" style="padding: 0.12rem 0.21rem;" title="训练提交截止时间" @click="onEndTime" is-link readonly placeholder="请选择截止时间" >
+      <template #title>
+        <div class="dot"></div>
+        训练提交截止时间
+      </template>
       <template #default>
         {{ dateSection.showStartDate }}
       </template>
@@ -35,7 +39,10 @@
     </div>
     <van-tabs v-model="tabActive" color="#01C1B5">
       <van-tab v-for="(item, i) in params.subjectList" :title="item.subjectName" :name="item.id" :key="i" class="van-hairline--bottom">
-        <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0;" title="训练曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择训练曲目" >
+        <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0;padding: 0.12rem 0.21rem;" title="训练曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择训练曲目" >
+          <template #title>
+            <div class="dot"></div>训练曲目
+          </template>
           <template #default>
             <template v-if="music.name">
               {{ music.name }}
@@ -67,10 +74,13 @@
     </van-popup>
 
     <van-popup position="bottom" v-model="accompanimentStatus"  :style="{ height: '100%' }" style=" border-radius: 0; overflow: inherit;">
-      <van-sticky>
+      <!-- <van-sticky>
         <m-header name="作业曲目" :backUrl="backUrl" />
-      </van-sticky>
-      <accompaniment-modal isHead @onSelectMusic="onSelectMusic" :searchSubjectId="tabActive" />
+      </van-sticky> -->
+      <accompaniment-modal @onSelectMusic="onSelectMusic" style="margin-bottom: 0.8rem;" :searchSubjectId="tabActive" />
+      <div class="button-group-popup">
+        <span class="btn" @click="accompanimentStatus = false">关闭</span>
+      </div>
     </van-popup>
 
     <van-popup
@@ -79,10 +89,13 @@
       position="bottom"
       :style="{ height: '180%' }"
     >
-      <van-sticky>
+      <!-- <van-sticky>
         <m-header name="学员列表" :backUrl="backUrlStudent" />
-      </van-sticky>
-      <student-list-model isHead :dataList="dataList" :dataSubjectList="dataSubjectList"></student-list-model>
+      </van-sticky> -->
+      <student-list-model :dataList="dataList" style="margin-bottom: 0.8rem;" :dataSubjectList="dataSubjectList"></student-list-model>
+      <div class="button-group-popup">
+        <span class="btn" @click="studentStatus = false">关闭</span>
+      </div>
     </van-popup>
   </div>
 </template>
@@ -416,5 +429,29 @@ export default {
   color: #666666;
 }
 
-
+.button-group-popup {
+  position: fixed;
+  bottom: 0;
+  padding: 0.1rem 0;
+  width: 100%;
+  text-align: center;
+  background-color: #ffffff;
+  .btn {
+    line-height: 0.5rem;
+    display: inline-block;
+    border: 1px solid @mColor;
+    border-radius: 0.4rem;
+    color: @mColor;
+    background: #fff;
+    font-size: 0.18rem;
+    width: 90%;
+    &.primary {
+      color: #fff;
+      background: @mColor;
+    }
+  }
+  .btn + .btn {
+    margin-left: 0.1rem;
+  }
+}
 </style>

src/views/audition/CourseEvaluation.vue

@@ -279,6 +279,10 @@ export default {
   },
   methods: {
     submitReview() {
+      if(!this.isAssignHomework && !this.enableAssignHomework) {
+        this.$toast('请布置课后训练')
+        return
+      }
       if (!this.teachingMaterial) {
         this.$toast("请填写教材");
         return;

src/views/audition/modal/studentList.vue

@@ -18,7 +18,7 @@
                 </template>
             </van-search> -->
         </van-sticky>
-        <div class="paddingB80 studentContainer">
+        <div class="studentContainer">
             <van-cell-group v-if="dataShow">
             <van-cell
                 v-for="(item, index) in dataListArray"
@@ -102,7 +102,7 @@ export default {
     },
     mounted() {
         this.dataListArray = this.dataList
-        console.log(this.dataList)
+        // console.log(this.dataList)
         this.allArray = deepClone(this.dataList)
         this.dataSubjectList.forEach(subject => {
             this.option1.push({
@@ -149,6 +149,10 @@ export default {
 
 <style lang="less" scoped>
 @import url("../../../assets/commonLess/variable.less");
+.studentList {
+    background-color: #f5f5f5;
+    min-height: calc(100vh - .8rem);
+}
 /deep/.van-search .van-cell {
   padding: 5px 8px 5px 0 !important;
 }