From 9404a0323423497434b9c10920775ddbd1e1d165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=87?= <hbycchenxiao@163.com>
Date: Fri, 28 Mar 2025 13:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.js              |  1 +
 app.js                      | 12 +++++++-----
 pages/help/index/index.js   | 11 ++++++++---
 pages/help/index/index.wxml |  8 ++++----
 pages/help/index/index.wxss |  2 +-
 pages/login/login.js        |  5 +++++
 pages/login/login.wxml      |  1 +
 pages/login/login.wxss      |  9 +++++++++
 pages/my/index/index.wxml   |  4 ++--
 pages/order/index/index.js  | 18 ++++++++++++++++++
 10 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/api/request.js b/api/request.js
index 63c0830..a9b8172 100644
--- a/api/request.js
+++ b/api/request.js
@@ -31,6 +31,7 @@ const sendRequest = (options)=>{
             rj(result.data);
           }
         }else if(result.statusCode==401){
+          rj(result.data);
           const pages = getCurrentPages();
           const currentPages = pages[pages.length-1];
           
diff --git a/app.js b/app.js
index c29f628..e3aadd6 100644
--- a/app.js
+++ b/app.js
@@ -18,12 +18,14 @@ App({
           if(!(this.globalData.appConfig&&this.globalData.appConfig.share_card_title)){
             await this.getAppConfig();
           }
-          if(!(this.globalData.userInfo&&this.globalData.userInfo.user_code)){
-            await this.getUserInfo();
-          }
           let path = '/pages/help/index/index';
-          if(this.globalData.userInfo.user_code){
-            path = `${path}?shared_user_code=${this.globalData.userInfo.user_code}`;
+          if(this.globalData.accessToken){
+            if(!(this.globalData.userInfo&&this.globalData.userInfo.user_code)){
+              await this.getUserInfo();
+            }
+            if(this.globalData.userInfo.user_code){
+              path = `${path}?shared_user_code=${this.globalData.userInfo.user_code}`;
+            }
           }
           return {
             title:this.globalData.appConfig.share_card_title,
diff --git a/pages/help/index/index.js b/pages/help/index/index.js
index ba3796c..5a3de0f 100644
--- a/pages/help/index/index.js
+++ b/pages/help/index/index.js
@@ -44,9 +44,6 @@ Page({
     this.setData({
       navBarHeight:height
     })
-    this.setData({
-      isLogin:!!app.globalData.accessToken
-    })
     // this.getAddress();
     app.getAppConfig().then((data)=>{
       this.setData({
@@ -97,8 +94,16 @@ Page({
         })
       }
     });
+
+    this.setData({
+      isLogin:!!app.globalData.accessToken
+    })
     //手动更改了社区，就不要再次更新默认地址
     if(!this.data.manuallyChangedCommunity){
+
+      if(!app.globalData.accessToken){
+        return;
+      }
       app.forceGetUserInfo().then((data)=>{
         if(data.default_address){
           this.setData({
diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml
index 8d16a00..a7b0815 100644
--- a/pages/help/index/index.wxml
+++ b/pages/help/index/index.wxml
@@ -64,13 +64,13 @@
     </view>
   </view>
   <button type="primary" class="order-button" bind:tap="preOrder" loading="{{preOrdering}}">立即下单</button>
-  <!-- <view class="login-panel" wx:if="{{!isLogin}}">
+  <view class="login-panel" wx:if="{{!isLogin}}">
     <image class="icon" src="/assets/icon/help/redpacket@2x.png"/>
-    <view class="text">登录后享跑腿服务</view>
+    <view class="text">登录后, 立享快递代取服务</view>
     <navigator url="/pages/login/login">
-      <button class="button" size="mini">一键登录</button>
+      <button class="button" size="mini">立即登录</button>
     </navigator>
-  </view> -->
+  </view>
   <view class="action-bar">
     <view bind:tap="navToHowToUse" class="item left">
       <image src="/assets/icon/help/newbie.png" class="icon"/>
diff --git a/pages/help/index/index.wxss b/pages/help/index/index.wxss
index d68baaf..316129d 100644
--- a/pages/help/index/index.wxss
+++ b/pages/help/index/index.wxss
@@ -171,7 +171,7 @@
   align-items: center;
   padding:20rpx;
   position: fixed;
-  bottom:0;
+  bottom:20rpx;
   left:20rpx;
   right:20rpx;
 }
diff --git a/pages/login/login.js b/pages/login/login.js
index 8df203c..2896210 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -85,6 +85,11 @@ Page({
       url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_user_agreement)}`,
     })
   },
+  goBack(){
+    wx.reLaunch({
+      url: '/pages/help/index/index',
+    })
+  },
   shake(){
     if(!this.animation){
       this.animation = wx.createAnimation({
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index e7515e9..45a9d6e 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -20,5 +20,6 @@
       </label>
     </radio-group>
   </view>
+  <view class="btn-no-login" bind:tap="goBack">暂不登录</view>
   <view class="user-code">{{userCode}}</view>
 </view>
\ No newline at end of file
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index a2ead47..8575750 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -45,4 +45,13 @@
   text-align: center;
   color:#999999;
   opacity: .1;
+}
+
+.btn-no-login{
+  position: absolute;
+  bottom:60rpx;
+  left:0;
+  width:100%;
+  text-align: center;
+  color: #999999;
 }
\ No newline at end of file
diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml
index a5a177a..9c12da8 100644
--- a/pages/my/index/index.wxml
+++ b/pages/my/index/index.wxml
@@ -14,11 +14,11 @@
 
   <view class="page-container property">
     <view class="item" bind:tap="goToCouponList">
-      <view class="value">{{userInfo.coupon_count}}</view>
+      <view class="value">{{userInfo.coupon_count||0}}</view>
       <view class="key">优惠券(张)</view>
     </view>
     <view class="item" bind:tap="goToMoney">
-      <view class="value">{{userInfo.points}}</view>
+      <view class="value">{{userInfo.points||0}}</view>
       <view class="key">蜂蜜(克)</view>
     </view>
   </view>
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 4c7ef73..bf29bf8 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -141,9 +141,19 @@ Page({
         },
         pager:this.data.pager
       })
+    }).catch((res)=>{
+      console.log('res',res);
+      this.setData({
+        "pager.tab1.loading":false,
+        "pager.tab1.loadAll":true,
+        refreshTriggered:{
+          tab1:false
+        }
+      })
     });
   },
   loadMerchantPayOrderList(){
+    return;
     //消费买单列表
     if(this.data.pager.tab2.loading||this.data.pager.tab2.loadAll){
       return;
@@ -210,6 +220,14 @@ Page({
         },
         pager:this.data.pager
       })
+    }).catch((res)=>{
+      this.setData({
+        "pager.tab3.loading":false,
+        "pager.tab3.loadAll":true,
+        refreshTriggered:{
+          tab3:false
+        }
+      })
     });
   },
   pay(event){