Merge branch 'iterationApp' into dev

src/views/afterClassEvaluate/detail.vue

@@ -10,7 +10,7 @@
       <van-field
         rows="1"
         type="textarea"
-        :disabled="isReview"
+        :disabled="isReview || this.groupType === 'MUSIC'"
         v-model="memo"
         placeholder="请输入本课程教学内容"
       />
@@ -83,6 +83,7 @@ export default {
       id: query.id,
       isInside: query.isInside,
       evaluateFlag: query.evaluateFlag,
+      groupType: query.groupType,
       reviewId: query.reviewId,
       isAssignHomework: 0, // 是否有布置作业,0 => 否 1 => 是
       enableAssignHomework: 0, // 是否要布置作业  0 否  1 是
@@ -105,7 +106,6 @@ export default {
 		this.tenantId = sessionStorage.getItem('tenantId') || null
 	},
   async mounted() {
-    document.title = '课后评价详情';
     try {
       // 获取是否有布置作业
       const homeWork = await checkeIsAssignHomework({ courseScheduleId: this.id });
@@ -136,7 +136,10 @@ export default {
         const result = res.data
         tempMemo = result.courseScheduleReview.memo
       }
-      this.memo = tempMemo || '该课程未设置教学内容'
+      this.memo = tempMemo
+      if(this.groupType === 'MUSIC' || this.isReview) {
+        this.memo = this.memo || '该课程未设置教学内容'
+      }
       //  else {
       //   const res = await getCourseInfoHead({
       //     courseId: this.id

src/views/afterClassEvaluate/index.vue

@@ -59,7 +59,8 @@ export default {
   methods: {
     onItem(item) {
       sessionStorage.setItem('afterClassEvaluate', this.params.evaluateFlag)
-      if(this.params.evaluateFlag === 0 && item.groupType == 'MUSIC') {
+      // 待评价 线下乐团课
+      if(this.params.evaluateFlag === 0 && item.groupType == 'MUSIC' && item.teachMode == 'OFFLINE') {
         postMessage({ api: 'openMusicEvaluate', content: { courseScheduleId: item.courseScheduleId, masterTeacherFlag: item.masterTeacherFlag} })
       } else {
         this.$router.push({
@@ -68,6 +69,7 @@ export default {
             id: item.courseScheduleId,
             evaluateFlag: this.params.evaluateFlag,
             reviewId: item.courseScheduleReviewId,
+            groupType: item.groupType,
             isInside: true // 判断是否是内部跳转
           }
         })
@@ -107,6 +109,12 @@ export default {
         this.dataShow = false;
       }
     },
+    reload() {
+      let isHidden = document.hidden;
+      if (!isHidden) {
+        this.getList()
+      }
+    }
   },
   async mounted() {
     if (browser().android || browser().iPhone) {
@@ -114,16 +122,13 @@ export default {
     }
     await this.getList()
 
-    let that = this
-    listenerMessage({
-      api: 'backRefreshPage',
-      callback: () => {
-        that.onTabChange(that.params.evaluateFlag)
-      }
-    })
+    document.addEventListener('visibilitychange', this.reload)
 
     document.title = '课后评价';
   },
+  beforeDestroy() {
+    document.removeEventListener('visibilitychange', this.reload)
+  }
 };
 </script>