skyblued 2 years ago
parent
commit
2df853f2d1

+ 6 - 7
src/views/courseList/index.tsx

@@ -48,7 +48,6 @@ export default defineComponent({
             state.platformApi + '/courseSchedule/myCoursewareDetail/' + route.query.id
           )
           if (Array.isArray(res?.data)) {
-            // data.list = res.data
             data.list = browserInfo.isApp ? await checkCoursewareCache(res.data) : res.data
           }
         } catch (error) {}
@@ -69,13 +68,13 @@ export default defineComponent({
         setCoursewareDetail(item)
         return
       }
+      if (!item.knowledgePointList) {
+        showConfirmDialog({
+          message: '该课件暂无知识点'
+        })
+        return
+      }
       if (!item.hasCache) {
-        if (!item.knowledgePointList) {
-          showConfirmDialog({
-            message: '该课件暂无知识点'
-          })
-          return
-        }
         if (browserInfo.isStudent || route.query.isdev) {
           try {
             await showConfirmDialog({

+ 11 - 3
src/views/mine-orchestra/my-photo/index.tsx

@@ -3,7 +3,7 @@ import OHeader from '@/components/o-header'
 import request from '@/helpers/request'
 import { state } from '@/state'
 import { Grid, GridItem, Image, List, Loading, showImagePreview } from 'vant'
-import { defineComponent, onMounted, reactive } from 'vue'
+import { defineComponent, onMounted, reactive, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import styles from './index.module.less'
 import iconImage from '../images/icon-photo-default.png'
@@ -35,7 +35,8 @@ export default defineComponent({
           data: {
             ...data.pages,
             orchestraId: props.orchestraId
-          }
+          },
+          hideLoading: true
         })
         if (Array.isArray(res?.data?.rows)) {
           data.list = data.list.concat(res.data.rows)
@@ -44,9 +45,16 @@ export default defineComponent({
             data.finished = true
           }
         }
-      } catch {}
+      } catch {
+        data.finished = true
+      }
       data.loading = false
     }
+    watch(() => props.orchestraId, () => {
+      data.pages.page = 1
+      data.finished = false
+      getList()
+    })
 
     // 预览图片
     const onShowImage = (index: number) => {

+ 8 - 2
src/views/mine-orchestra/orchestra-deeds/index.tsx

@@ -12,7 +12,7 @@ import {
   Swipe,
   SwipeItem
 } from 'vant'
-import { defineComponent, onMounted, reactive } from 'vue'
+import { defineComponent, onMounted, reactive, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import styles from './index.module.less'
 import iconStep from './images/icon-step.png'
@@ -56,7 +56,8 @@ export default defineComponent({
         const res = await request.post(`${globalState.platformApi}/orchestraStory/page`, {
           data: {
             orchestraId: props.orchestraId
-          }
+          },
+          hideLoading: true
         })
         state.listState.loading = false
         state.listState.refreshing = false
@@ -77,6 +78,11 @@ export default defineComponent({
         state.isClick = false
       }
     }
+    watch(() => props.orchestraId, () => {
+      state.params.page = 1
+      state.listState.finished = false
+      getList()
+    })
 
     onMounted(() => {
       getList()