From 751be05843b0e3b608dcff0ddb882f48f884d077 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=88=91=E5=A4=84=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BB=A5=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dissatisfied/demandCheck/demandCheck.js   | 13 ++++++++-----
 .../pages/dissatisfied/demandCheck/demandCheck.wxml |  8 ++++----
 .../myTroubleshootDemand/pages/index/index.wxml     |  4 ++--
 .../myTroubleshootDemand/pages/index/index.wxss     |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

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 @@
 <view class="complete-info" >
   <block >
-    <view class="content {{isDisabled ? 'disabled' : ''}}">
+    <view class="content">
       <view class="personal-info">
         <view class="basic-info">
          
@@ -55,7 +55,7 @@
       </view>
 
       <view class="add-issue">
-        <view class="issue-content">
+        <view class="issue-content   {{isDisabled ? 'disabled' : ''}}">
           <view class="item1">
             <view class="field">
               <text class="must">*</text>
@@ -100,7 +100,7 @@
          </view>
       </view>
       <view class="personal-info">
-          <view class="basic-info">
+          <view class="basic-info   {{isDisabled ? 'disabled' : ''}}">
             <view class="item">
                   <view class="field">
                     <text class="must">*</text>
@@ -296,7 +296,7 @@
     </view>
 
     
-      <view class="bto_btn" wx:if="{{optionsId}}">
+      <view class="bto_btn" wx:if="{{optionsId && fmData.status!='' && fmData.status!='closed_case'}}">
         <button hover-class="btn-hover" bind:tap="update" class="btn_blue" >{{isDisabled ? '修改' : '提交'}}</button>
         <button bind:tap="delete" class="btn_yellow">删除</button>
         <button bind:tap="process" class="btn_red" wx:if="{{tabVal === '0' || tabVal === '2'}}">处理</button>
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 @@
                                 <text class="{{item.type == 'event'?'blue_small':item.type == 'chengguan'?'green_small':'red_small'}}">{{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}}</text>
                                 {{item.name}} {{item.mobile}}
                             </view>
-                            <text class="gray_small">{{item.status == 'processing'?'处理中':'已完成'}}</text>
                         </view>
                         <view style="margin-top: 10rpx;">
                             <text class="card_content" maxLines="{{2}}" overflow="ellipsis">{{item.content}}</text>   
                         </view>
                         <view class="bottom">
-                            <view style="color: #C1C1C1;font-size: 26rpx;">{{item.time}}</view>
+                            <view style="color: #c1c1c1;font-size: 26rpx;">{{item.time}}</view>
+                            <view style="color: {{item.status == 'processing'?'#e07f2f':'#C1C1C1'}};font-size: 28rpx;">{{item.status == 'processing'?'处理中':'已完成'}}</view>
                         </view>
                 </view>
                 <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}" ></load-more>
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;