From 65ece9c00b48ebd62fc2fc4949e49a4a2bc98ee0 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Mon, 8 Apr 2024 17:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E5=B1=95=E5=8E=85=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exhibitionRecord/detail/detail.js                | 12 ++++++++++--
 .../exhibitionRecord/detail/detail.wxml              |  6 +++++-
 .../reservationRecord/exhibitionRecord/list/list.js  | 12 ++++++++++--
 .../exhibitionRecord/list/list.wxml                  |  3 ++-
 .../exhibitionRecord/list/list.wxss                  | 11 +++++++++++
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.js b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.js
index 1cce389..707204f 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.js
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.js
@@ -52,8 +52,8 @@ Page({
                 color = "#3794FF"
             } else if (detail.status == 1) { // 审核通过
                 color = "#62c855"
-            } else if (detail.status == 2) { // 审核驳回
-                color = "red"
+            } else if (detail.status == 4) { // 审核驳回
+                color = "#7F7F7F"
             }
             detail.statusColor = color;
             // persons
@@ -61,6 +61,14 @@ Page({
             let personList = []
             if (persons) {
                 personList = JSON.parse(persons);
+            }
+             // 图片
+             if (detail.indoorPicUrl) {
+                try {
+                    detail.indoorPicUrlFirst = JSON.parse(detail.indoorPicUrl)[0].url
+                } catch (error) {
+                    console.log(`JSON error : ${error}`);
+                }
             }
             //
             _this.setData({
diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
index d3476f8..86dbe99 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/detail/detail.wxml
@@ -2,7 +2,7 @@
     <!-- 展示区域 -->
     <view class="itemView">
         <view class="contentView">
-            <image class="img" src="{{IMG_NAME + detail.indoorPicUrl}}" mode="aspectFill"></image>
+            <image class="img" src="{{IMG_NAME + detail.indoorPicUrlFirst}}" mode="aspectFill"></image>
             <view class="msgView">
                 <view class="title">{{detail.capacityNum}}人间 | {{detail.roomName}} | {{detail.buildingName}}</view>
                 <view class="name">{{detail.title}}</view>
@@ -73,6 +73,10 @@
             <view class="label">展厅状态</view>
             <view class="content status" style="color: {{detail.statusColor}};">{{detail.statusName}}</view>
         </view>
+        <view class="cellView" wx:if="{{detail.status == 4}}">
+            <view class="label">取消原因</view>
+            <view class="content status" style="color: {{detail.statusColor}};">{{detail.cancelResaon}}</view>
+        </view>
         <view class="cellView">
             <view class="label">展厅编号</view>
             <view class="content">{{detail.reservationNumber}}</view>
diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.js b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.js
index 890b33d..0d49237 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.js
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.js
@@ -76,12 +76,20 @@ Page({
                 color = "#3794FF"
             } else if (item.status == 1) { // 审核通过
                 color = "#62c855"
-            } else if (item.status == 2) { // 审核驳回
-                color = "red"
+            } else if (item.status == 4) { // 审核驳回
+                color = "#7F7F7F"
             }
             item.timeSlot = selfFormatTimeYMD(item.startTime) + ' ' + selfFormatTimeHM(item.startTime) + '~' + selfFormatTimeHM(item.endDate);
             console.log('item.timeSlot', item.timeSlot);
             item.statusColor = color;
+            // 图片
+            if (item.indoorPicUrl) {
+                try {
+                    item.indoorPicUrlFirst = JSON.parse(item.indoorPicUrl)[0].url
+                } catch (error) {
+                    console.log(`JSON error : ${error}`);
+                }
+            }
             return item;
         })
     },
diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxml b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxml
index ba236f2..74ee615 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxml
@@ -5,13 +5,14 @@
             <view class="status" style="color: {{item.statusColor}};">{{item.statusName}}</view>
         </view>
         <view class="contentView">
-            <image class="img" src="{{IMG_NAME + item.indoorPicUrl}}" mode="aspectFill"></image>
+            <image class="img" src="{{IMG_NAME + item.indoorPicUrlFirst}}" mode="aspectFill"></image>
             <view class="msgView">
                 <view class="title">{{item.capacityNum}}人间 | {{item.roomName}} | {{item.buildingName}}</view>
                 <view class="name">预约人: {{item.createBy}}</view>
                 <view class="time">{{item.timeSlot}}</view>
             </view>
         </view>
+        <view class="cancelContent" wx:if="{{item.status == 4 && item.cancelResaon}}">取消原因: {{item.cancelResaon}}</view>
         <view class="btnView">
             <view class="btn">查看详情</view>
         </view>
diff --git a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxss b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxss
index c847c77..842e59b 100644
--- a/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxss
+++ b/miniprogram/pages/meeting/reservationRecord/exhibitionRecord/list/list.wxss
@@ -68,6 +68,17 @@
     margin-top: 6rpx;
 }
 
+.itemView .cancelContent{
+    margin: 30rpx 0;
+    font-size: 26rpx;
+    color: #7F7F7F;
+
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+    white-space: nowrap;
+}
+
 .itemView .btnView {
     display: flex;
     justify-content: flex-end;