Merge branch 'master' of https://gitee.com/selfridicule/dbd-meeting-wx-small

miniprogram/app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/login/login",
     "pages/index/index",
+    "pages/login/login",
     "pages/login/wxlogin/wxlogin",
     "pages/my/my",
     "pages/community/community",
@@ -56,7 +56,9 @@
     "pages/meeting/meetingRoom/meetingOrder/meetingOrder",
     "pages/meeting/meetingRoom/meetingProtocol/meetingProtocol",
     "pages/meeting/meetingRoom/meetingCoupon/meetingCoupon",
-    "pages/meeting/pay/waitPay/waitPay"
+    "pages/meeting/pay/waitPay/waitPay",
+    "pages/meeting/pay/waitComplete/waitComplete",
+    "pages/meeting/reservationRecord/reservationRecord"
   ],
   "window": {
     "backgroundTextStyle": "light",

miniprogram/pages/index/index.js

@@ -85,14 +85,14 @@ Page({
             },      
             */
             {
-                name: "会议邀约",
+                name: "会议预约",
                 img: "/profile/static/index/menu-hyyy.png",
                 path: "/pages/meeting/meetingReservation/meetingReservation"
             },
             {
                 name: "预约记录",
                 img: "/profile/static/index/menu-yyjl.png",
-                path: ""
+                path: "/pages/meeting/reservationRecord/reservationRecord"
             },
             {
                 name: "访客预约",

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

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

miniprogram/pages/meeting/pay/waitComplete/waitComplete.json

@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon/index"
+    },
+    "navigationBarTitleText": "支付结果"
+}

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

@@ -0,0 +1,9 @@
+<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>

miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxss

@@ -0,0 +1,27 @@
+.showView{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin-top: 180rpx;
+}
+
+.showView .title{
+    margin-top: 20rpx;
+    font-size: 34rpx;
+}
+
+.submitBtn{
+    box-sizing: border-box;
+    position: absolute;
+    width: 600rpx;
+    left: 50%;
+    margin-left: -300rpx;
+    bottom: 120rpx;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    background: #4e96f8;
+    color: white;
+    font-size: 30rpx;
+    text-align: center;
+}

miniprogram/pages/meeting/pay/waitPay/waitPay.js

@@ -4,7 +4,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-    countdownTime : 5 * 60 * 1000 // 单位毫秒
+        countdownTime: 5 * 60 * 1000 // 单位毫秒
     },
 
     /**
@@ -14,6 +14,13 @@ Page({
 
     },
 
+    // 跳转-完成页面
+    jumpComplete() {
+        wx.reLaunch({
+            url: '/pages/meeting/pay/waitComplete/waitComplete',
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pages/meeting/pay/waitPay/waitPay.wxml

@@ -8,6 +8,6 @@
     </view>
 
     <!-- 确认支付 -->
-    <view class="submitBtn">确认支付</view>
+    <view class="submitBtn" bind:tap="jumpComplete">确认支付</view>
 
 </view>

miniprogram/pages/meeting/reservationRecord/reservationRecord.js

@@ -0,0 +1,65 @@
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    onLoad(options) {
+        // 页面初始化 options为页面跳转所带来的参数
+        wx.setNavigationBarTitle({
+            title: options.name
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

miniprogram/pages/meeting/reservationRecord/reservationRecord.json

@@ -0,0 +1,5 @@
+{
+    "usingComponents": {
+        "van-icon": "@vant/weapp/icon/index"
+    }
+}

miniprogram/pages/meeting/reservationRecord/reservationRecord.wxml

@@ -0,0 +1,22 @@
+<view class="containerView public">
+
+    <!-- 预约记录列表 -->
+    <view class="itemView">
+        <view class="item">
+            <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"/>
+            <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"/>
+            <view class="title">会议预约记录</view>
+            <van-icon class="goImg" name="share" size="80rpx" color="#ffffff"/>
+        </view>
+    </view>
+
+</view>

miniprogram/pages/meeting/reservationRecord/reservationRecord.wxss

@@ -0,0 +1,24 @@
+.itemView {
+    padding-top: 40rpx;
+}
+
+.itemView .item {
+    border-radius: 16rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin: 20rpx;
+    padding: 50rpx;
+    background: rgb(58, 137, 247);
+    background: linear-gradient(90deg, rgba(58, 137, 247, 1) 0%, rgba(89, 167, 248, 1) 62%);
+}
+
+.itemView .item .title {
+    font-size: 38rpx;
+    color: white;
+    margin-left: 30rpx;
+}
+
+.itemView .item .goImg {
+    margin-left: auto;
+}