From 8222f5c809b7df51d211ada3ffc99d559f6e9e99 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 27 Sep 2023 18:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=97=AE=E9=A2=98,=E5=BC=82?=
 =?UTF-8?q?=E5=9C=B0=E7=99=BB=E5=BD=95=E7=BB=9F=E4=B8=80=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                                 |  4 ++--
 pages/work/work.js                                   | 12 ++++++++----
 pages/work/work.wxml                                 |  2 +-
 .../pages/dissatisfied/demandCheck/demandCheck.js    |  1 -
 .../pages/dissatisfied/searchResi/searchResi.js      |  2 +-
 utils/request.js                                     | 10 +++++-----
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index aaf85aa..c1e109e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -95,8 +95,8 @@ onScrollToLower(e){
             if(res.code === 0){
                 wx.setStorageSync('token', res.data.token)
             }else{
-                wx.navigateTo({
-                  url: '/pages/login/login.wxml',
+                wx.reLaunch({
+                  url: '/pages/login/login',
                 })
             }
         }).catch(err=>{
diff --git a/pages/work/work.js b/pages/work/work.js
index bd95d81..01434e2 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -137,13 +137,17 @@ Page({
             setlectVal :e.currentTarget.dataset.value
         })
     },
-    handelBlurKeyWord(e){
+   
+    handelInputKeyWord(e){
         this.setData({
-            keyWord: e.detail.value.replace(/\s+/g, '')
+            keyWord: e.detail.value
           })
-          app.globalData.keyWord = e.detail.value.replace(/\s+/g, '')
     },
- 
+    handelBlurKeyWord(e){
+        this.setData({
+            keyWord: e.detail.value.trim()
+        })
+    },
     handelClickSearch(e){
         if(!this.data.keyWord) {
             wx.showToast({
diff --git a/pages/work/work.wxml b/pages/work/work.wxml
index 07c7a6c..ff5ebfc 100644
--- a/pages/work/work.wxml
+++ b/pages/work/work.wxml
@@ -11,7 +11,7 @@
          </view>
         <view class="inout_box"> 
             <image src="../../images/work/search.png" mode=""/> 
-            <input type="text" placeholder="{{setlectVal == 'resi'?'姓名/手机/身份证/住址等任意组合关键词':'输入小区/楼栋/单元/门牌号/房主等任意组合关键词'}}" 	confirm-type="search" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}"  /> 
+            <input type="text" placeholder="{{setlectVal == 'resi'?'姓名/手机/身份证/住址等任意组合关键词':'输入小区/楼栋/单元/门牌号/房主等任意组合关键词'}}" 	confirm-type="search" bindinput="handelInputKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}"  /> 
             <view class="btn_box"  bind:tap="handelClickSearch"><text>搜索</text></view>
         </view>
          <view class="jump" wx:if="{{setlectVal == 'resi'}}"> 
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
index 7dc5ce2..85e16f1 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
@@ -82,7 +82,6 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
         this.data.qqMapWX = new QQMapWX({
             key: 'CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ'
         })
diff --git a/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js b/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js
index 329caaa..d686971 100644
--- a/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js
+++ b/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi.js
@@ -9,7 +9,7 @@ Page({
     data: {
         selectVal:'search',
 
-        keyWord:'张三',
+        keyWord:'',
         lowerThreshold:'10',
         loadMoreVisible:false,
         loadMoreType: "none",
diff --git a/utils/request.js b/utils/request.js
index 20a23d7..be53ada 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -14,9 +14,14 @@ const request =  function (url, options) {
         'Authorization': token
       },
       success (response) {
+        console.log(response);
         if (response.statusCode === 200) {
           if(response.data.code===0){
               resolve(response.data)
+          }else if(response.data.code === 10007 || response.data.code == 1024 || response.data.code == 2003){
+              wx.reLaunch({
+                url: '/pages/login/login',
+              })
           }else{
             let errmsg = response.data.msg
             if(errmsg==undefined || errmsg=='undefined' ){
@@ -29,11 +34,6 @@ const request =  function (url, options) {
             })
             reject(response.data)
           }
-        }else if(response.statusCode === 10007 || response.statusCode == 1024 || response.statusCode == 2003){
-          console.log('进不来?');
-            wx.redirectTo({
-              url: '/pages/login/login',
-            })
         } else {
           wx.showToast({
             title: '网络问题，请稍后再试。',