From 7de9930bbd674f71fa48296d8357fbe6e8b5d5ca Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 20 Sep 2023 10:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5,?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5,=E5=88=86=E4=BA=AB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 +- images/mine/sqmp.png | Bin 0 -> 9506 bytes pages/login/login.wxml | 2 +- pages/mine/mine.wxml | 2 +- pages/resetPassword/resetPassword.js | 66 ++++++++++++++++++ pages/resetPassword/resetPassword.json | 3 + pages/resetPassword/resetPassword.wxml | 2 + pages/resetPassword/resetPassword.wxss | 1 + pages/setup/setup.js | 66 ++++++++++++++++++ pages/setup/setup.json | 3 + pages/setup/setup.wxml | 2 + pages/setup/setup.wxss | 1 + pages/work/work.js | 38 ++++++---- pages/work/work.json | 4 +- pages/work/work.wxml | 5 +- pages/work/work.wxss | 3 + .../pages/historyQuery/historyQuery.js | 10 ++- .../pages/historyQuery/historyQuery.wxml | 2 +- .../pages/historyQuery/historyQuery.wxss | 26 +++---- .../gatherInformation/gatherInformation.js | 2 +- utils/api.js | 8 ++- utils/request.js | 1 + 22 files changed, 212 insertions(+), 39 deletions(-) create mode 100644 images/mine/sqmp.png create mode 100644 pages/resetPassword/resetPassword.js create mode 100644 pages/resetPassword/resetPassword.json create mode 100644 pages/resetPassword/resetPassword.wxml create mode 100644 pages/resetPassword/resetPassword.wxss create mode 100644 pages/setup/setup.js create mode 100644 pages/setup/setup.json create mode 100644 pages/setup/setup.wxml create mode 100644 pages/setup/setup.wxss diff --git a/app.json b/app.json index f472aa5..6a4eef2 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,9 @@ "pages/information/information", "pages/mine/mine", "pages/webView/webView", - "pages/statistics/statistics" + "pages/statistics/statistics", + "pages/setup/setup", + "pages/resetPassword/resetPassword" ], "subPackages": [ { diff --git a/images/mine/sqmp.png b/images/mine/sqmp.png new file mode 100644 index 0000000000000000000000000000000000000000..f59ed553da31388c0c5299564c844359f13ecf32 GIT binary patch literal 9506 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 A(f|Me literal 0 HcmV?d00001 diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 0843bc5..23db94f 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,7 +1,7 @@ - 欢迎加入亿星社区 + 欢迎加入e联社区 - 分享 + {{item.synthesisScore}}分 diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index af4c997..f8d85e8 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -130,7 +130,8 @@ page { border-radius: 25rpx; box-sizing: border-box; display: flex; - align-items: center; + align-items: center; + overflow: hidden; } .list_card .right .score{ color: #999; @@ -142,24 +143,19 @@ page { font-weight: bold; color: #FF783C; } +.right button{ + font-size: 28rpx; + color: #fff; + width: fit-content; + background-color:#3a80e7; + padding: 0 !important; +} .list_card .right image{ width: 25rpx; height: 25rpx; + margin-right: 10rpx; } -button{ - width: 360rpx; - height: 76rpx; - background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%); - border-radius: 76rpx !important; - font-size: 32rpx; - font-weight: 400 !important; - font-family: PingFang SC; - color: #FFFFFF; - position: fixed; - bottom: 63rpx; - left: 50%; - transform: translateX(-180rpx); -} + .fixed_btn{ position: fixed; bottom: 30rpx; diff --git a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js index 70e2711..9a3c69a 100644 --- a/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js +++ b/subpages/gatherInformation/pages/gatherInformation/gatherInformation.js @@ -7,7 +7,7 @@ Page({ * 页面的初始数据 */ data: { - selectList:[['全部信息','居民信息采集','房屋信息采集'],['','新增','修改','删除']], + selectList:[['全部信息','居民信息采集','房屋信息采集']], selectValue:['全部信息',''], pageSize:10, pageNo:1, diff --git a/utils/api.js b/utils/api.js index dd5c0f7..7173c9c 100644 --- a/utils/api.js +++ b/utils/api.js @@ -33,7 +33,8 @@ module.exports = { getInspResult, getFollowUpList, followUpSave, - followUpDelete + followUpDelete, + logout } // 消息列表 function getIntelligentMessage(param){ @@ -48,10 +49,15 @@ function clearMessage () { function userLoginlog (para) { return fly.post('auth/gov/loginbypassword', para) } + // 获取token function getToken (para) { return fly.post('auth/gov/loginwxmp/loginbywxcode', para) } +// 退出登录 +function logout () { + return fly.post('auth/login/logout', ) +} // 居民查询 function getResidentBaseInfo (para) { return fly.post('actual/base/residentBaseInfo/residentSearch', para) diff --git a/utils/request.js b/utils/request.js index ffd6200..20a23d7 100644 --- a/utils/request.js +++ b/utils/request.js @@ -30,6 +30,7 @@ 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', })