diff --git a/miniprogram/app.json b/miniprogram/app.json index 0f59ab2..18d9e7e 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -53,7 +53,8 @@ "pages/meeting/visitorIinvitation/visitorIinvitation", "pages/meeting/meetingRoom/meetingRoom", "pages/meeting/meetingRoom/meetingFacilities/meetingFacilities", - "pages/meeting/meetingRoom/meetingOrder/meetingOrder" + "pages/meeting/meetingRoom/meetingOrder/meetingOrder", + "pages/meeting/meetingRoom/meetingProtocol/meetingProtocol" ], "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 7458f15..3ebe78c 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -17,8 +17,8 @@ Page({ bg: '/profile/static/index/banner/3.jpg', url: '' }], - protocolFlag : true, - protocolTitle : '《会议室服务协议》', + protocolFlag: true, + protocolTitle: '《会议室服务协议》', }, /** @@ -29,11 +29,19 @@ Page({ }, // 协议点击 - protocolChange(){ + protocolChange() { let _this = this; _this.setData({ protocolFlag: !_this.data.protocolFlag - }); + }); + }, + + // 跳转协议 + jumpProtocol() { + let _this = this; + wx.navigateTo({ + url: "/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol?title=" + _this.data.protocolTitle, + }) }, /** diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 8e12426..3618e51 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -72,7 +72,7 @@ 我已阅读并同意 - {{protocolTitle}} + {{protocolTitle}} diff --git a/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.js b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.js new file mode 100644 index 0000000..1e3eb01 --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.js @@ -0,0 +1,73 @@ +// pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + content : `1:乙方应保证会议室内财物的安全,并注意防火、防盗,会议期间不影响甲方的正常办公。会议室内的设备使用需提前向甲方商议。 + 2:需保持会议中安静,严禁在会议室内及公共场所大声喧哗、嬉戏打闹,影响甲方正常工作。 + 3:保持使用场地的清洁卫生,严禁在会议室范围内乱吐痰、乱扔垃圾,未经甲方同意不能在使用场地内搭设棚架。 + 4:乙方不得擅自将该会议室转租、转让、转借给第三人,或和第三人交换使用。 + 5:请于使用前如实提供会议内容,不得在会议室内进行非法违纪活动,如经发现即停止服务并做报警处理。` + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + // 页面初始化 options为页面跳转所带来的参数 + wx.setNavigationBarTitle({ + title: options.title + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.json b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxml b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxml new file mode 100644 index 0000000..6e0aeee --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxml @@ -0,0 +1,3 @@ + + {{content}} + \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxss b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxss new file mode 100644 index 0000000..29b1e8f --- /dev/null +++ b/miniprogram/pages/meeting/meetingRoom/meetingProtocol/meetingProtocol.wxss @@ -0,0 +1,10 @@ +.containerView { + box-sizing: border-box; + height: 100vh; + width: 100vw; + overflow: auto; + background: #ffffff; + padding: 20rpx 30rpx 100rpx; + font-size: 28rpx; + word-break: break-all; +} \ No newline at end of file