03/15 12:01

优化返回

src/views/audition/CourseEvaluation.vue

@@ -11,7 +11,7 @@
     </van-cell-group>
     <van-cell-group>
       <van-field
-      required
+        required
         rows="4"
         class="textarea"
         v-model="teachingMaterial"
@@ -23,22 +23,22 @@
       />
     </van-cell-group>
     <van-cell-group>
-      <van-field   required label="曲目" input-align="right" placeholder="请输入曲目名" v-model="song" />
+      <van-field required label="曲目" input-align="right" placeholder="请输入曲目名" v-model="song" />
     </van-cell-group>
     <van-cell-group>
       <van-cell>
         <template slot="title">
           <div class="title-item">
             <span class="text">发音</span>
-            <van-rate  v-model="pronunciation" :size="25" void-color="#eee" void-icon="star" />
+            <van-rate v-model="pronunciation" :size="25" void-color="#eee" void-icon="star" />
           </div>
           <div class="title-item">
             <span class="text">节奏</span>
-            <van-rate  :size="25" void-color="#eee" v-model="tempo" void-icon="star" />
+            <van-rate :size="25" void-color="#eee" v-model="tempo" void-icon="star" />
           </div>
           <div class="title-item">
             <span class="text">乐理</span>
-            <van-rate  :size="25" v-model="musicTheory" void-color="#eee" void-icon="star" />
+            <van-rate :size="25" v-model="musicTheory" void-color="#eee" void-icon="star" />
           </div>
         </template>
       </van-cell>
@@ -46,7 +46,7 @@
     <van-cell-group>
       <van-field
         rows="4"
-          required
+        required
         class="textarea"
         maxlength="255"
         v-model="memo"
@@ -73,7 +73,7 @@
     <van-cell-group>
       <van-cell title="是否完成双向沟通" value-class="twoConnect">
         <template slot="default">
-          <van-radio-group   required v-model="hasLiaison" direction="horizontal">
+          <van-radio-group required v-model="hasLiaison" direction="horizontal">
             <van-radio name="1">是</van-radio>
             <van-radio name="0">否</van-radio>
           </van-radio-group>
@@ -113,13 +113,15 @@ export default {
       memo: null, // 备注
       homeWork: null, // 作业
       hasLiaison: null,
-      subjectNames:null,
-      isReset:false
+      subjectNames: null,
+      isReset: false,
+      isInside: false
     };
   },
   created() {
     this.courseId = this.$route.query.id;
-    this.reviewId =parseInt( this.$route.query.reviewId);
+    this.reviewId = parseInt(this.$route.query.reviewId);
+    this.isInside = this.$route.query.isInside;
     if (!this.courseId) {
       this.$toast("课程信息错误");
     }
@@ -137,18 +139,19 @@ export default {
             "-" +
             res.data.data.teacherClassHeadInfo.endClassTime;
           this.subjectNames = res.data.data.teacherClassHeadInfo.subjectNames;
-          this.classGroupName = res.data.data.teacherClassHeadInfo.classGroupName;
+          this.classGroupName =
+            res.data.data.teacherClassHeadInfo.classGroupName;
 
           // 评价内容
-               this.teachingMaterial = res.data.data.courseScheduleReview.teachingMaterial 
-               this.song = res.data.data.courseScheduleReview.song 
-               this.pronunciation = res.data.data.courseScheduleReview.pronunciation 
-               this.tempo = res.data.data.courseScheduleReview.tempo 
-               this.musicTheory = res.data.data.courseScheduleReview.musicTheory 
-               this.memo = res.data.data.courseScheduleReview.memo 
-               this.homeWork = res.data.data.courseScheduleReview.homeWork 
-               this.hasLiaison = res.data.data.courseScheduleReview.hasLiaison.toString() 
-
+          this.teachingMaterial =
+            res.data.data.courseScheduleReview.teachingMaterial;
+          this.song = res.data.data.courseScheduleReview.song;
+          this.pronunciation = res.data.data.courseScheduleReview.pronunciation;
+          this.tempo = res.data.data.courseScheduleReview.tempo;
+          this.musicTheory = res.data.data.courseScheduleReview.musicTheory;
+          this.memo = res.data.data.courseScheduleReview.memo;
+          this.homeWork = res.data.data.courseScheduleReview.homeWork;
+          this.hasLiaison = res.data.data.courseScheduleReview.hasLiaison.toString();
         }
       });
     } else {
@@ -167,38 +170,38 @@ export default {
   },
   methods: {
     submitReview() {
-      if(!this.teachingMaterial){
-        this.$toast('请填写教材')
-        return
-      } 
-       if(!this.song){
-        this.$toast('请填写曲目')
-         return
-      } 
-       if(!this.pronunciation){
-        this.$toast('请给发音打分')
-         return
-      } 
-       if(!this.tempo){
-        this.$toast('请给节奏打分')
-         return
-      } 
-       if(!this.musicTheory){
-        this.$toast('请给乐理打分')
-         return
-      } 
-       if(!this.memo){
-        this.$toast('请输入备注')
-         return
-      } 
-       if(!this.homeWork){
-        this.$toast('请布置作业')
-         return
-      } 
-       if(!this.hasLiaison){
-        this.$toast('请勾选双向沟通')
-         return
-      } 
+      if (!this.teachingMaterial) {
+        this.$toast("请填写教材");
+        return;
+      }
+      if (!this.song) {
+        this.$toast("请填写曲目");
+        return;
+      }
+      if (!this.pronunciation) {
+        this.$toast("请给发音打分");
+        return;
+      }
+      if (!this.tempo) {
+        this.$toast("请给节奏打分");
+        return;
+      }
+      if (!this.musicTheory) {
+        this.$toast("请给乐理打分");
+        return;
+      }
+      if (!this.memo) {
+        this.$toast("请输入备注");
+        return;
+      }
+      if (!this.homeWork) {
+        this.$toast("请布置作业");
+        return;
+      }
+      if (!this.hasLiaison) {
+        this.$toast("请勾选双向沟通");
+        return;
+      }
       let obj = {
         teachingMaterial: this.teachingMaterial, //教材
         song: this.song, // 曲目
@@ -215,7 +218,11 @@ export default {
         updateReviewInfo(obj).then(res => {
           this.$toast("修改成功");
           setTimeout(res => {
-            this.onAppBack();
+            if (this.isInside) {
+              this.$router.push({ path: "/manageEvaluation" });
+            } else {
+              this.onAppBack();
+            }
           }, 1000);
         });
       } else {
@@ -223,7 +230,11 @@ export default {
           if (res.data.code == 200) {
             this.$toast("提交成功");
             setTimeout(res => {
-              this.onAppBack();
+              if (this.isInside) {
+                this.$router.push({ path: "/manageEvaluation" });
+              } else {
+                this.onAppBack();
+              }
             }, 1000);
           }
         });

src/views/audition/ManageEvaluation.vue

@@ -304,7 +304,7 @@ export default {
     submitReview(item) {
       this.$router.push({
         path: "/courseEvaluation",
-        query: { id: item.id, reviewId: item.reviewId }
+        query: { id: item.id, reviewId: item.reviewId,isInside:true }
       });
     }
   },