From 86005dc980106809704a7df9ecf201c8ef3db9f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 六月 2024 18:17:34 +0800
Subject: [PATCH] ‘’

---
 h5/pages/staff/meetingCalendar.vue |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 7af417d..6f1fd57 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -71,26 +71,30 @@
 		<template v-if="activeTab === '1'">
 			<view class="card_list">
 				<view class="list">
-					<view class="item" @click="handleDetail()">
+					<view class="item" v-for="item in recordList" :key="item.id" @click="handleDetail(item.id)">
 						<view class="head">
-							<view class="name">aaaaa閫夊瀷</view>
-							<view class="status">鍗冲皢寮�濮�</view>
+							<view class="name">{{ item.meetingName }}</view>
+							<view class="status" v-if="item.meetingStatus == '1'">鏈紑濮�</view>
+							<view class="status red" v-if="item.meetingStatus == '2'">杩涜涓�</view>
+							<view class="status" v-if="item.meetingStatus == '3'">宸茬粨鏉�</view>
+							<view class="status padding" v-if="item.meetingStatus == '4'">鍗冲皢寮�濮�</view>
+							<view class="status" v-if="item.meetingStatus == '5'">宸叉挙閿�</view>
 						</view>
 						<view class="line">
 							<view class="label">浼氳鏃堕棿锛�</view>
-							<view class="value">12:00-12</view>
+							<view class="value">{{ item.meetingTime	 }}</view>
 						</view>
 						<view class="line">
 							<view class="label">浼氳瀹わ細</view>
-							<view class="value">202浼氳瀹�</view>
+							<view class="value">{{ item.roomName }}</view>
 						</view>
 						<view class="line">
 							<view class="label">棰勭害浜猴細</view>
-							<view class="value">鏉ㄦ煇鏌�</view>
+							<view class="value">{{ item.bookingUser }}</view>
 						</view>
 						<view class="line">
 							<view class="label">澶囨敞锛�</view>
-							<view class="value">--</view>
+							<view class="value">{{ item.remark }}</view>
 						</view>
 					</view>
 				</view>
@@ -102,6 +106,7 @@
 <script>
 import Calendar from '@/components/Li-Calendar/Li-Calendar.vue';
 import { getDay } from '@/utils/utils.js';
+import { myMeetingPage } from '@/api'
 function getDate(date, AddDayCount = 0) {
 	if (!date) {
 		date = new Date();
@@ -131,6 +136,8 @@
 	data() {
 		return {
 			activeTab: '0',
+			recordList: [],
+			recordPage: 1,
 			currentTime1: '',
 			dateStart: '1999-05-01',
 			dateEnd: '2999-06-15',
@@ -152,17 +159,23 @@
 					date: getDate(new Date(), -1).fullDate,
 					info: '宸叉墦鍗�'
 				}
-			]
+			],
+
 		};
 	},
 	methods: {
 		tabClick(val) {
 			this.activeTab = val;
+			if(val === '1'){
+				this.getRecordList()
+			}else{
+				this.getList()
+			}
 		},
-		handleDetail(item) {
+		handleDetail(id) {
 			uni.navigateTo({
-				// url: `/pages/staff/meetingDetail?id=${item.id}`,
-				url: `/pages/staff/meetingDetail`
+				url: `/pages/staff/meetingDetail?id=${id}`,
+				// url: `/pages/staff/meetingDetail`
 			});
 		},
 		changeCalendar(e) {
@@ -196,7 +209,22 @@
 			console.log('鏃ユ湡', riqi);
 			this.currentTime1 = riqi;
 			// this.getDateNum()
-		}
+		},
+		getList(){},
+		getRecordList() {
+			const { activeStatus } = this
+      myMeetingPage({
+        capacity: 10,
+        page: this.recordPage,
+        model: {
+					// status: activeStatus.key || null,
+          // roomsId: this.roomId,
+          queryType: 2
+        }
+      }).then(res => {
+				this.recordList = res.data.records
+			})
+    },
 	}
 };
 </script>
@@ -295,6 +323,7 @@
 				padding: 0rpx 30rpx 30rpx;
 				background: #ffffff;
 				border-radius: 8rpx;
+				margin-bottom: 24rpx;
 				.head {
 					display: flex;
 					justify-content: space-between;
@@ -316,6 +345,14 @@
 						font-size: 22rpx;
 						color: #999999;
 					}
+					.padding{
+						color: $uni-color-primary;
+						border: 1rpx solid $uni-color-primary;
+					}
+					.red{
+						color: #e23f29;
+						border: 1rpx solid #e23f29;
+					}
 				}
 				.line {
 					display: flex;

--
Gitblit v1.9.3