From 52aa9f64e5dea1c0e30bc1094fa580c3851d8f9d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 14 Sep 2024 18:02:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-wxparty/pages/myRegisterList/index.wxml | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/gz-wxparty/pages/myRegisterList/index.wxml b/gz-wxparty/pages/myRegisterList/index.wxml
index 73e7df1..f19511d 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxml
+++ b/gz-wxparty/pages/myRegisterList/index.wxml
@@ -40,14 +40,22 @@
<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 wx:if="{{item.processStatus===2||item.processStatus===3}}" 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 wx:if="{{item.processStatus===3}}" 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 wx:if="{{item.mediResult==='22_00025-1'}}" class="list-content-value green-title">{{item.mediResultName||'-'}}</view>
+ <view wx:if="{{item.mediResult==='22_00025-2'}}" class="list-content-value red-title">{{item.mediResultName||'-'}}</view>
+ </view>
+ <view wx:if="{{item.agreeType==='24_00003-1'}}" class="list-content-flex margin-top">
+ <view class="list-content-title">协议要点</view>
+ <view wx:if="{{item.agreeContentShow}}" class="list-content-value">{{item.newAgreeContent||'-'}}<text bindtap="agreeContentClick" data-item="{{item}}" class="public-color">更多</text></view>
+ </view>
+ <view wx:if="{{item.agreeType==='24_00003-2'}}" class="list-content-flex margin-top">
+ <view class="list-content-title">协议文书</view>
+ <view bindtap="agreeClick" data-item="{{item}}" class="list-content-value list-detail-r">查看</view>
</view>
<view class="list-border"></view>
<view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/myRegisterDetail/index?id='+item.id}}">
@@ -64,7 +72,7 @@
</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?caseId='+item.id}}" class="list-detail">
<view class="list-detail-l">
<van-icon size='16' name="{{imgUrl}}myRegisterList_3.png" />
<view class="list-detail-title">办理流程</view>
@@ -94,4 +102,17 @@
<van-icon wx:if="{{item.hover}}" size='15' name="{{imgUrl}}myRegisterList_5.png" />
</view>
</view>
+</view>
+
+<van-overlay show="{{ showData.visible }}" bind:click="agreeContentClosePopup">
+
+</van-overlay>
+
+<view wx:if="{{ showData.visible }}" class="showData-title">
+ <view class="showData-title-view">
+ <view class="showData-title-label">协议要点</view>
+ <view>{{showData.title}}</view>
+ </view>
+ <view class="">
+ </view>
</view>
\ No newline at end of file
--
Gitblit v1.8.0