diff --git a/miniprogram/app.json b/miniprogram/app.json
index 80e4154..8480260 100644
--- a/miniprogram/app.json
+++ b/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",
diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index 21339ef..06acb89 100644
--- a/miniprogram/pages/index/index.js
+++ b/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: "访客预约",
diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js
new file mode 100644
index 0000000..82cf9e0
--- /dev/null
+++ b/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() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json
new file mode 100644
index 0000000..27d6a2c
--- /dev/null
+++ b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "van-icon": "@vant/weapp/icon/index"
+ },
+ "navigationBarTitleText": "支付结果"
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml
new file mode 100644
index 0000000..1e3bc13
--- /dev/null
+++ b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml
@@ -0,0 +1,9 @@
+
+
+
+ 支付成功
+
+
+
+ 查看预约
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxss b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxss
new file mode 100644
index 0000000..a194b4e
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/pay/waitPay/waitPay.js b/miniprogram/pages/meeting/pay/waitPay/waitPay.js
index 8e56638..237fb6a 100644
--- a/miniprogram/pages/meeting/pay/waitPay/waitPay.js
+++ b/miniprogram/pages/meeting/pay/waitPay/waitPay.js
@@ -1,65 +1,72 @@
Page({
- /**
- * 页面的初始数据
- */
- data: {
- countdownTime : 5 * 60 * 1000 // 单位毫秒
- },
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ countdownTime: 5 * 60 * 1000 // 单位毫秒
+ },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
- },
+ },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
+ // 跳转-完成页面
+ jumpComplete() {
+ wx.reLaunch({
+ url: '/pages/meeting/pay/waitComplete/waitComplete',
+ })
+ },
- },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
+ },
- },
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
+ },
- },
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
+ },
- },
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
+ },
- },
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
+ },
- },
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
+ },
- }
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/pay/waitPay/waitPay.wxml b/miniprogram/pages/meeting/pay/waitPay/waitPay.wxml
index 380f002..c3a20ab 100644
--- a/miniprogram/pages/meeting/pay/waitPay/waitPay.wxml
+++ b/miniprogram/pages/meeting/pay/waitPay/waitPay.wxml
@@ -8,6 +8,6 @@
- 确认支付
+ 确认支付
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/reservationRecord.js b/miniprogram/pages/meeting/reservationRecord/reservationRecord.js
new file mode 100644
index 0000000..5346e67
--- /dev/null
+++ b/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() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/reservationRecord.json b/miniprogram/pages/meeting/reservationRecord/reservationRecord.json
new file mode 100644
index 0000000..e558cc8
--- /dev/null
+++ b/miniprogram/pages/meeting/reservationRecord/reservationRecord.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "van-icon": "@vant/weapp/icon/index"
+ }
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/reservationRecord.wxml b/miniprogram/pages/meeting/reservationRecord/reservationRecord.wxml
new file mode 100644
index 0000000..7009274
--- /dev/null
+++ b/miniprogram/pages/meeting/reservationRecord/reservationRecord.wxml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ 会议预约记录
+
+
+
+
+ 会议预约记录
+
+
+
+
+ 会议预约记录
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/reservationRecord/reservationRecord.wxss b/miniprogram/pages/meeting/reservationRecord/reservationRecord.wxss
new file mode 100644
index 0000000..439cb16
--- /dev/null
+++ b/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;
+}
\ No newline at end of file