Merge branch 'master' into iterationApp

dist/css/IStarted.06b3060c.css

@@ -0,0 +1 @@
+.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.squrt{width:.14rem;height:.12rem;margin-left:.1rem}.van-search{padding:.13rem .16rem}/deep/ .van-search__action{color:#777}.icon[data-v-67669af7]{width:2rem;height:2rem;margin:.5rem auto .05rem}.icon_nodata[data-v-67669af7]{background:url(../img/icon_nodata.81c87d57.png) no-repeat 50%;background-size:contain}.msg[data-v-67669af7]{color:#aaa;font-size:.16rem;text-align:center;line-height:.22rem}.istarted[data-v-3e5b9aac]{min-height:100vh}.app-item[data-v-3e5b9aac]{margin:0 .16rem .1rem;background:#fff;border-radius:.1rem;font-size:.14rem;display:block}.app-item[data-v-3e5b9aac]:first-child{margin-top:.1rem}.app-item .hd[data-v-3e5b9aac]{padding:.1rem .15rem .1rem .19rem;border-bottom:1px solid #f5f5f5;color:#777;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.app-item .bd[data-v-3e5b9aac]{padding:.12rem .15rem .2rem .19rem;line-height:.2rem}

src/views/audition/CourseEvaluation.vue

@@ -56,7 +56,7 @@
         placeholder="请输入（1-255字）"
       />
     </van-cell-group>
-    <van-cell-group>
+    <van-cell-group v-if="!isReset || (isReset && homeWork)">
       <van-field
         required
         rows="4"
@@ -80,6 +80,17 @@
         </template>
       </van-cell>
     </van-cell-group>
+
+    <van-cell-group v-if="isReset && !homeWork">
+      <van-cell title="是否完成作业" value-class="twoConnect">
+        <template slot="default">
+          <van-radio-group required v-model="handHomework" direction="horizontal">
+            <van-radio name="1">是</van-radio>
+            <van-radio name="0">否</van-radio>
+          </van-radio-group>
+        </template>
+      </van-cell>
+    </van-cell-group>
     <div class="button-group">
       <van-button type="primary" v-if="!reviewId" round size="large" @click="submitReview">提交评价</van-button>
       <van-button type="primary" v-if="reviewId" round size="large" @click="submitReview">修改评价</van-button>
@@ -112,6 +123,7 @@ export default {
       musicTheory: null, // 乐理
       memo: null, // 备注
       homeWork: null, // 作业
+      handHomework: null, // 是否完成作业
       hasLiaison: null,
       subjectNames: null,
       isReset: false,
@@ -152,6 +164,7 @@ export default {
           this.memo = res.data.data.courseScheduleReview.memo;
           this.homeWork = res.data.data.courseScheduleReview.homeWork;
           this.hasLiaison = res.data.data.courseScheduleReview.hasLiaison.toString();
+          this.handHomework = res.data.data.courseScheduleReview.handHomework.toString();
         }
       });
     } else {
@@ -194,10 +207,14 @@ export default {
         this.$toast("请输入备注");
         return;
       }
-      if (!this.homeWork) {
-        this.$toast("请布置作业");
-        return;
+      // 判断是否是编辑
+      if(!this.isReset) {
+        if (!this.homeWork) {
+          this.$toast("请布置作业");
+          return;
+        }
       }
+      
       if (!this.hasLiaison) {
         this.$toast("请勾选双向沟通");
         return;
@@ -211,6 +228,7 @@ export default {
         memo: this.memo, // 备注
         homeWork: this.homeWork,
         hasLiaison: this.hasLiaison,
+        handHomework: this.handHomework,
         courseScheduleId: this.courseId
       };
       if (this.reviewId) {

src/views/audition/ManageEvaluation.vue

@@ -172,14 +172,12 @@ export default {
     this.dateSection.showStartDate = this.timeFormat(
       this.dateSection.currentDate
     );
-    console.log(this.dateSection.showStartDate)
     this.dateEndSection.currentDate = new Date();
     this.dateEndSection.showEndDate = this.timeFormat(
       this.dateEndSection.currentDate
     );
     let evaluationList = sessionStorage.getItem('evaluationList');
      if(evaluationList) {
-       console.log(evaluationList)
        this.search = JSON.parse(evaluationList);
         this.dateSection.showStartDate = this.timeFormat(
           new Date(this.search.startTime.replace(/-/g, '/'))