1

miniprogram/pages/login/login.js

@@ -39,7 +39,7 @@ Page({
                     // 判断用户是否注册
                     if (res.token) {
                         // 跳转首页
-                        _this.jumpIndex(res.openid, res.user.id, res.token.token)
+                        _this.jumpIndex(res.openid, res.user, res.token.token)
                     }
                 })
             }
@@ -56,14 +56,17 @@ Page({
         }).then(res => {
             console.log('registerPhone', res);
             // 跳转首页
-            _this.jumpIndex(res.openid, res.user.id, res.token.token)
+            _this.jumpIndex(res.openid, res.user, res.token.token)
         })
     },
     // 跳转首页
-    jumpIndex(openid, userId, token) {
+    jumpIndex(openid, user, token) {
+        // 清空所有缓存
+        wx.clearStorageSync()
         // 存储用户信息
         wx.setStorageSync('openid', openid)
-        wx.setStorageSync('userId', userId)
+        wx.setStorageSync('user', user)
+        wx.setStorageSync('userId', user.id)
         wx.setStorageSync('token', token)
         // 跳转首页
         wx.reLaunch({

miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js

@@ -1,5 +1,9 @@
 const app = getApp()
 
+import {
+    meetingRoomDetailRq
+} from "../../../../api/meeting/meetingRoom.js"
+
 Page({
 
     /**
@@ -7,18 +11,16 @@ Page({
      */
     data: {
         IMG_NAME: app.IMG_NAME,
-        bannerList: [{
-            bg: '/profile/static/index/banner/1.jpg',
-            url: ''
-        }, {
-            bg: '/profile/static/index/banner/2.jpg',
-            url: ''
-        }, {
-            bg: '/profile/static/index/banner/3.jpg',
-            url: ''
-        }],
         protocolFlag: true,
         protocolTitle: '《会议室服务协议》',
+        meetingRoomId: null,
+        startTime: null,
+        endTime: null,
+        selectDay : null,
+        selectCountTime : null,
+        bannerList: [],
+        room: {},
+        userData : {},
     },
 
     /**
@@ -30,12 +32,26 @@ Page({
         this.setData({
             ...options
         })
+        // 详细信息
+        this.getDetail();
+    },
+
+    // 详细信息
+    getDetail() {
+        let _this = this;
+        meetingRoomDetailRq(this.data.meetingRoomId).then(res => {
+            _this.setData({
+                room: res.roomContent,
+                bannerList : [res.roomContent.indoorPicUrl]
+            })
+        })
     },
 
     // 跳转-空间设施
     jumpMeetingFacilities() {
+        let meetingRoomId = this.data.meetingRoomId;
         wx.navigateTo({
-            url: '/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities',
+            url: '/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities?meetingRoomId=' + meetingRoomId,
         })
     },
 

miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml

@@ -4,7 +4,7 @@
         <view class="tag">会议室</view>
         <swiper class='swiper-box' indicator-dots autoplay interval="3000" duration="1000" circular='true'>
             <swiper-item wx:for="{{bannerList}}" wx:key="index">
-                <image class="img" src="{{IMG_NAME + item.bg}}" mode="aspectFill"></image>
+                <image class="img" src="{{IMG_NAME + item}}" mode="aspectFill"></image>
             </swiper-item>
         </swiper>
     </view>
@@ -12,13 +12,13 @@
     <!-- 详细信息 -->
     <view class="meetingDetailView">
         <view class="detailView">
-            <view class="title">10人间 | B2A | 12F</view>
+            <view class="title">{{room.capacityNum}}人间 | {{room.roomName}} | {{room.buildingName}}</view>
             <view class="itemList">
-                <view class="item" wx:for="{{5}}">#电视</view>
+                <view class="item" wx:for="{{room.roomItemList}}" wx:for-item="roomItem"  wx:key="*this">#{{roomItem.name}}</view>
             </view>
         </view>
         <view class="priceView">
-            <view class="price">￥ 200.00/</view>
+            <view class="price">￥ {{room.money}}/</view>
             <view class="unit">小时 起</view>
         </view>
     </view>