From ada042974b1e25590cf999195e88611432198071 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 19 May 2023 10:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=8D=95=E8=AF=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=99=AE=E6=B3=95=E8=80=83=E8=AF=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conv/AppHealthReport/AppHealthReport.vue   |  2 +-
 src/mods/conv/AppPhotoAlbum/AppPhotoAlbum.vue  |  2 +-
 .../AppReturnHomeRegister.vue                  |  2 +-
 .../AppVillageActivity/AppVillageActivity.vue  |  2 +-
 .../conv/AppVillagerDiscussion/VoteList.vue    |  2 +-
 .../AppEnteringCommunity/AppPhotoAlbum.vue     |  2 +-
 .../grid/AppHealthReport/AppHealthReport.vue   |  2 +-
 .../AppReturnHomeRegister.vue                  |  2 +-
 .../AppEnteringCommunity/AppPhotoAlbum.vue     |  2 +-
 .../AppGetewayRegister/AppGetewayRegister.vue  |  2 +-
 .../AppHealthReport/AppHealthReport.vue        |  2 +-
 .../AppReturnHomeRegister.vue                  |  2 +-
 .../AppVillageActivity/AppVillageActivity.vue  |  2 +-
 .../AppLegalLearning/AppLegalLearning.vue      | 18 +++++++++++++-----
 .../components/GeneralLawExam.vue              | 14 +++++++++++---
 .../components/OnlineClass.vue                 | 13 ++++++++-----
 .../AppVillageActivity/AppVillageActivity.vue  |  2 +-
 src/project/tianfuxing/AppHome/Culture.vue     |  2 +-
 src/project/tianfuxing/AppHome/PhotoReport.vue |  2 +-
 src/project/tianfuxing/AppHome/Ranking.vue     |  2 +-
 src/project/tianfuxing/AppHome/StoreDetail.vue |  2 +-
 21 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/mods/conv/AppHealthReport/AppHealthReport.vue b/src/mods/conv/AppHealthReport/AppHealthReport.vue
index 4b2219b..2825da9 100644
--- a/src/mods/conv/AppHealthReport/AppHealthReport.vue
+++ b/src/mods/conv/AppHealthReport/AppHealthReport.vue
@@ -119,7 +119,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .returnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/mods/conv/AppPhotoAlbum/AppPhotoAlbum.vue b/src/mods/conv/AppPhotoAlbum/AppPhotoAlbum.vue
index dd36158..af0e48e 100644
--- a/src/mods/conv/AppPhotoAlbum/AppPhotoAlbum.vue
+++ b/src/mods/conv/AppPhotoAlbum/AppPhotoAlbum.vue
@@ -222,7 +222,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .photo {
   width: 100vw;
   overflow-x: hidden;
diff --git a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
index a783973..d838521 100644
--- a/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/mods/conv/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -103,7 +103,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .returnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/mods/conv/AppVillageActivity/AppVillageActivity.vue b/src/mods/conv/AppVillageActivity/AppVillageActivity.vue
index 05c0115..8f2cf2f 100644
--- a/src/mods/conv/AppVillageActivity/AppVillageActivity.vue
+++ b/src/mods/conv/AppVillageActivity/AppVillageActivity.vue
@@ -111,7 +111,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .activity {
   padding-bottom: 40px;
 
diff --git a/src/mods/conv/AppVillagerDiscussion/VoteList.vue b/src/mods/conv/AppVillagerDiscussion/VoteList.vue
index 2836d50..fef7894 100644
--- a/src/mods/conv/AppVillagerDiscussion/VoteList.vue
+++ b/src/mods/conv/AppVillagerDiscussion/VoteList.vue
@@ -76,7 +76,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .user {
   padding: 32px 32px 40px;
 
diff --git a/src/project/dongsheng/AppEnteringCommunity/AppPhotoAlbum.vue b/src/project/dongsheng/AppEnteringCommunity/AppPhotoAlbum.vue
index 4a22eac..9c85443 100644
--- a/src/project/dongsheng/AppEnteringCommunity/AppPhotoAlbum.vue
+++ b/src/project/dongsheng/AppEnteringCommunity/AppPhotoAlbum.vue
@@ -222,7 +222,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .photo {
   width: 100vw;
   overflow-x: hidden;
diff --git a/src/project/grid/AppHealthReport/AppHealthReport.vue b/src/project/grid/AppHealthReport/AppHealthReport.vue
index ca4bd45..ccc206c 100644
--- a/src/project/grid/AppHealthReport/AppHealthReport.vue
+++ b/src/project/grid/AppHealthReport/AppHealthReport.vue
@@ -169,7 +169,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .returnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/project/grid/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/project/grid/AppReturnHomeRegister/AppReturnHomeRegister.vue
index 944d9c5..3cabe87 100644
--- a/src/project/grid/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/project/grid/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -155,7 +155,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .AppReturnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/project/huizhili/AppEnteringCommunity/AppPhotoAlbum.vue b/src/project/huizhili/AppEnteringCommunity/AppPhotoAlbum.vue
index 4a22eac..9c85443 100644
--- a/src/project/huizhili/AppEnteringCommunity/AppPhotoAlbum.vue
+++ b/src/project/huizhili/AppEnteringCommunity/AppPhotoAlbum.vue
@@ -222,7 +222,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .photo {
   width: 100vw;
   overflow-x: hidden;
diff --git a/src/project/pingchang/AppGetewayRegister/AppGetewayRegister.vue b/src/project/pingchang/AppGetewayRegister/AppGetewayRegister.vue
index 35bdc13..f65ae24 100644
--- a/src/project/pingchang/AppGetewayRegister/AppGetewayRegister.vue
+++ b/src/project/pingchang/AppGetewayRegister/AppGetewayRegister.vue
@@ -103,7 +103,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .AppGetewayRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
index 04bd3fe..563ea7c 100644
--- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue
+++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
@@ -113,7 +113,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .returnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
index 1525073..28804f4 100644
--- a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
+++ b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -103,7 +103,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .returnHomeRegister {
   padding: 0 0 150px 0;
 
diff --git a/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue b/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue
index b099666..06bb7f9 100644
--- a/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue
+++ b/src/project/pingchang/AppVillageActivity/AppVillageActivity.vue
@@ -111,7 +111,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .activity {
   padding-bottom: 40px;
 
diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index cd36867..aef572a 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="AppLegalLearning">
+  <div class="AppLegalLearning" :style="{'height': screenHeight+'px'}">
     <u-navbar title="普法学习" title-color="#000" title-size="32" :background="{background: '#f4f6fa'}" :is-back="false" :title-bold="true"></u-navbar>
     <div class="tabs_box">
       <u-tabs :list="tabs" font-size="32" bg-color="#f3f5f7" inactive-color="#999999"
      :active-item-style="{color: '#222222'}" :is-scroll="true" :current="currIndex" @change="(i) => (currIndex = i)"> </u-tabs>
     </div>
-    <div>
+    <div :style="{'height': (screenHeight-125)+'px'}">
       <OnlineClass ref="OnlineClass" :height="height" @to-detail="toDetail" v-show="currIndex == 0"></OnlineClass>
       <GeneralLawExam ref="GeneralLawExam" :height="height" @to-test="toTest" v-show="currIndex == 1"></GeneralLawExam>
     </div>
@@ -67,7 +67,7 @@ export default {
     },
     screenHeight(v) {
       if(v) {
-        this.height = this.screenHeight - 250
+        this.height = this.screenHeight - 200
       }
     }
   },
@@ -78,15 +78,23 @@ export default {
     toDetail(id) {
       uni.navigateTo({url: "./classDetail?id=" + id})
     },
-  }
+  },
+  onReachBottom() {
+    var refName = this.currIndex == 1 ? 'GeneralLawExam' : 'OnlineClass'
+    this.$refs[refName].nextList()
+  },
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .AppGeneralLawExam {
+  height: 100vh;
   .tabs_box {
     height: 100px;
     line-height: 100px;
   }
+  .component-content {
+    height: 100%;
+  }
 }
 </style>
diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index de4e53e..e02838a 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -84,22 +84,30 @@ export default {
       testList: [],
       testId: '',
       studyDuration: '',
+      pages: 2
     }
   },
   computed: {
     ...mapState(['user'])
   },
   methods: {
+    nextList() {
+      this.current ++
+      this.getList()
+    },
     getList() {
+      if(this.current > this.pages) return
       this.$instance.post(`/app/appexaminationinfo/listForXCX`, null, {
         params: {
           current: this.current,
-          size: 3000,
+          size: 10,
           title: this.title
         }
       }).then(res=> {
         if(res?.data) {
-          this.testList = res.data.records
+          // this.testList = res.data.records
+          this.testList = this.current==1? res.data.records: [...this.testList,...res.data.records]
+          this.pages = res.data.pages
           this.getStudyDuration()
         }
       })
@@ -186,7 +194,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .GeneralLawExam {
   .search_box {
     margin: 24px 0;
diff --git a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
index d4b3017..d401a97 100644
--- a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
+++ b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
@@ -35,12 +35,18 @@ export default {
   data() {
     return {
       current: 1,
+      pages: 2,
       title: '',
       classList: [],
     }
   },
   methods: {
+    nextList() {
+      this.current ++
+      this.getList()
+    },
     getList() {
+      if(this.current > this.pages) return
       this.$instance.post(`/app/appcourseinfo/listByApplet`, null, {
         params: {
           current: this.current,
@@ -50,6 +56,7 @@ export default {
       }).then(res=> {
         if(res?.data) {
           this.classList = this.current==1? res.data.records: [...this.classList,...res.data.records]
+          this.pages = res.data.pages
           // this.classList = res.data.records
         }
       })
@@ -58,14 +65,10 @@ export default {
       this.$emit('toDetail',id)
     },
   },
-  onReachBottom() {
-    this.current ++
-    this.getList()
-  },
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .OnlineClass {
   .search_box {
     margin: 24px 0;
diff --git a/src/project/qujing/AppVillageActivity/AppVillageActivity.vue b/src/project/qujing/AppVillageActivity/AppVillageActivity.vue
index 8b907cc..82f6dd9 100644
--- a/src/project/qujing/AppVillageActivity/AppVillageActivity.vue
+++ b/src/project/qujing/AppVillageActivity/AppVillageActivity.vue
@@ -111,7 +111,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .activity {
   padding-bottom: 40px;
 
diff --git a/src/project/tianfuxing/AppHome/Culture.vue b/src/project/tianfuxing/AppHome/Culture.vue
index ffc159e..f900b96 100644
--- a/src/project/tianfuxing/AppHome/Culture.vue
+++ b/src/project/tianfuxing/AppHome/Culture.vue
@@ -210,7 +210,7 @@ export default {
 }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .photo {
   width: 100vw;
   overflow-x: hidden;
diff --git a/src/project/tianfuxing/AppHome/PhotoReport.vue b/src/project/tianfuxing/AppHome/PhotoReport.vue
index cf58623..81a101c 100644
--- a/src/project/tianfuxing/AppHome/PhotoReport.vue
+++ b/src/project/tianfuxing/AppHome/PhotoReport.vue
@@ -222,7 +222,7 @@
   }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
   .photo {
     width: 100vw;
     overflow-x: hidden;
diff --git a/src/project/tianfuxing/AppHome/Ranking.vue b/src/project/tianfuxing/AppHome/Ranking.vue
index 6e7bd0d..5efa380 100644
--- a/src/project/tianfuxing/AppHome/Ranking.vue
+++ b/src/project/tianfuxing/AppHome/Ranking.vue
@@ -110,7 +110,7 @@
   }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
 .photo {
   width: 100vw;
   overflow-x: hidden;
diff --git a/src/project/tianfuxing/AppHome/StoreDetail.vue b/src/project/tianfuxing/AppHome/StoreDetail.vue
index d15f3df..9d85963 100644
--- a/src/project/tianfuxing/AppHome/StoreDetail.vue
+++ b/src/project/tianfuxing/AppHome/StoreDetail.vue
@@ -103,7 +103,7 @@
   }
 </script>
 
-<style lang="scss" socped>
+<style lang="scss" scoped>
   .StoreDetail {
     padding-bottom: 20px;