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 @@
-
+
搜索
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: '网络问题,请稍后再试。',