Merge branch 'permission_lvtz' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-dev

src/pages/growthrecord/index.js

@@ -463,13 +463,13 @@ Page({
       })
       this.data.galleryPage = 1;
       this.data.galleryHasMore = true;
-      this.getGalleryList('init');
+      this.getGalleryList('down');
     } else if (this.data.bigtab == 2) {
       this.setData({
         hasmore: true,
       })
       this.data.clockPage = 1;
-      this.clockListGet('init');
+      this.clockListGet('down');
     }
   },
 	onReachBottom: function() { // Do something when page reach bottom.
@@ -2221,7 +2221,6 @@ Page({
       school_id: that.data.sid,
       student_id: this.data.consumerId,
     }).then((res) => {
-      wx.stopPullDownRefresh();
       const {
         code,
         data
@@ -2312,6 +2311,7 @@ Page({
                 galleryHasMore: false
               })
             }
+            wx.stopPullDownRefresh();
             break;
           case 'up': // 页面上拉刷新
             that.data.clockRecordIds = clockRecordIds;

src/pages/growthrecord/index.wxml

@@ -172,18 +172,18 @@
                     </view>
                 </block>
                 <list-loading loading="{{listLoading}}"></list-loading>
-                <sjdbottombar 
-                    showcontact="{{true}}" 
-                    keyword="growth" 
-                    pagetitle="我是机构，我也要沉淀学员作品 >" 
-                    pagetitletip ="立即使用"
-                    sharetitle="我要沉淀学员作品" 
-                    coverimg="service/works.png"
-                ></sjdbottombar>
             </view>
             <view class="empty-content-box" wx:if="{{emptyPage}}">
                 <empty-content text="暂无数据~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
             </view>
+            <sjdbottombar 
+                showcontact="{{true}}" 
+                keyword="growth" 
+                pagetitle="我是机构，我也要沉淀学员作品 >" 
+                pagetitletip ="立即使用"
+                sharetitle="我要沉淀学员作品" 
+                coverimg="service/works.png"
+            ></sjdbottombar>
         </view>
         <view class="sign-content" wx:if="{{bigtab == 3}}">
             <view>
@@ -224,7 +224,7 @@
                     </block>
                 </block>
                 <view class="empty-content-box" wx:if="{{galleryEmptyPage}}">
-                    <empty-content text="暂无课堂小评，快去通知老师点评吧～<" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
+                    <empty-content text="暂无课堂小评，快去通知老师点评吧～" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
                 </view>
                 <list-loading loading="{{galleryLoading}}"></list-loading>
                 <sjdbottombar 

src/pages/growthrecord/index.wxss

@@ -1060,6 +1060,7 @@ sjd-input-footer .sure{
 }
 .empty-content-box{
     height: 500rpx;
+    position: relative;
 }
 
 /* 趋势图的样式 */