diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js index e3760a6..0cdc96d 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js @@ -34,7 +34,8 @@ Page({ happenTime: "", content: "", //内容 address: "", //地址 - demandType:'chengguan' + demandType:'chengguan', + status: "" }, minDate: '2018-01-01 00:00:00', @@ -175,6 +176,7 @@ Page({ 'fmData.responsibleUnit': res.data.responsibleUnit, 'fmData.responsibleName': res.data.responsibleName, 'fmData.responsibleMobile': res.data.responsibleMobile, + 'fmData.status': res.data.status, agencyName: res.data.gridName, showTime: res.data.happenTime, addressContent: res.data.address, @@ -1238,9 +1240,11 @@ formatTimestamp(timestamp) { } console.log("on Show:"+this.data.optionsId) if(this.data.optionsId){ - icEventOldProcess({icEventId: this.data.optionsId}).then(res => { - this.getProcess(res.data); - }) + if (this.data.tabVal === '0' || this.data.tabVal === '2') { + icEventOldProcess({icEventId: this.data.optionsId}).then(res => { + this.getProcess(res.data); + }) + } } }, @@ -1754,7 +1758,6 @@ formatTimestamp(timestamp) { }, previewImage(e) { const currentUrl = e.currentTarget.dataset.url; - wx.previewImage({ current: currentUrl, // 当前显示的图片链接 urls: [currentUrl] // 只预览当前点击的图片 diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index 97f272b..3c0120e 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -1,6 +1,6 @@ - + @@ -55,7 +55,7 @@ - + * @@ -100,7 +100,7 @@ - + * @@ -296,7 +296,7 @@ - + diff --git a/subpages/myTroubleshootDemand/pages/index/index.wxml b/subpages/myTroubleshootDemand/pages/index/index.wxml index 3a9cbe6..e1d4740 100644 --- a/subpages/myTroubleshootDemand/pages/index/index.wxml +++ b/subpages/myTroubleshootDemand/pages/index/index.wxml @@ -9,13 +9,13 @@ {{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}} {{item.name}} {{item.mobile}} - {{item.status == 'processing'?'处理中':'已完成'}} {{item.content}} - {{item.time}} + {{item.time}} + {{item.status == 'processing'?'处理中':'已完成'}} diff --git a/subpages/myTroubleshootDemand/pages/index/index.wxss b/subpages/myTroubleshootDemand/pages/index/index.wxss index 40ff71c..dccca62 100644 --- a/subpages/myTroubleshootDemand/pages/index/index.wxss +++ b/subpages/myTroubleshootDemand/pages/index/index.wxss @@ -67,7 +67,7 @@ page { width: 100%; background-color: #fff; display: flex; - height: 180rpx; + min-height: 180rpx; flex-direction: column; border-radius: 20rpx; padding: 20rpx 30rpx;