diff --git a/app.json b/app.json index 5ca8e48..7aa1f2b 100644 --- a/app.json +++ b/app.json @@ -25,7 +25,8 @@ "pages": [ "editUser/editUser", "checkInRecord/checkInRecord", - "evaluate/evaluate" + "evaluate/evaluate", + "checkInEvaluate/checkInEvaluate" ] }, { diff --git a/components/navigationBar/navigationBar.js b/components/navigationBar/navigationBar.js index 10c7cd9..4a1f8aa 100644 --- a/components/navigationBar/navigationBar.js +++ b/components/navigationBar/navigationBar.js @@ -6,7 +6,7 @@ Component({ properties: { title: { type: String, - value: "续期提醒", + value: "延租提醒", }, backgroundImage: { type: String, diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 2af32dd..40daacb 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -16,12 +16,12 @@ Component({ selectedIconPath: "/images/icon/home-a.png", text: "首页", }, - { - pagePath: "/pages/message/message", - iconPath: "/images/icon/message.png", - selectedIconPath: "/images/icon/message-a.png", - text: "消息", - }, + // { + // pagePath: "/pages/message/message", + // iconPath: "/images/icon/message.png", + // selectedIconPath: "/images/icon/message-a.png", + // text: "消息", + // }, { pagePath: "/pages/serve/serve", iconPath: "/images/icon/serve.png", @@ -30,12 +30,12 @@ Component({ text: "服务", }, - { - pagePath: "/pages/life/life", - iconPath: "/images/icon/life.png", - selectedIconPath: "/images/icon/life-a.png", - text: "生活圈" - }, + // { + // pagePath: "/pages/life/life", + // iconPath: "/images/icon/life.png", + // selectedIconPath: "/images/icon/life-a.png", + // text: "生活圈" + // }, { pagePath: "/pages/mine/mine", iconPath: "/images/icon/mine.png", diff --git a/images/banner/banner1.png b/images/banner/banner1.png deleted file mode 100644 index 5474b38..0000000 Binary files a/images/banner/banner1.png and /dev/null differ diff --git a/images/bg02.png b/images/bg02.png deleted file mode 100644 index c0d2da4..0000000 Binary files a/images/bg02.png and /dev/null differ diff --git a/images/icon/nav_10.png b/images/icon/nav_10.png new file mode 100644 index 0000000..fbbea21 Binary files /dev/null and b/images/icon/nav_10.png differ diff --git a/images/icon/nav_4.png b/images/icon/nav_4.png index fbbea21..1bc834f 100644 Binary files a/images/icon/nav_4.png and b/images/icon/nav_4.png differ diff --git a/images/icon/nav_5.png b/images/icon/nav_5.png index 1bc834f..9ce6620 100644 Binary files a/images/icon/nav_5.png and b/images/icon/nav_5.png differ diff --git a/images/icon/nav_6.png b/images/icon/nav_6.png index 9ce6620..91e87e5 100644 Binary files a/images/icon/nav_6.png and b/images/icon/nav_6.png differ diff --git a/images/icon/nav_7.png b/images/icon/nav_7.png index 91e87e5..bc144ca 100644 Binary files a/images/icon/nav_7.png and b/images/icon/nav_7.png differ diff --git a/images/zixun.png b/images/zixun.png deleted file mode 100644 index 6420c14..0000000 Binary files a/images/zixun.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index ec92eab..9065be8 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -18,6 +18,7 @@ Page({ duration: 1000, navList: [{ name: "政策资讯", + url:"/subpages/index/policy/index/index" }, { name: "入住办理", @@ -28,12 +29,10 @@ Page({ url: "/subpages/index/checkOutConfirm/index/index", }, { - name: "续期申请", + name: "延租申请", url: "/subpages/index/renewalApplication/renewalApplication", }, - { - name: "续期合同", - }, + { name: "报修", url: "/subpages/eventAdd/add/add", @@ -45,6 +44,10 @@ Page({ { name: "生活圈", }, + { + name: "更多", + url:'/pages/serve/serve' + }, ], searchValue: "", policyList:[],//政策列表 @@ -151,6 +154,11 @@ Page({ }, navigateTo(e){ if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){ + if(e.currentTarget.dataset.url === '/pages/serve/serve'){ + wx.switchTab({ + url: '/pages/serve/serve', + }) + } wx.navigateTo({ url: e.currentTarget.dataset.url, }) diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml index 2f7f31d..fef560b 100644 --- a/pages/serve/serve.wxml +++ b/pages/serve/serve.wxml @@ -9,26 +9,26 @@ 居住服务 - + - 入住办理 - - + 入住办理 + + - 退房确认 - - - - 延租申请 - - + 退房确认 + + + + 延租申请 + + - 居住评价 - + 居住评价 + - 其他服务 + 报修报事 故障报修 @@ -39,10 +39,13 @@ 报事儿 去处理 + + \ No newline at end of file diff --git a/pages/serve/serve.wxss b/pages/serve/serve.wxss index bfe0d44..fafcd9d 100644 --- a/pages/serve/serve.wxss +++ b/pages/serve/serve.wxss @@ -24,9 +24,10 @@ margin: 0 auto; top: 25px; color: #ffffff; + padding-bottom:66rpx ; } .list{ width: calc(100vw - 40rpx); - margin: 80rpx auto 0; + margin: 32rpx auto 0; background: linear-gradient(180deg, rgba(227,244,255,1) 0%,rgba(245,249,252,1) 100%); } \ No newline at end of file diff --git a/subpages/OCRCard/pages/confirm/confirm.wxml b/subpages/OCRCard/pages/confirm/confirm.wxml index fe39b74..1c12638 100644 --- a/subpages/OCRCard/pages/confirm/confirm.wxml +++ b/subpages/OCRCard/pages/confirm/confirm.wxml @@ -1,7 +1,7 @@ - + 身份信息 请您确认您的身份信息 diff --git a/subpages/OCRCard/pages/deposit/deposit.wxml b/subpages/OCRCard/pages/deposit/deposit.wxml index cc4e0d7..196daee 100644 --- a/subpages/OCRCard/pages/deposit/deposit.wxml +++ b/subpages/OCRCard/pages/deposit/deposit.wxml @@ -22,7 +22,7 @@ 确定支付 - + diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js index bbe55fe..f97be61 100644 --- a/subpages/index/checkInUser/checkInUser.js +++ b/subpages/index/checkInUser/checkInUser.js @@ -40,7 +40,6 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - if(this.data.form){ const pamars = { bizId:this.data.form.chooseRecId || '', diff --git a/subpages/index/checkInUser/checkInUser.wxml b/subpages/index/checkInUser/checkInUser.wxml index 0cef122..3bd0c75 100644 --- a/subpages/index/checkInUser/checkInUser.wxml +++ b/subpages/index/checkInUser/checkInUser.wxml @@ -1,7 +1,7 @@ - + 身份信息 请您确认您的身份信息 diff --git a/subpages/index/renewalApplication/renewalApplication.wxml b/subpages/index/renewalApplication/renewalApplication.wxml index 5faf88c..b5345d8 100644 --- a/subpages/index/renewalApplication/renewalApplication.wxml +++ b/subpages/index/renewalApplication/renewalApplication.wxml @@ -1,5 +1,5 @@ - + diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.js b/subpages/mine/checkInEvaluate/checkInEvaluate.js new file mode 100644 index 0000000..65e2f33 --- /dev/null +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.js @@ -0,0 +1,104 @@ +import {chooseRoomRec} from '../../../api/index' +Page({ + + /** + * 页面的初始数据 + */ + data: { + list:[] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getList() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + getList(){ + let parm = { + flag:1, + pageSize:10, + pageNo:1 + } + chooseRoomRec(parm).then(res=>{ + if(res.code === 200){ + this.setData({ + list:this.data.list.concat(res.data) + }) + } + }).catch(err=>{ + wx.showToast({ + title: err.msg, + duration:2000, + icon:'none' + }) + }) + }, + scrolltolower(){ + if (this.data.list.length < this.data.total) { + this.setData({ + pageNo: this.data.pageNo + 1 + }) + this.getList() + }else{ + wx.showToast({ + icon:'none', + title:'没有更多了' + }) + } + }, + toEvaluate(e){ + wx.navigateTo({ + url: `/subpages/mine/evaluate/evaluate?id=${e.currentTarget.dataset.item.checkInRecId}`, + }) + } +}) \ No newline at end of file diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.json b/subpages/mine/checkInEvaluate/checkInEvaluate.json new file mode 100644 index 0000000..c8b0606 --- /dev/null +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "no-data":"../../../components/noData/nodata", + "van-divider": "@vant/weapp/divider/index", + "van-button": "@vant/weapp/button/index", + "van-rate": "@vant/weapp/rate/index" + }, + "navigationBarTitleText": "入住评价" +} \ No newline at end of file diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.wxml b/subpages/mine/checkInEvaluate/checkInEvaluate.wxml new file mode 100644 index 0000000..1710595 --- /dev/null +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.wxml @@ -0,0 +1,25 @@ + + + + + + + {{item.apartmentName}} + {{item.status === '1'?'入住办理中':item.status === '4'?'入住中':item.status === '5'?'已退房':''}} + + {{item.buildingName}}-{{item.unitName}}-{{item.houseName}}-{{item.roomType}} + {{item.inDate}}至{{item.outDate}} + + + + + + 青岛免租金租房合同.docx + + 去评价 + + + + + + \ No newline at end of file diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.wxss b/subpages/mine/checkInEvaluate/checkInEvaluate.wxss new file mode 100644 index 0000000..33b58e0 --- /dev/null +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.wxss @@ -0,0 +1,12 @@ +/* subpages/mine/checkInRecord/checkInRecord.wxss */ +.name{ + font-size: 36rpx; +} +.date{ + font-size: 26rpx; + color: #737373; +} +.doc{ + color: #08b3b3; + font-size: 20rpx; +} \ No newline at end of file