Merge branch 'iteration_1.3.4' into dev

src/student/share-active/track-review-activity/index.tsx

@@ -62,18 +62,17 @@ export default defineComponent({
     },
     // this.activeInfo.activityRewardList
     rewardList() {
-      let activityRewardList = this.activeInfo
-      activityRewardList = activityRewardList?.activityRewardList
-      console.log(activityRewardList)
-      let list = activityRewardList || []
-      if (activityRewardList && activityRewardList.length > 0) {
-        const last = activityRewardList.sort((a: any, b: any) => {
+      const activeInfo: any = this.activeInfo
+      // activityRewardList = activityRewardList?.activityRewardList
+      // console.log(activityRewardList)
+      let list = activeInfo.activityRewardList || []
+      if (list && list.length > 0) {
+        const last = list.sort((a: any, b: any) => {
           return Number(a.group) < Number(b.group) ? -1 : 1
         })
         list = this.groupBy(last, (item: any) => {
           return [item.group]
         })
-        console.log(list, 'list')
       }
       return list || []
     }

src/teacher/share-page/track-review-activity/index.tsx

@@ -31,18 +31,17 @@ export default defineComponent({
       return activeInfo.activityMusicVoList || []
     },
     rewardList() {
-      let activityRewardList = this.activeInfo
-      activityRewardList = activityRewardList?.activityRewardList
+      const activeInfo: any = this.activeInfo
+      // activityRewardList = activityRewardList?.activityRewardList
       // console.log(activityRewardList)
-      let list = activityRewardList || []
-      if (activityRewardList && activityRewardList.length > 0) {
-        const last = activityRewardList.sort((a: any, b: any) => {
+      let list = activeInfo.activityRewardList || []
+      if (list && list.length > 0) {
+        const last = list.sort((a: any, b: any) => {
           return Number(a.group) < Number(b.group) ? -1 : 1
         })
         list = this.groupBy(last, (item: any) => {
           return [item.group]
         })
-        console.log(list, 'list')
       }
       return list || []
     }