diff --git a/app.json b/app.json index e625fd0..485ccf7 100644 --- a/app.json +++ b/app.json @@ -4,6 +4,8 @@ "pages/logs/logs", "pages/login/login", "pages/work/work", + "pages/work2/work2", + "pages/work1/work1", "pages/information/information", "pages/mine/mine", "pages/webView/webView", @@ -21,6 +23,8 @@ "pages/addhouse/addhouse" ] }, + + { "root": "subpages/searchResult", "name": "searchResult", @@ -134,6 +138,12 @@ "iconPath": "images/home/resiAndHouse.png", "selectedIconPath": "images/home/resiAndHouseSelected.png" }, + { + "pagePath": "pages/work2/work2", + "text": "工作", + "iconPath": "images/home/work.png", + "selectedIconPath": "images/home/workSelected.png" + }, { "pagePath": "pages/statistics/statistics", "text": "统计", diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js index 0f6e042..fe8b89d 100644 --- a/components/custom-tab-bar/index.js +++ b/components/custom-tab-bar/index.js @@ -24,6 +24,15 @@ Component({ show: true }, + , + { + "pagePath": "/pages/work2/work2", + "text": "工作", + "iconPath": "/images/home/work.png", + "selectedIconPath": "/images/home/workSelected.png", + show: true + + }, { "pagePath": "/pages/statistics/statistics", "text": "数据", diff --git a/components/custom-tab-bar/index.wxml b/components/custom-tab-bar/index.wxml index 712ebfe..6f9975a 100644 --- a/components/custom-tab-bar/index.wxml +++ b/components/custom-tab-bar/index.wxml @@ -1,7 +1,7 @@ - - + + + - 忘记密码 + 忘记密码 + 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 new file mode 100644 index 0000000..e3fa136 --- /dev/null +++ b/pages/work2/work2.js @@ -0,0 +1,114 @@ +// pages/work2/work2.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + 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.json b/pages/work2/work2.json new file mode 100644 index 0000000..b67d877 --- /dev/null +++ b/pages/work2/work2.json @@ -0,0 +1,9 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "custom-tab-bar":"../../components/custom-tab-bar" + }, + "navigationBarBackgroundColor": "#1673ee", + "navigationBarTitleText": " ", + "backgroundTextStyle": "dark" +} \ No newline at end of file diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml new file mode 100644 index 0000000..d08d5dc --- /dev/null +++ b/pages/work2/work2.wxml @@ -0,0 +1,79 @@ + + + + + + 海伦路街道 + + + + + + + + + 居民信息 + + + + + 新增居民信息 + + + + 新增记录 + + + + + + 房屋信息 + + + + + 新增房屋信息 + + + 新增记录 + + + + + + + 信息服务 + + + + + 诉求上报 + + + + 诉求上报记录 + + + + 满意度调查 + + + + + + 数据 + + + + + + 数据 + + + + + + + + + \ No newline at end of file diff --git a/pages/work2/work2.wxss b/pages/work2/work2.wxss new file mode 100644 index 0000000..6ef5b53 --- /dev/null +++ b/pages/work2/work2.wxss @@ -0,0 +1,315 @@ +/* pages/work2/work2.wxss */ +.page { + /*定位方式为相对定位 */ + position: relative; + width: 750rpx; + height: 1400rpx; + /* 超过页面显示滑轮 */ + overflow: hidden; + display: flex; + /* 按照行排序 */ + flex-direction: column; +} +.header { + display: flex; + background: #1673ee; + width: 100%; + height: 400rpx; + flex-direction: column; + /* margin: 100rpx 0 0 31rpx; */ + height: 500rpx; + +} +.header>view{ + display:flex; + flex-direction: row; + justify-items:self-end; + margin: 130rpx 0 0 29rpx; + width: 100%; +} +.image_1 { + width: 34rpx; + height: 31rpx; +} +.text_1 { + /* width: 157rpx; + height: 30rpx; */ + overflow-wrap: break-word; + color: rgba(255,255,255,1); + font-size: 32rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 42rpx; + margin-left: 15rpx; +} +.box_2 { + background-color: rgba(247,247,247,1.000000); + border-radius: 20rpx; + /* 相对于父级进行定位 */ + position: absolute; + left: 0rpx; + top: 181rpx; + width: 750rpx; + height: 1365rpx; + display: flex; + flex-direction: column; + justify-content: flex-end; +} +.section_5 { + width: 750rpx; + height: 1395rpx; + display: flex; + flex-direction: column; +} +.content_1{ + display: flex; + /* flex-direction: row; */ + justify-self:center; + margin: 40rpx 0 0 10rpx; + +} +.content_1>view{ + display: flex; + flex-direction: column; + align-items: center; + width: 250rpx; + height:210rpx; +} +.data{ + display: flex; + flex-direction: column; + margin: 40rpx 0 0 10rpx; + +} +.data >view{ + display: flex; + flex-direction: column; + align-items: center; + width: 303rpx; + height: 200rpx; +} + +.house{ + display: flex; + justify-content: start; + margin: 40rpx 0 0 10rpx; + +} +.house >view{ + display: flex; + flex-direction: column; + align-items: center; + width: 303rpx; + height: 200rpx; + +} + +.image_2 { + width: 158rpx; + height: 56rpx; + margin-left: 332rpx; +} +.list_1 { + width: 710rpx; + height: 603rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + margin: 43rpx 0 0 20rpx; +} +.section_1-0 { + background-color: rgba(255,255,255,1.000000); + border-radius: 20rpx; + height: 292rpx; + margin-bottom: 19rpx; + width: 710rpx; + display: flex; + flex-direction: column; +} +.image-wrapper_9-1{ + width: 404rpx; + height: 100rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 40rpx 0 0 59rpx; +} +.text-wrapper_7-0 { + width: 134rpx; + height: 33rpx; + display: flex; + /* row水平排列 */ + flex-direction: row; + margin: 29rpx 0 0 29rpx; +} +.text_2-0 { + width: 134rpx; + height: 33rpx; + /* 文本换行 */ + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 34rpx; + font-family: PingFang-SC-Bold; + font-weight: 700; + text-align: left; + white-space: nowrap; + line-height: 42rpx; +} +.image-wrapper_9-0 { + width: 303rpx; + height: 100rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 40rpx 0 0 59rpx; +} +.image_12-0 { + width: 100rpx; + height: 100rpx; +} +.image_13-0 { + width: 100rpx; + height: 100rpx; +} +.text-wrapper_8-0 { + width: 336rpx; + height: 27rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 23rpx 0 40rpx 31rpx; +} +.text_3-0 { + height: 27rpx; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 28rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 15rpx; +} +.text_4-0 { + /* width: 109rpx; */ + height: 27rpx; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 28rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 15rpx; + +} +.text_5-0 { + width: 109rpx; + height: 27rpx; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 28rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: right; + white-space: nowrap; + line-height: 28rpx; + margin-top: 15rpx; + + } + .text-wrapper_8-1{ + width: 500rpx; + height: 27rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 23rpx 0 40rpx 31rpx; + } +.image-wrapper_9-1 { + width: 500rpx; + height: 100rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 40rpx 0 0 59rpx; +} +.image_12-1 { + width: 100rpx; + height: 100rpx; + +} +.image_13-1 { + width: 100rpx; + height: 100rpx; +} +.image_12-2{ + width: 100rpx; + height: 100rpx; +} +.image_13-2{ + width: 100rpx; + height: 100rpx; +} + + + + + + +.image_14-1 { + width: 100rpx; + height: 100rpx; + margin-left: 5rpx; +} + +.image_14-2 { + width: 100rpx; + height: 100rpx; + margin-left: 5rpx; +} + + +.text_12 { + width: 66rpx; + height: 32rpx; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 34rpx; + font-family: PingFang-SC-Bold; + font-weight: 700; + text-align: left; + white-space: nowrap; + line-height: 42rpx; + margin: 30rpx 0 0 29rpx; +} +.image_15 { + width: 100rpx; + height: 100rpx; + +} +.text_13 { + height: 26rpx; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 28rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 28rpx; + margin-top: 15rpx; +} + + + + + + + + + + diff --git a/project.config.json b/project.config.json index d6e1cf8..8873c38 100644 --- a/project.config.json +++ b/project.config.json @@ -55,5 +55,6 @@ "editorSetting": { "tabIndent": "insertSpaces", "tabSize": 4 - } + }, + "simulatorPluginLibVersion": {} } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 7c3cec8..5c550fa 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -8,6 +8,31 @@ "condition": { "miniprogram": { "list": [ + { + "name": "工作2", + "pathName": "pages/work2/work2", + "query": "", + "launchMode": "default", + "scene": null, + "partialCompile": { + "enabled": true, + "pages": [] + } + }, + { + "name": "工作", + "pathName": "pages/work/work", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "pages/index/index", + "pathName": "pages/index/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "subpages/statistics/pages/residentPortrait2/residentPortrait", "pathName": "subpages/statistics/pages/residentPortrait2/residentPortrait", @@ -218,13 +243,6 @@ "launchMode": "default", "scene": 1017 }, - { - "name": "工作", - "pathName": "pages/work/work", - "query": "", - "launchMode": "default", - "scene": null - }, { "name": "新增居民", "pathName": "subpages/addResi/pages/addResi/addResi",