diff --git a/pages/help/community/index.js b/pages/help/community/index.js
index 583157c..925b17f 100644
--- a/pages/help/community/index.js
+++ b/pages/help/community/index.js
@@ -35,6 +35,8 @@ Page({
       scrollViewHeight:windowInfo.windowHeight,
       defaultCommunityId:options.communityId
     })
+    this.data.pager.loading = false;
+    this.data.pager.loadAll = false;
     app.getLocation().then((res)=>{
       this.setData({
         lng:res.longitude,
@@ -112,6 +114,11 @@ Page({
         currentCommunity,
         pager:this.data.pager
       });
+    }).catch(()=>{
+      this.setData({
+        "pager.loading":false,
+        "pager.refreshTrigger":false
+      })
     });
   },
   applyNewCommunity(){
diff --git a/pages/login/login.js b/pages/login/login.js
index 2896210..9161f39 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -66,6 +66,12 @@ Page({
               })
             }
           });
+          app.globalData.needRefreshOrderList = true;
+          const pages = getCurrentPages();
+          const prePage = pages[pages.length-2];
+          if(prePage){
+            prePage.onLoad(prePage.options);
+          }
         }
       })
     })
diff --git a/pages/my/firend/index.js b/pages/my/firend/index.js
index 2bcaca5..a588fe9 100644
--- a/pages/my/firend/index.js
+++ b/pages/my/firend/index.js
@@ -19,6 +19,8 @@ Page({
     this.setData({
       scrollViewHeight:windowInfo.windowHeight
     });
+    this.data.pager.loading = false;
+    this.data.pager.loadAll = false;
     this.loadList();
   },
   refreshList(){
@@ -45,6 +47,11 @@ Page({
         list:data.items,
         pager:this.data.pager
       })
+    }).catch(()=>{
+      this.setData({
+        "pager.loading":false,
+        "pager.refreshTrigger":false
+      })
     })
   },
 
diff --git a/pages/my/index/index.js b/pages/my/index/index.js
index 7fffb9f..9a349b4 100644
--- a/pages/my/index/index.js
+++ b/pages/my/index/index.js
@@ -30,6 +30,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    app.getAppConfig().then((data)=>{
+      this.setData({
+        appConfig:data
+      })
+    })
   },
   scrollViewPulling(event){
     // this.setData({
@@ -76,7 +81,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    this.getUserInfo();
+    if(app.globalData.accessToken){
+      this.getUserInfo();
+    }
   },
   getUserInfo(){
     app.forceGetUserInfo().then((data)=>{
@@ -85,11 +92,18 @@ Page({
         refresherTriggered:false
       });
     })
-    app.getAppConfig().then((data)=>{
-      this.setData({
-        appConfig:data
+  },
+
+  navToSetting(){
+    if(app.globalData.accessToken){
+      wx.navigateTo({
+        url: '/pages/my/setting/index/index',
       })
-    })
+    }else{
+      wx.navigateTo({
+        url: '/pages/login/login',
+      })
+    }
   },
 
   /**
diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml
index 9c12da8..2144e06 100644
--- a/pages/my/index/index.wxml
+++ b/pages/my/index/index.wxml
@@ -4,11 +4,12 @@
     refresher-background="var(--main-color)" enhanced show-scrollbar="{{false}}">
   <view class="user-info">
     <view class="content">
-      <navigator url="/pages/my/setting/index/index">
+      <view bind:tap="navToSetting">
         <image class="avatar" src="{{userInfo.optimized_avatar||'/assets/icon/my/avatar.png'}}"/>
-      </navigator>
+      </view>
       <view class="name">{{userInfo.nickname}}</view>
-      <image src="/assets/icon/help/qrcode.png" class="qrcode" bind:tap="showQRCode"/>
+      <image src="/assets/icon/help/qrcode.png" class="qrcode" bind:tap="showQRCode" 
+        wx:if="{{userInfo.userid}}"/>
     </view>
   </view>
 
diff --git a/pages/my/money/index.js b/pages/my/money/index.js
index fc1c1b9..01d7445 100644
--- a/pages/my/money/index.js
+++ b/pages/my/money/index.js
@@ -26,6 +26,8 @@ Page({
         userInfo:data
       })
     });
+    this.data.pager.loading = false;
+    this.data.pager.loadAll = false;
     this.loadList();
   },
 
@@ -66,6 +68,11 @@ Page({
         list:this.data.list,
         pager:this.data.pager
       })
+    }).catch(()=>{
+      this.setData({
+        "pager.loading":false,
+        "pager.refreshTrigger":false
+      })
     });
   },
   /**
diff --git a/pages/my/setting/index/index.js b/pages/my/setting/index/index.js
index 819541c..88189a6 100644
--- a/pages/my/setting/index/index.js
+++ b/pages/my/setting/index/index.js
@@ -21,7 +21,6 @@ Page({
    */
   onLoad(options) {
     app.getAppConfig().then((data)=>{
-      console.log(data);
       this.setData({
         appConfig:data
       })
@@ -88,6 +87,7 @@ Page({
       key: 'accessToken',
       success(){
         app.globalData.accessToken = '';
+        app.globalData.userInfo = {};
         wx.reLaunch({
           url: '/pages/login/login',
         })
diff --git a/pages/order/detail-group/index.wxml b/pages/order/detail-group/index.wxml
index f380d73..1b16d3f 100644
--- a/pages/order/detail-group/index.wxml
+++ b/pages/order/detail-group/index.wxml
@@ -6,7 +6,12 @@
     <view class="page-container address-self" wx:if="{{orderDetail.product.delivery_time_type=='SCHEDULED'}}">
       <view class="title">
         <view>自提点</view>
-        <view class="time">3月2日 <label class="yellow">09:00～20:00</label></view>
+        <view class="time">
+          <label>返回自提日期</label>
+          <label class="yellow">
+            {{orderDetail.order.product_pickup_time_from}}～{{orderDetail.order.product_pickup_time_to}}
+          </label>
+        </view>
       </view>
       <view class="spliter"></view>
       <view class="address">{{orderDetail.merchant.address}}</view>
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index bf29bf8..c359030 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -74,9 +74,20 @@ Page({
    */
   onLoad(options) {
     app.globalData.needRefreshOrderList = false;
-    this.loadOrderList();
-    this.loadMerchantOrderList();
-    this.loadMerchantPayOrderList();
+    if(app.globalData.accessToken){
+      this.pager.tab1.loading = false;
+      this.pager.tab3.loading = false;
+
+      this.loadOrderList();
+      this.loadMerchantOrderList();
+    }else{
+      this.data.pager.tab1.loading = false;
+      this.data.pager.tab1.loadAll = true;
+      this.setData({
+        "pager.tab1":this.data.pager.tab1
+      })
+    }
+    // this.loadMerchantPayOrderList();
   },
   refreshList(){
     if(this.data.tabIndex==0){
@@ -145,7 +156,6 @@ Page({
       console.log('res',res);
       this.setData({
         "pager.tab1.loading":false,
-        "pager.tab1.loadAll":true,
         refreshTriggered:{
           tab1:false
         }
@@ -153,7 +163,6 @@ Page({
     });
   },
   loadMerchantPayOrderList(){
-    return;
     //消费买单列表
     if(this.data.pager.tab2.loading||this.data.pager.tab2.loadAll){
       return;
@@ -210,7 +219,7 @@ Page({
       }
       this.data.pager.tab3.loading = false;
       this.data.pager.tab3.pageIndex++;
-      if(data.length<this.data.pager.tab3.limit){
+      if(data.items.length<this.data.pager.tab3.limit){
         this.data.pager.tab3.loadAll = true;
       }
       this.setData({
@@ -223,7 +232,6 @@ Page({
     }).catch((res)=>{
       this.setData({
         "pager.tab3.loading":false,
-        "pager.tab3.loadAll":true,
         refreshTriggered:{
           tab3:false
         }
diff --git a/pages/shop/index/index.js b/pages/shop/index/index.js
index afc78d6..f599a23 100644
--- a/pages/shop/index/index.js
+++ b/pages/shop/index/index.js
@@ -79,7 +79,8 @@ Page({
       })
     }).catch(()=>{
       this.setData({
-        "pager.loading":false
+        "pager.loading":false,
+        "pager.refreshTrigger":false
       })
     });
   },
@@ -87,7 +88,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    
+    this.data.pager.loading = false;
+    this.data.pager.loadAll = false;
     app.getUserInfo().then((data)=>{
       this.setData({
         userInfo:data