diff --git a/pages/index/index.js b/pages/index/index.js
index b9eb93b..6c1d703 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -4,6 +4,7 @@ const app = getApp()
import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage} from "../../utils/api"
Page({
data: {
+
selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'],
selectValue:0,
pageSize:10,
diff --git a/pages/index/index.json b/pages/index/index.json
index 614568f..87ed097 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,10 +1,14 @@
{
+
"usingComponents": {
+
"load-more": "../../components/loadMore/loadMore",
"no-data": "../../components/noData/nodata",
"custom-tab-bar":"../../components/custom-tab-bar"
},
+
"navigationBarTitleText": "消息",
+
"enablePullDownRefresh": true,
"backgroundColor": "#f8f8f8",
"backgroundTextStyle": "dark"
diff --git a/pages/login/login.js b/pages/login/login.js
index 751bdbb..d4e9cb6 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -1,4 +1,5 @@
// pages/register/register.js
+// 到入一个
import {userLoginlog} from "../../utils/api"
Page({
@@ -63,20 +64,24 @@ Page({
},
handelBlurMobile(e){
this.setData({
+ // 获取绑定过的值，付给fromData.mobile
'formData.mobile': e.detail.value
})
console.log(this.data.formData)
},
handelBlurPassword(e){
this.setData({
+ // 获取绑定过的值，付给fromData.password
'formData.password': e.detail.value
})
console.log(this.data.formData)
},
handelClickSubmit(){
if(!this.data.formData.mobile){
+ // 微信的轻量级api
wx.showToast({
title: '请填写手机号',
+ // 不显示图标
icon:'none',
duration:3000
})
@@ -86,27 +91,39 @@ Page({
wx.showToast({
title: '请输入密码',
icon:'none',
+ // 提示时间为3s
duration:3000
})
return
}
+ //var和const的区别，一个可变，一个不可变，
+ // const 声明一个不可变的对象parm，并创建了对象
const parm = {
+ // wxCode对象的初始化
wxCode :'',
+ // ...将this.data.formData所有属性，赋值到表单中
...this.data.formData
}
+ // 轻量级api,在加载时进行显示
wx.showLoading({
title: '登录中',
})
+ //微信的api,获取登录凭证
+ // 在这一步骤中,用户获取凭证
wx.login({
success: (res) => {
parm.wxCode = res.code
console.log(parm.wxCode);
+ // 调用登录的接口
userLoginlog(parm).then((res)=>{
console.log(res);
+ // 不明白这里判断的是什么
if(res.code == 0){
+ // 用于跳转的api,跳转到某某某
wx.switchTab({
url: '/pages/index/index',
})
+ //加入本地内存的api
wx.setStorageSync('token', res.data.token)
}
}).catch(err=>{
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 28dfb8c..bc897ee 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -11,10 +11,13 @@
+
+
- 忘记密码
+ 忘记密码
+
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 986645b..0f813f3 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -1,12 +1,16 @@
/* pages/register/register.wxss */
page {
+ /*宽度为100% */
width: 100%;
+ /* 最小高度 */
min-height: 100vh;
+ /* 垂直方向.元素溢出时,显示滚动条 */
overflow-y: auto;
}
.header {
height: 500rpx;
width: 100%;
+ /*渐变色 */
background: linear-gradient(180deg, #1673ee 0%, #66A6FD 63%, #F7F7F7 100%);
box-sizing: border-box;
padding: 140rpx 0rpx 100rpx 50rpx;
diff --git a/pages/work/work.wxss b/pages/work/work.wxss
index b8df4bc..47e5a5d 100644
--- a/pages/work/work.wxss
+++ b/pages/work/work.wxss
@@ -62,8 +62,8 @@ page {
width: 100%;
display: flex;
align-items: center;
- justify-content: start;
- color: #fff;
+ /* justify-content: start; */
+ color: rgb(131, 80, 80);
font-size: 32rpx;
position: relative;
padding-left: 20rpx;
diff --git a/pages/work2/work2.js b/pages/work2/work2.js
index 8a233b8..e3fa136 100644
--- a/pages/work2/work2.js
+++ b/pages/work2/work2.js
@@ -62,5 +62,53 @@ Page({
*/
onShareAppMessage() {
+ },
+ onAddResident(){
+ wx.navigateTo({
+ url: '../../subpages/addResi/pages/addResi/addResi',
+ })
+ },
+ onAddHouse(){
+ wx.navigateTo({
+ url: '../../subpages/addhouse/pages/addhouse/addhouse',
+ })
+ },
+ onBusinessRecord(){
+ wx.navigateTo({
+ url: '../../subpages/businessRecord/businessRecord',
+ })
+ },
+ onHistoryQuery(){
+ wx.navigateTo({
+ url: '../../subpages/communitySelfInsp/pages/historyQuery/historyQuery',
+ })
+ },
+ onFollowUpList(){
+ wx.navigateTo({
+ url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList',
+ })
+ },
+ onMyTroubleshootDemand(){
+ wx.navigateTo({
+ url: '../../subpages/myTroubleshootDemand/pages/index/index',
+ })
+ },
+ onDemandCheck(){
+ wx.navigateTo({
+ url: '../../subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck',
+ })
+ },
+ onAddHouse(){
+ wx.navigateTo({
+ url: '../../subpages/communitySelfInsp/pages/followUpList/followUpList',
+ })
}
+ // onAddHouse(){
+ // wx.navigateTo({
+ // url: '../../subpages/addhouse/pages/addhouse/addhouse',
+ // })
+ // },
+
+
+
})
\ No newline at end of file
diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml
index 86dda10..d08d5dc 100644
--- a/pages/work2/work2.wxml
+++ b/pages/work2/work2.wxml
@@ -1,11 +1,9 @@
-
-
-