From cf88306b1f6aade9f0c6c4fa5859872d3f177c4a Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 13 Sep 2024 14:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

---
 gz-wxparty/pages/myRegisterList/index.wxml |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/gz-wxparty/pages/myRegisterList/index.wxml b/gz-wxparty/pages/myRegisterList/index.wxml
index e1f654e..c847a4d 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxml
+++ b/gz-wxparty/pages/myRegisterList/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/myRegisterList/index.wxml-->
 <view class="three-tag">
-  <van-tabs bind:click="threeTagChange" active="{{search.personType}}">
+  <van-tabs animated bind:click="threeTagChange" active="{{search.personType}}">
     <van-tab title="我是申请方" name="1"></van-tab>
     <van-tab title="我是被申请方" name="2"></van-tab>
   </van-tabs>
@@ -13,9 +13,14 @@
 
 <view class="list" wx:for="{{dataList}}" data-item="{{ item }}" data-index="{{ index }}" wx:key="index">
   <view style="{{!item.show&&'border-bottom:none'}}" class="list-top">
-    <view><time-format format="YYYY年MM月DD日" value="{{item.createTime}}" />反映诉求</view>
+    <view>
+      <time-format format="YYYY年MM月DD日" value="{{item.createTime}}" />反映诉求
+    </view>
     <view class="list-top-r">
-      <view class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+      <view wx:if="{{item.processStatus===1}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+      <view wx:if="{{item.processStatus===2}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+      <view wx:if="{{item.processStatus===3}}" class="list-top-r-tag list-top-r-tag-grey">{{item.processStatusName||'-'}}</view>
+      <view wx:if="{{item.processStatus===4}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
       <van-icon wx:if="{{item.show}}" size='16' bindtap="changeShow" data-index="{{ index }}" name="{{imgUrl}}myRegisterList_1.png" />
       <van-icon wx:else size='16' bindtap="changeShow" data-index="{{ index }}" name="{{imgUrl}}myRegisterList_4.png" />
     </view>
@@ -35,28 +40,41 @@
       <view class="list-content-title">被申请方</view>
       <view class="list-content-value">{{item.defendantNames}}</view>
     </view>
+    <view wx:if="{{item.processStatus>1}}" class="list-content-flex margin-top">
+      <view class="list-content-title">承办部门</view>
+      <view class="list-content-value">{{item.mediateDeptName||'-'}}</view>
+    </view>
+    <view wx:if="{{item.processStatus>2}}" class="list-content-flex margin-top">
+      <view class="list-content-title">化解结果</view>
+      <view wx:if="{{item.mediResult===1}}" class="list-content-value green-title">{{item.mediResultName||'-'}}</view>
+      <view wx:if="{{item.mediResult===2}}" class="list-content-value red-title">{{item.mediResultName||'-'}}</view>
+    </view>
     <view class="list-border"></view>
     <view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/myRegisterDetail/index?id='+item.id}}">
       <view class="list-detail-l">
-        <van-icon size='16' name="{{imgUrl}}myRegisterList_1.png" />
+        <van-icon size='16' name="{{imgUrl}}myRegisterList_6.svg" />
         <view class="list-detail-title">事项详情</view>
       </view>
       <view class="list-detail-r">查看</view>
     </view>
-    <view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/AIAide/index?caseDes='+item.caseDes+'&caseClaim='+item.caseClaim+'&caseId='+item.id}}">
+    <view wx:if="{{item.processStatus<3}}" class="list-detail" bindtap="GoPage" data-url="{{'../../pages/AIAide/index?caseDes='+item.caseDes+'&caseClaim='+item.caseClaim+'&caseId='+item.id}}">
       <view class="list-detail-l">
-        <van-icon size='16' name="{{imgUrl}}myRegisterList_2.png" />
-        <view class="list-detail-title">解纷助手</view>
+        <van-icon size='16' name="{{imgUrl}}myRegisterList_7.png" />
+        <view class="list-detail-title">穗调解数智人</view>
       </view>
       <view class="list-detail-r">查看</view>
     </view>
-    <view wx:if="{{item.processStatus !==1}}" bindtap="GoPage" data-url="../../pages/myRegisterFlow/index" class="list-detail">
+    <view wx:if="{{item.processStatus>1}}" bindtap="GoPage" data-url="../../pages/myRegisterFlow/index" class="list-detail">
       <view class="list-detail-l">
         <van-icon size='16' name="{{imgUrl}}myRegisterList_3.png" />
         <view class="list-detail-title">办理流程</view>
       </view>
       <view class="list-detail-r">查看</view>
     </view>
+    <view wx:if="{{item.processStatus>2&&item.isEvaluate==='0'}}" class="list-border"></view>
+    <view wx:if="{{item.processStatus>2&&item.isEvaluate==='0'}}" style="margin: 24rpx 0;">
+      <van-button bind:click="evaluate" block data-id="{{item.id}}" type="primary">去评价</van-button>
+    </view>
   </view>
 </view>
 

--
Gitblit v1.8.0