冲突解决

miniprogram/app.json

@@ -60,7 +60,9 @@
     "pages/meeting/pay/waitComplete/waitComplete",
     "pages/meeting/reservationRecord/reservationRecord",
     "pages/meeting/visitorIinvitation/indexBar/indexBar",
-    "pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord"
+    "pages/meeting/visitorIinvitation/appointmentRecord/appointmentRecord",
+    "pages/meeting/reservationRecord/meetingRecord/meetingRecord",
+    "pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail"
   ],
   "window": {
     "backgroundTextStyle": "light",

miniprogram/app.wxss

@@ -93,12 +93,14 @@ page {
     background: #fff;
 }
 
-.flow-list custom-li, .addres-list custom-li {
+.flow-list custom-li,
+.addres-list custom-li {
     margin-top: 25rpx;
     display: block;
 }
 
-.flow-list custom-li:first-child, .addres-list custom-li:first-child {
+.flow-list custom-li:first-child,
+.addres-list custom-li:first-child {
     margin-top: 0;
 }
 
@@ -347,9 +349,16 @@ image {
 }
 
 .containerView.public {
+    box-sizing: border-box;
     height: 100vh;
     width: 100vw;
     overflow: auto;
     padding-bottom: 100rpx;
     background: #ffffff;
 }
+
+.leftLineTitle {
+    border-left: 8rpx solid #76aef9;
+    padding-left: 10rpx;
+    font-size: 32rpx;
+}

miniprogram/pages/meeting/pay/waitComplete/waitComplete.js

@@ -15,6 +15,13 @@ Page({
 
     },
 
+    // 跳转-会议预约记录
+    jumpMeetingRecord() {
+        wx.reLaunch({
+            url: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord",
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml

@@ -1,9 +1,11 @@
 <view class="containerView public">
+
+    <!-- 支付展示 -->
     <view class="showView">
         <van-icon name="checked" size="200rpx" color="#4e96f8"/>
         <view class="title">支付成功</view>
     </view>
 
     <!-- 查看预约 -->
-    <view class="submitBtn" bind:tap="jumpComplete">查看预约</view>
+    <view class="submitBtn" bind:tap="jumpMeetingRecord">查看预约</view>
 </view>

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js

@@ -0,0 +1,67 @@
+const app = getApp()
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        IMG_NAME: app.IMG_NAME,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "会议预约详情"
+}

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml

@@ -0,0 +1,74 @@
+<view class="containerView public">
+    <!-- 展示区域 -->
+    <view class="itemView">
+        <view class="contentView">
+            <image class="img" src="{{IMG_NAME + '/profile/static/index/banner/1.jpg'}}" mode="aspectFill"></image>
+            <view class="msgView">
+                <view class="title">10人间 | B2A | 3F</view>
+                <view class="name">space spacespace spacespace spacespace spacespace space</view>
+                <view class="time">2023-01-01 10:10~12:12</view>
+            </view>
+            <view class="priceView">
+                <view class="price">￥200.00</view>
+                <view class="unit">/半小时</view>
+            </view>
+        </view>
+    </view>
+
+    <!-- 基本信息 -->
+    <view class="basicView">
+        <view class="labelTitle">基本信息</view>
+        <view class="cellView">
+            <view class="label">会议时间</view>
+            <view class="content">2024-01-01 10:10~11:10 共计1小时</view>
+        </view>
+        <view class="cellView">
+            <view class="label">会议主题</view>
+            <view class="content">My Meeting Room</view>
+        </view>
+        <view class="cellView">
+            <view class="label">会议预约人</view>
+            <view class="content">admin</view>
+        </view>
+        <view class="cellView">
+            <view class="label">联系方式</view>
+            <view class="content">10086</view>
+        </view>
+        <view class="labelTitle">订单信息</view>
+        <view class="cellView">
+            <view class="label">订单类型</view>
+            <view class="content">会议室订单</view>
+        </view>
+        <view class="cellView">
+            <view class="label">订单状态</view>
+            <view class="content status">待使用</view>
+        </view>
+        <view class="cellView">
+            <view class="label">订单编号</view>
+            <view class="content">FO2121654654654</view>
+        </view>
+        <view class="cellView">
+            <view class="label">创建时间</view>
+            <view class="content">2024-01-01 12:12:00</view>
+        </view>
+        <view class="cellView">
+            <view class="label">优惠卷</view>
+            <view class="content">1张</view>
+        </view>
+        <view class="cellView">
+            <view class="label">支付金额</view>
+            <view class="content payMoney">￥200.00</view>
+        </view>
+        <view class="cellView">
+            <view class="label">支付时间</view>
+            <view class="content">2024-01-01 12:12:00</view>
+        </view>
+    </view>
+
+    <!-- 底部区域 -->
+    <view class="bottomFix">
+        <view class="btn">去支付</view>
+        <view class="btn">去邀请</view>
+        <view class="btn">取消订单</view>
+    </view>
+</view>

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss

@@ -0,0 +1,120 @@
+.containerView.public {
+    padding-bottom: 200rpx;
+}
+
+.itemView {
+    padding: 0 20rpx;
+}
+
+.itemView .contentView {
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    width: 100%;
+    margin-top: 20rpx;
+    padding: 30rpx 20rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    background: #f2f2f2;
+}
+
+.itemView .contentView .img {
+    border-radius: 10rpx;
+    width: 200rpx;
+    height: 110rpx;
+}
+
+.itemView .contentView .msgView {
+    flex: 1;
+    margin: 0 20rpx;
+    word-break: break-all;
+}
+
+.itemView .contentView .msgView .title {
+    font-size: 28rpx;
+}
+
+.itemView .contentView .msgView .name,
+.itemView .contentView .msgView .time {
+    font-size: 24rpx;
+    color: gray;
+    margin-top: 6rpx;
+}
+
+.itemView .contentView .priceView {
+    text-align: right;
+}
+
+.itemView .contentView .priceView .price {
+    font-size: 28rpx;
+    font-weight: bold;
+    color: red;
+}
+
+.itemView .contentView .priceView .unit {
+    font-size: 22rpx;
+    color: gray;
+}
+
+
+.basicView {}
+
+.basicView .labelTitle {
+    margin: 40rpx 20rpx;
+    font-size: 32rpx;
+}
+
+.basicView .cellView {
+    border-bottom: 1px solid rgb(126, 126, 126, 0.2);
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    padding: 30rpx 20rpx;
+    word-break: break-all;
+}
+
+.basicView .cellView .label {
+    font-size: 28rpx;
+    min-width: 180rpx;
+}
+
+.basicView .cellView .content {
+    font-size: 26rpx;
+}
+
+.basicView .cellView .content.payMoney {
+    font-size: 28rpx;
+    font-weight: bold;
+    color: red;
+}
+
+.basicView .cellView .content.status {
+    color: #4e96f8;
+}
+
+.bottomFix {
+    box-sizing: border-box;
+    position: fixed;
+    z-index: 1;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 160rpx;
+    background: white;
+    box-shadow: rgb(187, 187, 187) 0px 0px 6px 0px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+    align-items: center;
+    padding-right: 20rpx;
+}
+
+.bottomFix .btn {
+    border: 1px solid #4e96f8;
+    border-radius: 10rpx;
+    margin-right: 16rpx;
+    margin-top: -20rpx;
+    padding: 10rpx 24rpx;
+    font-size: 30rpx;
+    color: #4e96f8;
+}

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js

@@ -0,0 +1,87 @@
+const app = getApp()
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        IMG_NAME: app.IMG_NAME,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    // 跳转-支付
+    jumpPay() {
+        wx.navigateTo({
+            url: "/pages/meeting/pay/waitPay/waitPay"
+        })
+    },
+
+    // 跳转-预约详情
+    jumpMeetingDetail() {
+        wx.navigateTo({
+            url: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail",
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+        let param = {
+            title: "space 会议室101",
+            path: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail",
+            imageUrl: app.IMG_NAME + '/profile/static/index/banner/1.jpg',
+        }
+        console.log('onShareAppMessage' , param);
+        return param;
+    }
+})

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "会议预约记录"
+}

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml

@@ -0,0 +1,30 @@
+<view class="containerView public">
+    <view class="itemView" wx:for="{{2}}">
+        <view class="headView">
+            <view class="number">YGDH20240120122</view>
+            <view class="status">待使用</view>
+        </view>
+        <view class="contentView" bind:tap="jumpMeetingDetail">
+            <image class="img" src="{{IMG_NAME + '/profile/static/index/banner/1.jpg'}}" mode="aspectFill"></image>
+            <view class="msgView">
+                <view class="title">10人间 | B2A | 3F</view>
+                <view class="name">space spacespace spacespace spacespace space</view>
+                <view class="time">2023-01-01 10:10~12:12</view>
+            </view>
+        </view>
+        <view class="priceView">
+            <view class="name">总价:</view>
+            <view class="price">￥200.00</view>
+        </view>
+        <view class="btnView">
+            <view class="btn" bind:tap="jumpPay">去支付</view>
+            <view class="btn">去邀请</view>
+            <view class="btn">取消订单</view>
+            <view class="btn" bind:tap="jumpMeetingDetail">查看会议</view>
+        </view>
+    </view>
+
+    <!-- 测试转发 -->
+    <button open-type="share">转发</button>
+
+</view>

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss

@@ -0,0 +1,95 @@
+.containerView.public {
+    background: none;
+}
+
+.itemView {
+    background: white;
+    margin: 30rpx 20rpx;
+    padding: 30rpx 20rpx;
+    /* box-shadow: rgba(210,210,210,0.5) 0px 3.752px 3.752px 0px; */
+}
+
+.itemView .headView {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.itemView .headView .number {
+    font-size: 26rpx;
+}
+
+.itemView .headView .status {
+    font-size: 26rpx;
+    color: #4e96f8;
+    margin-right: 20rpx;
+}
+
+.itemView .contentView {
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    width: 100%;
+    margin-top: 20rpx;
+    padding: 30rpx 20rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    background: #f2f2f2;
+}
+
+.itemView .contentView .img {
+    border-radius: 10rpx;
+    width: 200rpx;
+    height: 110rpx;
+}
+
+.itemView .contentView .msgView {
+    flex: 1;
+    margin-left: 20rpx;
+    word-break: break-all;
+}
+
+.itemView .contentView .msgView .title {
+    font-size: 28rpx;
+}
+
+.itemView .contentView .msgView .name,
+.itemView .contentView .msgView .time {
+    font-size: 24rpx;
+    color: gray;
+    margin-top: 6rpx;
+}
+
+.itemView .priceView {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin: 30rpx 0;
+}
+
+.itemView .priceView .name {
+    font-size: 26rpx;
+}
+
+.itemView .priceView .price {
+    font-size: 28rpx;
+    font-weight: bold;
+    color: red;
+    margin-left: 10rpx;
+}
+
+.itemView .btnView {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+
+}
+
+.itemView .btnView .btn {
+    border: 1px solid #4e96f8;
+    border-radius: 10rpx;
+    margin-left: 16rpx;
+    padding: 10rpx 24rpx;
+    font-size: 24rpx;
+    color: #4e96f8;
+}

miniprogram/pages/meeting/reservationRecord/reservationRecord.js

@@ -14,6 +14,13 @@ Page({
         })
     },
 
+    // 跳转-会议记录
+    jumpMeetingRecord() {
+        wx.navigateTo({
+          url: '/pages/meeting/reservationRecord/meetingRecord/meetingRecord',
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pages/meeting/reservationRecord/reservationRecord.wxml

@@ -2,19 +2,19 @@
 
     <!-- 预约记录列表 -->
     <view class="itemView">
-        <view class="item">
+        <view class="item" bind:tap="jumpMeetingRecord">
             <van-icon name="clock-o" size="80rpx" color="#ffffff"/>
             <view class="title">会议预约记录</view>
             <van-icon class="goImg" name="share" size="80rpx" color="#ffffff"/>
         </view>
         <view class="item">
-            <van-icon name="clock-o" size="80rpx" color="#ffffff"/>
+            <van-icon name="manager" size="80rpx" color="#ffffff"/>
-            <view class="title">会议预约记录</view>
+            <view class="title">访客预约记录</view>
             <van-icon class="goImg" name="share" size="80rpx" color="#ffffff"/>
         </view>
         <view class="item">
-            <van-icon name="clock-o" size="80rpx" color="#ffffff"/>
+            <van-icon name="live" size="80rpx" color="#ffffff"/>
-            <view class="title">会议预约记录</view>
+            <view class="title">展厅预约记录</view>
             <van-icon class="goImg" name="share" size="80rpx" color="#ffffff"/>
         </view>
     </view>

miniprogram/pages/meeting/reservationRecord/reservationRecord.wxss

@@ -7,7 +7,7 @@
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    margin: 20rpx;
+    margin: 30rpx 20rpx;
     padding: 50rpx;
     background: rgb(58, 137, 247);
     background: linear-gradient(90deg, rgba(58, 137, 247, 1) 0%, rgba(89, 167, 248, 1) 62%);