Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/index/learn.vue

@@ -9,11 +9,11 @@
                 :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
         </view>
         <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
-            style="height: 755rpx;padding-top: 30rpx;">
+            style="height: 100%;padding-top: 30rpx;">
             <swiper-item class="swiper-item">
                 <scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
                     <view class="jf-currency-class">
-                        <view class="class1" @click="goToPrint">
+                        <view class="class1" style="position: relative;" @click="goToPrint">
                             <image class="jf-img" :src="rule.pic" mode=""></image>
                             <view class="right u-padding-top-10 u-padding-bottom-14 jf-right">
                                 <view class="u-font-32 font-bold u-margin-left-30 u-margin-top-30">充电桩交付规范</view>
@@ -776,7 +776,7 @@
     .notice {
         /* border: #808080 solid 2rpx; */
         width: 100%;
-        height: 400rpx;
+        height: 370rpx;
         margin-top: 36rpx;
         overflow: hidden;
         background-color: #ffffff;
@@ -867,8 +867,8 @@
     .jf-img {
         width: 160rpx;
         height: 200rpx;
-        position: fixed;
-        top: 20rpx;
+        position: absolute;
+        top: -45rpx;
         left: 30rpx;
     }