下来 带动效

1

src/school/approval-manage/components/end-approval.tsx

@@ -77,7 +77,7 @@ export default defineComponent({
               style="min-height: 100vh;"
             >
               <List
-                loading-text=""
+                loading-text=" "
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"

src/school/approval-manage/components/wait-approval.tsx

@@ -81,7 +81,7 @@ export default defineComponent({
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"
-                loading-text=""
+                loading-text=" "
                 onLoad={getList}
               >
                 {list.value.map((item: any) => (

src/school/attendance/components/attend-student.tsx

@@ -1,6 +1,7 @@
 import OSearch from '@/components/o-search'
 import OEmpty from '@/components/o-empty'
 import dayjs from 'dayjs'
+import OFullRefresh from '@/components/o-full-refresh'
 import {
   Icon,
   Popover,
@@ -213,8 +214,13 @@ export default defineComponent({
         {/* </OSticky> */}
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
+              loading-text=" "
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
@@ -224,7 +230,7 @@ export default defineComponent({
                 <StudentAttItem item={item}></StudentAttItem>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty></OEmpty>
         )}

src/school/attendance/components/attend-teacher.tsx

@@ -20,6 +20,7 @@ import request from '@/helpers/request'
 import { state as globalState } from '@/state'
 import { courseEmnu } from '@/constant'
 import TeacherAttItem from '../modals/teacherAtt-item'
+import OFullRefresh from '@/components/o-full-refresh'
 export default defineComponent({
   name: 'attend-student',
   props: {
@@ -210,8 +211,13 @@ export default defineComponent({
         </Sticky>
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
+              loading-text=" "
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
@@ -221,7 +227,7 @@ export default defineComponent({
                 <TeacherAttItem item={item}></TeacherAttItem>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty />
         )}

src/school/attendance/student-att-day.tsx

@@ -11,6 +11,7 @@ import {
   ActionSheet,
   showToast
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted } from 'vue'
 import sanIcon from './images/san-icon.png'
 import { useRoute, useRouter } from 'vue-router'
@@ -128,8 +129,13 @@ export default defineComponent({
           modelValue={forms.nickName}
         ></OSearch>
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
+              loading-text=" "
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
@@ -139,7 +145,7 @@ export default defineComponent({
                 <StudentCell item={item}></StudentCell>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty />
         )}

src/school/ranking-list/components/day-bang.tsx

@@ -13,6 +13,7 @@ import {
   showToast,
   Sticky
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './timer-bang.module.less'
@@ -215,18 +216,23 @@ export default defineComponent({
         {/* </OSticky> */}
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
               onLoad={getList}
+              loading-text=" "
             >
               {list.value.map((item: any, index: number) => (
                 <RankItem item={item} type="day" index={index + 1}></RankItem>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty />
         )}

src/school/ranking-list/components/timer-bang.tsx

@@ -13,6 +13,7 @@ import {
   showToast,
   Sticky
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './timer-bang.module.less'
@@ -214,18 +215,19 @@ export default defineComponent({
         {/* </OSticky> */}
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh}>
+          <OFullRefresh v-model:modelValue={refreshing.value} onRefresh={onRefresh}>
             <List
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
               onLoad={getList}
+              loading-text=" "
             >
               {list.value.map((item: any, index: number) => (
                 <RankItem item={item} type="time" index={index + 1}></RankItem>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty />
         )}

src/student/ranking-list/components/day-bang.tsx

@@ -13,6 +13,7 @@ import {
   showToast,
   Sticky
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted, watch, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './timer-bang.module.less'
@@ -115,12 +116,13 @@ export default defineComponent({
       <>
         {showContact.value ? (
           <div>
-            <PullRefresh
-              v-model={refreshing.value}
+            <OFullRefresh
+              v-model:modelValue={refreshing.value}
               onRefresh={onRefresh}
               style="min-height: 100vh;"
             >
               <List
+                loading-text=" "
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"
@@ -130,7 +132,7 @@ export default defineComponent({
                   <RankItem item={item} type="day" index={index + 1}></RankItem>
                 ))}
               </List>
-            </PullRefresh>
+            </OFullRefresh>
             <MyRankingItem item={myInfo.value}></MyRankingItem>
           </div>
         ) : (

src/student/ranking-list/components/timer-bang.tsx

@@ -13,6 +13,7 @@ import {
   showToast,
   Sticky
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted, watch, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './timer-bang.module.less'
@@ -114,8 +115,8 @@ export default defineComponent({
 
         {showContact.value ? (
           <div>
-            <PullRefresh
-              v-model={refreshing.value}
+            <OFullRefresh
+              v-model:modelValue={refreshing.value}
               onRefresh={onRefresh}
               style="min-height: 100vh;"
             >
@@ -124,12 +125,13 @@ export default defineComponent({
                 finished={finished.value}
                 finished-text="没有更多了"
                 onLoad={getList}
+                loading-text=" "
               >
                 {list.value.map((item: any, index: number) => (
                   <RankItem item={item} type="time" index={index + 1}></RankItem>
                 ))}
               </List>
-            </PullRefresh>
+            </OFullRefresh>
             <MyRankingItem item={myInfo.value}></MyRankingItem>
           </div>
         ) : (

src/teacher/attendance/index.tsx

@@ -13,6 +13,7 @@ import {
   showToast,
   Sticky
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import { defineComponent, reactive, ref, onMounted, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './index.module.less'
@@ -199,8 +200,13 @@ export default defineComponent({
         </OSticky>
 
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
+              loading-text=" "
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
@@ -210,7 +216,7 @@ export default defineComponent({
                 <TeacherAttItem item={item}></TeacherAttItem>
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty />
         )}

src/views/accompany/music-list.tsx

@@ -4,6 +4,7 @@ import request from '@/helpers/request'
 import { browser } from '@/helpers/utils'
 import { state } from '@/state'
 import { useRect } from '@vant/use'
+import OFullRefresh from '@/components/o-full-refresh'
 import {
   Cell,
   CellGroup,
@@ -48,7 +49,7 @@ export default defineComponent({
     })
     const option1 = computed(() => {
       const v1: any = props.musicTree.find((n: any) => n.id == route.query.categorieid)
-    //   console.log('🚀 ~ v1', v1)
+      //   console.log('🚀 ~ v1', v1)
       if (Array.isArray(v1?.musicSheetCategoriesList)) {
         const list = v1.musicSheetCategoriesList.map((m: any) => {
           if (!data.value1) {
@@ -135,7 +136,7 @@ export default defineComponent({
     //进入云教练
     const openView = (item: any) => {
       let src = `${location.origin}/orchestra-music-score/?id=${item.id}`
-      console.log("🚀 ~ 去云教练的src", src)
+      console.log('🚀 ~ 去云教练的src', src)
       postMessage({
         api: 'openAccompanyWebView',
         content: {
@@ -149,11 +150,11 @@ export default defineComponent({
     }
     const headeRef = ref()
     const headerData = reactive({
-        height: 0
+      height: 0
     })
     onMounted(() => {
-        const rect = useRect(headeRef)
-        headerData.height = rect.height
+      const rect = useRect(headeRef)
+      headerData.height = rect.height
     })
     return () => (
       <div class={styles['accompany-music-list']}>
@@ -203,7 +204,7 @@ export default defineComponent({
             </Search>
           </div>
         </div>
-        {headerData.height && <div style={{height: headerData.height + 'px'}}></div>}
+        {headerData.height && <div style={{ height: headerData.height + 'px' }}></div>}
         {/* <Cell
           center
           title="胜强测试"
@@ -227,8 +228,13 @@ export default defineComponent({
             }
           }}
         ></Cell> */}
-        <PullRefresh v-model:modelValue={data.refreshing} onRefresh={onRefresh}>
+        <OFullRefresh
+          v-model:modelValue={data.refreshing}
+          onRefresh={onRefresh}
+          style="min-height: 100vh;"
+        >
           <List
+            loading-text=" "
             immediateCheck={false}
             v-model:loading={data.loading}
             v-model:finished={data.finished}
@@ -251,7 +257,7 @@ export default defineComponent({
               })}
             </CellGroup>
           </List>
-        </PullRefresh>
+        </OFullRefresh>
 
         {!data.loading && !data.list.length && <OEmpty tips="空空如也" />}
       </div>

src/views/exercise-record/exercis-detail.tsx

@@ -14,6 +14,7 @@ import {
   Dialog,
   Image
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
 import DetailItem from './modals/detail-item'
 import { defineComponent, onMounted, reactive, ref, onDeactivated } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -233,12 +234,13 @@ export default defineComponent({
             </div>
           </div>
           {showContact.value ? (
-            <PullRefresh
-              v-model={refreshing.value}
+            <OFullRefresh
+              v-model:modelValue={refreshing.value}
               onRefresh={onRefresh}
               style="min-height: 100vh;"
             >
               <List
+                loading-text=" "
                 v-model:loading={loading.value}
                 finished={finished.value}
                 finished-text="没有更多了"
@@ -248,7 +250,7 @@ export default defineComponent({
                   <DetailItem item={item} />
                 ))}
               </List>
-            </PullRefresh>
+            </OFullRefresh>
           ) : (
             <OEmpty />
           )}

src/views/exercise-record/index.tsx

@@ -16,6 +16,8 @@ import {
   ActionSheet,
   showToast
 } from 'vant'
+import OFullRefresh from '@/components/o-full-refresh'
+
 import StudentItem from './modals/student-item'
 import { defineComponent, reactive, ref, onMounted } from 'vue'
 import { state as globalState } from '@/state'
@@ -281,8 +283,13 @@ export default defineComponent({
           </div>
         </OSticky>
         {showContact.value ? (
-          <PullRefresh v-model={refreshing.value} onRefresh={onRefresh} style="min-height: 100vh;">
+          <OFullRefresh
+            v-model:modelValue={refreshing.value}
+            onRefresh={onRefresh}
+            style="min-height: 100vh;"
+          >
             <List
+              loading-text=" "
               v-model:loading={loading.value}
               finished={finished.value}
               finished-text="没有更多了"
@@ -292,7 +299,7 @@ export default defineComponent({
                 <StudentItem item={item} forms={forms} />
               ))}
             </List>
-          </PullRefresh>
+          </OFullRefresh>
         ) : (
           <OEmpty></OEmpty>
         )}