diff --git a/app.json b/app.json index 51c7a01..41c2ae9 100644 --- a/app.json +++ b/app.json @@ -36,6 +36,13 @@ "checkOutConfirm/index/index", "checkOutConfirm/sign/sign" ] + }, + { + "root": "subpages/eventAdd", + "name": "event", + "pages": [ + "add/add" + ] } ], "window": { diff --git a/images/icon/nav_2.png b/images/icon/nav_2.png new file mode 100644 index 0000000..2b3ed3d Binary files /dev/null and b/images/icon/nav_2.png differ diff --git a/images/mine/bingxiang.png b/images/mine/bingxiang.png new file mode 100644 index 0000000..bd91d90 Binary files /dev/null and b/images/mine/bingxiang.png differ diff --git a/images/mine/diancilu.png b/images/mine/diancilu.png new file mode 100644 index 0000000..5bff598 Binary files /dev/null and b/images/mine/diancilu.png differ diff --git a/images/mine/kongtiao.png b/images/mine/kongtiao.png new file mode 100644 index 0000000..b6eae5a Binary files /dev/null and b/images/mine/kongtiao.png differ diff --git a/images/mine/device.png b/images/mine/xiyiji.png similarity index 100% rename from images/mine/device.png rename to images/mine/xiyiji.png diff --git a/images/mine/头像.png b/images/mine/头像.png new file mode 100644 index 0000000..3189401 Binary files /dev/null and b/images/mine/头像.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 46c2623..26f1df3 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -57,6 +57,8 @@ Page({ }) this.setData({ statusHeight: app.globalData.deviceInfo.statusHeight, + navigationHeight: app.globalData.deviceInfo.navigationHeight, + }); }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 08a1e3c..9b88a9a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -2,13 +2,17 @@ 青岛 --> - + +青岛市免租金住宿保障平台 + + + Image diff --git a/pages/index/index.wxss b/pages/index/index.wxss index e19887a..5a9625e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -2,8 +2,19 @@ page{ background-color: #f7f5f5; } +.header{ + background: linear-gradient(to bottom, #2dcecb 70%, #ffffff 30%); + padding-left: 20rpx; + padding-right: 20rpx; +} +.title{ + margin-bottom: 26rpx; + color: #ffffff; + font-size: 28rpx; +} .slide-image{ width:100%; + border-radius: 10rpx; } .header-search{ position: fixed; diff --git a/pages/mine/mine.js b/pages/mine/mine.js index e39931a..a02df2b 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -110,5 +110,12 @@ Page({ Notify({ type: 'primary', message: '持续上线中，敬请期待~' }); } + }, + getUserInfo(){ + wx.getUserProfile({ + success:(res)=>{ + console.log(res); + } + }) } }) \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 54184df..c23f822 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,7 +1,8 @@ { "usingComponents": { "van-icon": "@vant/weapp/icon/index", - "van-notify": "@vant/weapp/notify/index" + "van-notify": "@vant/weapp/notify/index", + "van-button": "@vant/weapp/button/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index f2f76aa..feead5d 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -5,18 +5,26 @@ - - - 五月的风 + + + + + 去注册 + - 福林苑 + -- - 5-1-805 南卧 + -- -- @@ -28,31 +36,31 @@ - 空调 - 正常 + -- + -- - + - 空调 - 正常 + -- + -- - + - 空调 - 正常 + -- + -- - + - 空调 - 正常 + -- + -- - + @@ -61,14 +69,12 @@ 资源管理 - - 本月用水：12m³ + 本月用水：12m³ | - - 本月用电：28kw-h + 本月用电：28kw-h diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 510cc3d..e26cd06 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -122,3 +122,8 @@ page{ font-size: 24rpx; color: #b5b5b5; } +.van-button--info { + background-color: transparent !important; + color: black !important; + border: none !important; +} diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml index eff2da7..2f7f31d 100644 --- a/pages/serve/serve.wxml +++ b/pages/serve/serve.wxml @@ -7,16 +7,23 @@ - 您还未办理入住 - 在线合同签订、履约保证金等 + 居住服务 - - - 入住办理 + + + 入住办理 - - - 入住评价 + + + 退房确认 + + + + 延租申请 + + + + 居住评价 diff --git a/project.private.config.json b/project.private.config.json index e65d7b6..985aa55 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -15,12 +15,19 @@ "miniprogram": { "list": [ { - "name": "OCR", - "pathName": "subpages/OCRCard/pages/OCR/OCR", + "name": "报事", + "pathName": "subpages/eventAdd/add/add", "query": "", "scene": null, "launchMode": "default" }, + { + "name": "OCR", + "pathName": "subpages/OCRCard/pages/OCR/OCR", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "subpages/index/checkOutConfirm/index/index", "pathName": "subpages/index/checkOutConfirm/index/index", diff --git a/subpages/eventAdd/add/add.js b/subpages/eventAdd/add/add.js new file mode 100644 index 0000000..44b2301 --- /dev/null +++ b/subpages/eventAdd/add/add.js @@ -0,0 +1,66 @@ +// subpages/eventAdd/add/add.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/subpages/eventAdd/add/add.json b/subpages/eventAdd/add/add.json new file mode 100644 index 0000000..e8b1bce --- /dev/null +++ b/subpages/eventAdd/add/add.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "van-cell": "@vant/weapp/cell/index", + "van-cell-group": "@vant/weapp/cell-group/index", + "van-popup": "@vant/weapp/popup/index" + } +} \ No newline at end of file diff --git a/subpages/eventAdd/add/add.wxml b/subpages/eventAdd/add/add.wxml new file mode 100644 index 0000000..bf91609 --- /dev/null +++ b/subpages/eventAdd/add/add.wxml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/subpages/eventAdd/add/add.wxss b/subpages/eventAdd/add/add.wxss new file mode 100644 index 0000000..7229b92 --- /dev/null +++ b/subpages/eventAdd/add/add.wxss @@ -0,0 +1,4 @@ +/* subpages/eventAdd/add/add.wxss */ +.header{ + background-color: linear-gradient(to right,#d2effd 50%,#e6e2fb); +} \ No newline at end of file