Merge remote-tracking branch 'origin/square' into wxl-develop

src/pages/papersquare/index.js

@@ -366,6 +366,7 @@ Page({
    */
   onPullDownRefresh: function () {
     if(this.data.bigtab==2){
+      wx.stopPullDownRefresh();
       return
     }
     this.setData({
@@ -401,13 +402,6 @@ Page({
     wx.showLoading({
       title: '数据加载中'
     })
-    // let sort_type = 3;
-    // let clocktype = Number(this.data.clocktype);
-    // if(clocktype==1){
-    //   sort_type = 3
-    // }else if(clocktype == 2){
-    //   sort_type = 4
-    // }
     clockList({
       page: that.data.clockPage,
       perPage: that.data.perPage,
@@ -470,6 +464,7 @@ Page({
               clockList: data.list || [],
               clockRecordIds
             }, () => {
+              wx.stopPullDownRefresh();
               if (that.data.clockTotal > that.data.clockList.length) {
                 let clockPage = that.data.clockPage + 1;
                 that.setData({

src/pages/papersquare/index.json

 {
   "navigationBarTitleText": "习作广场",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "go-top": "../../../components/goTop",
     "list-loading": "../../../components/listloading",

src/pages/papersquare/index.wxml

 <wxs src="../../../filter/index.wxs" module="filter" />
 <view class="container" style="background: {{bigtab == 2?'#F7F7F9': '#fff'}}">
 
-    <view class="header-tab" style="background: {{bigtab==2?'#FFD146':''}}">
+    <view class="header-tab {{bigtab==2?'header-tab2':'header-tab1'}}">
         <view class="tab-item {{bigtab == 1? 'active': ''}}" data-type="1" bindtap="bigTapEvent">今日打卡</view>
         <view class="tab-item {{bigtab == 2? 'active active2': ''}}" data-type="2" bindtap="bigTapEvent">学员表彰墙</view>
     </view>

src/pages/papersquare/index.wxss

 .container{
     font-size: 28rpx;
     min-height: 100vh;
-    padding-bottom: 120rpx;
+    padding: 90rpx 0 120rpx;
 }
 .header-tab{
     width: 100%;
     height: 90rpx;
     display: flex;
+    position: fixed;
+    top: 0;
+    z-index: 9;
+}
+.header-tab2{
+    background: #FFD146;
+}
+.header-tab1{
+    background: #fff;
     box-shadow: 0 2px 16rpx 0 rgba(0, 0, 0, 0.1);
 }
 .header-tab .tab-item{