diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 93d262e..80da2c8 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -14,7 +14,7 @@ - + Image {{messageList[0].title || ''}} diff --git a/pages/register/register.js b/pages/register/register.js index f4b079b..b976397 100644 --- a/pages/register/register.js +++ b/pages/register/register.js @@ -74,5 +74,10 @@ Page({ }) } }) + }, + back(){ + wx.switchTab({ + url: '/pages/index/index', + }) } }) \ No newline at end of file diff --git a/pages/register/register.wxml b/pages/register/register.wxml index efa3739..44d807a 100644 --- a/pages/register/register.wxml +++ b/pages/register/register.wxml @@ -2,5 +2,6 @@ 为了更好地服务,我们需要获取您的手机号 -获取手机号 +同意 +不同意 \ No newline at end of file diff --git a/subpages/index/renewalApplication/renewalApplication.wxml b/subpages/index/renewalApplication/renewalApplication.wxml index ffa61aa..94678e1 100644 --- a/subpages/index/renewalApplication/renewalApplication.wxml +++ b/subpages/index/renewalApplication/renewalApplication.wxml @@ -5,8 +5,7 @@ 温馨提示: - 您需要登陆“爱山东”APP搜索“青岛人才”, - 进入青岛免租金住房系统进行续期申请。 + 您需要登陆“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。 diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.js b/subpages/mine/checkInEvaluate/checkInEvaluate.js index 65e2f33..acd0d7c 100644 --- a/subpages/mine/checkInEvaluate/checkInEvaluate.js +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.js @@ -97,8 +97,9 @@ Page({ } }, toEvaluate(e){ + console.log(e); wx.navigateTo({ - url: `/subpages/mine/evaluate/evaluate?id=${e.currentTarget.dataset.item.checkInRecId}`, + url: `/subpages/mine/evaluate/evaluate?id=${e.currentTarget.dataset.item.checkInRecId}&obj=${JSON.stringify({apartmentName:e.currentTarget.dataset.item.apartmentName,buildingName:e.currentTarget.dataset.item.buildingName,buildingName:e.currentTarget.dataset.item.buildingName,roomType:e.currentTarget.dataset.item.roomType,unitName:e.currentTarget.dataset.item.unitName,checkInRecId:e.currentTarget.dataset.item.checkInRecId,houseName:e.currentTarget.dataset.item.houseName})}`, }) } }) \ No newline at end of file diff --git a/subpages/mine/checkInRecord/checkInRecord.js b/subpages/mine/checkInRecord/checkInRecord.js index 28f3b9f..818b0e6 100644 --- a/subpages/mine/checkInRecord/checkInRecord.js +++ b/subpages/mine/checkInRecord/checkInRecord.js @@ -72,6 +72,15 @@ Page({ } chooseRoomRec(parm).then(res=>{ if(res.code === 200){ + // res.data.list.forEach(item=>{ + // item.inDate = item.inDate.substr(0,10) + // item.outDate = item.inDate.substr(0,10) + // }) + res.data.forEach(item=>{ + item.inDate = item.inDate.substr(0,10) + item.outDate = item.outDate.substr(0,10) + + }) this.setData({ list:this.data.list.concat(res.data) }) diff --git a/subpages/mine/evaluate/evaluate.js b/subpages/mine/evaluate/evaluate.js index ee974a6..8ea7b87 100644 --- a/subpages/mine/evaluate/evaluate.js +++ b/subpages/mine/evaluate/evaluate.js @@ -24,13 +24,17 @@ Page({ onLoad(options) { if (options.id) { this.getInfo(options.id) + console.log(options.obj); + this.setData({ + info:JSON.parse(options.obj) + }) } }, getInfo(id){ evaluateInfo(id).then(res=>{ if(res.code === 200){ this.setData({ - info:res.data + // info:res.data }) } }) diff --git a/subpages/mine/evaluate/evaluate.wxml b/subpages/mine/evaluate/evaluate.wxml index 40d008e..6ace879 100644 --- a/subpages/mine/evaluate/evaluate.wxml +++ b/subpages/mine/evaluate/evaluate.wxml @@ -5,7 +5,7 @@ {{info.apartmentName}} - {{info.buildingName}}-{{info.unitName}}-{{info.houseName}}-{{info.roomTypeName}} + {{info.buildingName}}-{{info.unitName}}-{{info.houseName}}-{{info.roomType}} {{info.houseTypeName}}