From 02538d45065f780a0ee8f97747b2522e771ec28f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 26 May 2023 09:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qujing/AppLegalLearning/AppLegalLearning.vue      | 11 ++++++-----
 .../AppLegalLearning/components/GeneralLawExam.vue    |  2 +-
 .../AppLegalLearning/components/OnlineClass.vue       |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index 2bcc989..d41a149 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="AppLegalLearning" :style="{'height': screenHeight+'px'}">
+  <div class="AppLegalLearning" >
     <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 :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>
+      <OnlineClass ref="OnlineClass"  @to-detail="toDetail" v-show="currIndex == 0"></OnlineClass>
+      <GeneralLawExam ref="GeneralLawExam" @to-test="toTest" v-show="currIndex == 1"></GeneralLawExam>
     </div>
   </div>
 </template>
@@ -67,7 +67,7 @@ export default {
     },
     screenHeight(v) {
       if(v) {
-        this.height = this.screenHeight - 150
+        this.height = this.screenHeight - 190
       }
     }
   },
@@ -80,6 +80,7 @@ export default {
     },
   },
   onReachBottom() {
+    console.log(123)
     var refName = this.currIndex == 1 ? 'GeneralLawExam' : 'OnlineClass'
     this.$refs[refName].nextList()
   },
diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index 6e1084c..bfebdac 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -7,7 +7,7 @@
 
     <p class="all_test">全部考试</p>
     <div class="card_list" v-if="testList.length">
-      <scroll-view :style="{height: height + 'px'}" scroll-y>
+      <scroll-view scroll-y>
         <div class="card" v-for="item in testList" :key="item.id">
           <div class="card_top">
             <div class="card_title" :class="item.myRecord ? 'min-wid' : '' ">{{ item.examinationName }}</div>
diff --git a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
index fd107ff..a3badf9 100644
--- a/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
+++ b/src/project/qujing/AppLegalLearning/components/OnlineClass.vue
@@ -8,7 +8,7 @@
 
     <div class="card_list" v-if="classList.length">
       <!--  @scrolltolower="scrolltLower" -->
-      <scroll-view :style="{height: height + 'px'}" scroll-y>
+      <scroll-view scroll-y>
         <div class="card" v-for="item in classList" :key="item.id" @click="handleToDetail(item.id)">
           <div class="card_left">
             <img :src="item.pictureUrl" alt="" class="card-img">