diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 375cc88..d9901f0 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -142,14 +142,19 @@ }, mounted() { const id = getLocationParams('id'); + const getStatus = getLocationParams('status'); + const getTime = getLocationParams('time'); const userInfo = JSON.parse(uni.getStorageSync('userInfo')); this.userId = userInfo.id; if(userInfo.salt === '物业人员' || userInfo.salt === '运维人员') { this.isManager = true; + this.fetchMessageInfo(id); } else { + console.log(getTime) this.isManager = false; + this.status = getStatus + this.time = getTime } - this.fetchMessageInfo(id); }, methods: { handleClick(value, text) { @@ -259,7 +264,8 @@ } .message-text-css { margin-top: 100rpx; - line-height: 72rpx; + // line-height: 72rpx; + word-break: break-all; } .title-area { display: flex; diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 375cc88..d9901f0 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -142,14 +142,19 @@ }, mounted() { const id = getLocationParams('id'); + const getStatus = getLocationParams('status'); + const getTime = getLocationParams('time'); const userInfo = JSON.parse(uni.getStorageSync('userInfo')); this.userId = userInfo.id; if(userInfo.salt === '物业人员' || userInfo.salt === '运维人员') { this.isManager = true; + this.fetchMessageInfo(id); } else { + console.log(getTime) this.isManager = false; + this.status = getStatus + this.time = getTime } - this.fetchMessageInfo(id); }, methods: { handleClick(value, text) { @@ -259,7 +264,8 @@ } .message-text-css { margin-top: 100rpx; - line-height: 72rpx; + // line-height: 72rpx; + word-break: break-all; } .title-area { display: flex; diff --git a/pages/message/message.vue b/pages/message/message.vue index 02e1ef1..a951b84 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -16,7 +16,7 @@ --> {{ item.messageTime }} - + @@ -32,7 +32,7 @@ {{ item.startTime }} - + ~ {{ item.endTime }} @@ -143,9 +143,10 @@ }, methods: { //跳转消息详情页 - clickDetail(id) { + clickDetail(item) { + const time = item.startTime + '~' + item.endTime wx.navigateTo({ - url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}`, + url: `/pages/checkMessageDetail/checkMessageDetail?id=${item.id}&status=${item.status}&time=${time}`, }); }, //获取消息列表 @@ -168,11 +169,11 @@ timeData: item.apply_time, startTime: dateToString( new Date(item.apply_time.slice(0, item.apply_time.indexOf("-"))), - "yyyy-MM-dd" + "yyyy-MM-dd HH:mm:ss" ), endTime: dateToString( new Date(item.apply_time.slice(item.apply_time.indexOf("-") + 1)), - "yyyy-MM-dd" + "HH:mm:ss" ), status: item.visitor_apply_status === "1"