diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
index edf68a3..663889f 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
@@ -200,8 +200,18 @@ Page({
// 会议室列表数据
meetingRoomListRq(param).then(res => {
console.log('meetingRoomListRq', res);
+ let roomDataList = res.rows.map(item => {
+ if (item.indoorPicUrl) {
+ try {
+ item.indoorPicUrlFirst = JSON.parse(item.indoorPicUrl)[0].url
+ } catch (error) {
+ console.log(`JSON error : ${error}`);
+ }
+ }
+ return item
+ })
_this.setData({
- roomDataList: res.rows
+ roomDataList
})
})
},
diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
index 1b8250e..f6db9d9 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
@@ -38,7 +38,7 @@
{{room.typeName}}
-
+
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
index 97309ed..773e5f2 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js
@@ -66,9 +66,18 @@ Page({
getDetail() {
let _this = this;
meetingRoomDetailRq(this.data.meetingRoomId).then(res => {
+ let detail = res.roomContent;
+ let bannerList = []
+ if (detail.indoorPicUrl) {
+ try {
+ bannerList = JSON.parse(detail.indoorPicUrl).map(item=>item.url)
+ } catch (error) {
+ console.log(`JSON error : ${error}`);
+ }
+ }
_this.setData({
- room: res.roomContent,
- bannerList: [res.roomContent.indoorPicUrl]
+ room: detail,
+ bannerList
})
})
},
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
index 922c286..18bf16f 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
@@ -27,10 +27,19 @@ Page({
let meetingRoomId = options.id;
meetingRoomDetailRq(meetingRoomId).then(res => {
console.log('meetingRoomDetailRq', res);
+ let detail = res.roomContent;
+ let bannerList = []
+ if (detail.indoorPicUrl) {
+ try {
+ bannerList = JSON.parse(detail.indoorPicUrl).map(item=>item.url)
+ } catch (error) {
+ console.log(`JSON error : ${error}`);
+ }
+ }
_this.setData({
meetingRoomId,
- detail: res.roomContent,
- bannerList: [res.roomContent.indoorPicUrl]
+ detail,
+ bannerList
})
})
// 获取地址信息
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index 428bbaa..67c14b3 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -100,6 +100,14 @@ Page({
detail.showDetail = showDetail;
// 状态字体颜色
detail.statusColor = statusColor;
+ // 图片
+ if (detail.roomContent.indoorPicUrl) {
+ try {
+ detail.roomContent.indoorPicUrlFirst = JSON.parse(detail.roomContent.indoorPicUrl)[0].url
+ } catch (error) {
+ console.log(`JSON error : ${error}`);
+ }
+ }
_this.setData({
detail
})
@@ -227,7 +235,7 @@ Page({
let param = {
title: detail.title,
path: "/pages/meeting/invite/invite?id=" + id,
- imageUrl: app.IMG_NAME + detail.roomContent.indoorPicUrl,
+ imageUrl: app.IMG_NAME + detail.roomContent.indoorPicUrlFirst,
}
console.log('onShareAppMessage', param);
return param;
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index f471f8a..b3e9932 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -2,7 +2,7 @@
-
+
{{detail.roomContent.capacityNum}}人间 | {{detail.roomContent.roomName}} | {{detail.roomContent.buildingName}}
{{detail.title}}
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
index d0ecdd6..ee967d5 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
@@ -229,6 +229,14 @@ Page({
item.showDetail = showDetail;
// 状态字体颜色
item.statusColor = statusColor;
+ // 图片
+ if (item.roomContent.indoorPicUrl) {
+ try {
+ item.roomContent.indoorPicUrlFirst = JSON.parse(item.roomContent.indoorPicUrl)[0].url
+ } catch (error) {
+ console.log(`JSON error : ${error}`);
+ }
+ }
return item;
})
@@ -401,7 +409,7 @@ Page({
let param = {
title: detail.title,
path: "/pages/meeting/invite/invite?id=" + id,
- imageUrl: app.IMG_NAME + detail.roomContent.indoorPicUrl,
+ imageUrl: app.IMG_NAME + detail.roomContent.indoorPicUrlFirst,
}
console.log('onShareAppMessage', param);
return param;
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
index 5ed8d13..c64cdef 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
@@ -7,7 +7,7 @@
{{item.statusName}}
-
+
{{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}}
预约人: {{item.createBy}}