描述:文档修改

miniprogram/app.js

@@ -3,12 +3,12 @@ App({
     APPID: 'wx5582a07c1fbbcf06',
     APPSECRET: 'ad24130a8919c613efd9538f69abafd3',
     tenantId : '1', // 地区-郑州
-    // 域名
-    DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com',
     // 本地测试
+    // DOMAIN_NAME_PREFIX: 'http://192.168.0.11',
     // DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名
     // IMG_NAME: 'http://192.168.0.11:9227',
     // 生产
+    DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com',
     DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名
     IMG_NAME: 'https://www.chuangzhikj.com/saas-ics',
     globals: {

miniprogram/pages/index/index.js

@@ -36,10 +36,10 @@ Page({
                 "text": "首页"
             },
             {
-                "pagePath": "pages/meeting/accessControl/accessControl",
+                "pagePath": "pages/meeting/meetingReservation/meetingReservation",
                 "iconPath": "/images/tabbar/openDoor.png",
                 "selectedIconPath": "/images/tabbar/openDoor.png",
-                "text": "开门",
+                "text": "预约",
                 "bulge": true,
             },
             {
@@ -108,52 +108,52 @@ Page({
                 img: "/profile/static/index/menu-hyyy.png",
                 path: "/pages/meeting/meetingReservation/meetingReservation"
             },
-            {
+            // {
-                name: "展厅预约",
+            //     name: "展厅预约",
-                img: "/profile/static/index/menu-ztyy.png",
+            //     img: "/profile/static/index/menu-ztyy.png",
-                path: "/pages/meeting/exhibition/list/list"
+            //     path: "/pages/meeting/exhibition/list/list"
-            },
+            // },
-            {
+            // {
-                name: "访客预约",
+            //     name: "访客预约",
-                img: "/profile/static/index/menu-fkyy.png",
+            //     img: "/profile/static/index/menu-fkyy.png",
-                path: "/pages/meeting/visitorIinvitation/list/list"
+            //     path: "/pages/meeting/visitorIinvitation/list/list"
-            },
+            // },
             {
                 name: "预约记录",
                 img: "/profile/static/index/menu-yyjl.png",
-                path: "/pages/meeting/reservationRecord/reservationRecord"
+                path: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord"
             },
 
-            {
+            // {
-                name: "远程门禁",
+            //     name: "远程门禁",
-                img: "/profile/static/index/menu-ycmj.png",
+            //     img: "/profile/static/index/menu-ycmj.png",
-                path: "/pages/meeting/accessControl/accessControl"
+            //     path: "/pages/meeting/accessControl/accessControl"
-            },
+            // },
-            {
+            // {
-                name: "报修服务",
+            //     name: "报修服务",
-                img: "/profile/static/index/menu-bxfw.png",
+            //     img: "/profile/static/index/menu-bxfw.png",
-                path: "/pages/parkRepair/parkRepair"
+            //     path: "/pages/parkRepair/parkRepair"
-            },
+            // },
-            {
+            // {
-                name: "投诉建议",
+            //     name: "投诉建议",
-                img: "/profile/static/index/menu-tsjy.png",
+            //     img: "/profile/static/index/menu-tsjy.png",
-                path: "/pages/complaint/complaint"
+            //     path: "/pages/complaint/complaint"
-            },
+            // },
-            {
+            // {
-                name: "社群活动",
+            //     name: "社群活动",
-                img: "/profile/static/index/menu-sqhd.png",
+            //     img: "/profile/static/index/menu-sqhd.png",
-                path: "/pages/community/community"
+            //     path: "/pages/community/community"
-            },
+            // },
-            {
+            // {
-                name: "政策中心",
+            //     name: "政策中心",
-                img: "/profile/static/index/menu-zczx.png",
+            //     img: "/profile/static/index/menu-zczx.png",
-                path: "/pages/notice/notice"
+            //     path: "/pages/notice/notice"
-            },
+            // },
-            {
+            // {
-                name: "入住申请",
+            //     name: "入住申请",
-                img: "/profile/static/index/menu-rzsq.png",
+            //     img: "/profile/static/index/menu-rzsq.png",
-                path: "/pages/applyType/applyType"
+            //     path: "/pages/applyType/applyType"
-            },
+            // },
 
         ],
         bannerList: [],
@@ -165,20 +165,6 @@ Page({
     onLoad(options) {
         console.log('onLoad options', options);
         let _this = this;
-        // 获取到二维码原始链接内容
-        if (options.q) {
-            let url = decodeURIComponent(options.q)
-            let urlParam = getUrlParamsObj(url);
-            // 自动绑定园区
-            wx.setStorageSync('parkId', urlParam.parkId)
-            wx.setStorageSync('parkName', urlParam.parkName)
-            // 是否携带其他参数
-            if (!urlParam.noParam) {
-                _this.setData({
-                    qrcodeParam: urlParam
-                })
-            }
-        }
     },
 
     // 切换tabbar
@@ -186,7 +172,7 @@ Page({
         const data = e.currentTarget.dataset
         console.log('switchTab', data)
         const url = data.path
-        if (url == 'pages/meeting/accessControl/accessControl') {
+        if (url == 'pages/meeting/meetingReservation/meetingReservation') {
             wx.navigateTo({
                 url: '/' + url
             })
@@ -212,8 +198,16 @@ Page({
                     _this.setData({
                         userDetail
                     })
-                    // 登录用户是否选择园区
+                    // 园区id
-                    _this.userIsPark()
+                    let parkId = wx.getStorageSync('parkId');
+                    // 查询轮播图
+                    getParkRq(parkId).then(res => {
+                        console.log('getParkRq', res);
+                        let bannerList = res.bannerImages.map(item => item.url)
+                        _this.setData({
+                            bannerList
+                        })
+                    })
                 } else {
                     app.selfShowMsg(res.msg, '/pages/login/login')
                 }
@@ -223,41 +217,6 @@ Page({
         }
     },
 
-    // 登录用户是否选择园区
-    userIsPark() {
-        let _this = this;
-        let parkId = wx.getStorageSync('parkId');
-        if (parkId) {
-            _this.setData({
-                parkName: wx.getStorageSync('parkName')
-            })
-            getParkRq(parkId).then(res => {
-                console.log('getParkRq', res);
-                let bannerList = res.bannerImages.map(item => item.url)
-                _this.setData({
-                    bannerList
-                })
-            })
-            // 判断是否扫码
-            if (_this.data.qrcodeParam) {
-                // 扫码调用地址
-                _this.scanCallUrl()
-            }
-        } else {
-            wx.navigateTo({
-                url: '/pages/index/parkList/parkList',
-            })
-        }
-    },
-
-
-
-    // 跳转园区
-    jumpPark() {
-        wx.navigateTo({
-            url: '/pages/index/parkList/parkList',
-        })
-    },
 
     navapply(e) {
         if (wx.getStorageSync('token')) {
@@ -276,62 +235,6 @@ Page({
         }
     },
 
-
-    // 扫一扫
-    jumpScan() {
-        let _this = this;
-        wx.scanCode({
-            scanType: 'qrCode',
-            success(res) {
-                console.log('success', res)
-                let url = res.result;
-                // 判断二维码是否符合规范
-                if (url.indexOf(app.DOMAIN_NAME_PREFIX) != -1) {
-                    let urlParam = getUrlParamsObj(url);
-                    // 判断是否有设备参数
-                    if (!urlParam.noParam) {
-                        _this.setData({
-                            qrcodeParam: urlParam
-                        })
-                        // 扫码调用地址
-                        _this.scanCallUrl()
-                    } else {
-                        // 危险通知
-                        _this.showErrMsg('请预约会议!')
-                    }
-                } else {
-                    // 危险通知
-                    _this.showErrMsg('二维码不正确!')
-                }
-            },
-            fail(res) {
-                console.log('fail', res)
-                // 危险通知
-                _this.showErrMsg('扫码失败!')
-            }
-        })
-    },
-
-    // 扫码调用地址
-    scanCallUrl() {
-        let _this = this;
-        let qrcodeParam = _this.data.qrcodeParam;
-        qrcodeParam.userId = wx.getStorageSync('userId')
-        callScanUrl(qrcodeParam).then(res => {
-            // 清空扫码数据
-            _this.setData({
-                qrcodeParam: null
-            })
-            if (res.code == 0) {
-                // 成功通知
-                _this.showSuccessMsg(res.msg)
-            } else {
-                // 危险通知
-                _this.showErrMsg(res.msg)
-            }
-        })
-    },
-
     // 成功通知
     showSuccessMsg(msg) {
         Notify({

miniprogram/pages/index/index.wxml

@@ -1,14 +1,8 @@
 <view class="containerView public">
 
-    <!-- 园区 -->
-    <view bindtap="navparkList" class="topList">
-        <text style="font-size: 28rpx;">当前园区：{{parkName? parkName:'请先选择园区'}}</text>
-        <text style="color: #939393;font-size: 36rpx;"> > </text>
-    </view>
-
     <view class="topHead">
-        <image class="scanImg" src="{{IMG_NAME + '/profile/static/index/scan.png'}}" mode="aspectFill" bind:tap="jumpScan"></image>
+        <!-- <image class="scanImg" src="{{IMG_NAME + '/profile/static/index/scan.png'}}" mode="aspectFill" bind:tap="jumpScan"></image> -->
-        <view class="title ellipsisFont" bind:tap="jumpPark">{{parkName}}</view>
+        <view class="title ellipsisFont">{{parkName}}</view>
     </view>
 
     <view class="loopView">

miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml

@@ -9,8 +9,8 @@
             <van-dropdown-item value="{{ queryParam.personDict.value }}" options="{{ queryParam.personDict.list }}" bind:change="dictChange" data-type="personDict" />
             <!-- 字典-设备 -->
             <van-dropdown-item id="itemSelect" title="{{ queryParam.itemDict.title }}">
-                <van-cell title="{{ item.text }}" wx:for="{{queryParam.itemDict.list}}"  wx:key="*this">
+                <van-cell title="{{ item.text }}" wx:for="{{queryParam.itemDict.list}}" wx:key="*this">
-                    <van-switch slot="right-icon" size="24px" style="height: 26px" checked="{{ item.select }}" active-color="#3c8bf2" bind:change="dictSwitchChange" data-name="{{item.text}}" data-id="{{item.value}}"/>
+                    <van-switch slot="right-icon" size="24px" style="height: 26px" checked="{{ item.select }}" active-color="#3c8bf2" bind:change="dictSwitchChange" data-name="{{item.text}}" data-id="{{item.value}}" />
                 </van-cell>
                 <view style="padding:30rpx;">
                     <van-button type="danger" block round bind:click="itemDictConfirm" color="#3c8bf2">收起</van-button>
@@ -23,17 +23,15 @@
 
     <!-- 会议室列表 -->
     <view class="meetingRoomView">
-        <view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{roomDataList}}" wx:for-item="room"  wx:key="*this" data-id="{{room.id}}">
+        <view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{roomDataList}}" wx:for-item="room" wx:key="*this" data-id="{{room.id}}">
             <view class="content">
                 <view class="title">{{room.capacityNum}}人间 | {{room.roomName}} | {{room.buildingName}}</view>
                 <view class="articleView">
-                    <view class="article" wx:for="{{room.roomItemList}}" wx:for-item="roomItem"  wx:key="*this">#{{roomItem.name}}</view>
+                    <view class="article" wx:for="{{room.roomItemList}}" wx:for-item="roomItem" wx:key="*this">#{{roomItem.name}}</view>
                 </view>
                 <view class="propOpen"></view>
                 <view class="priceView">
-                    <view class="price">￥{{room.money > 0 ? room.money + '/小时' : '免费'}}</view>
+                    <view class="unit">{{room.shape}}</view>
-                    <text decode>&nbsp;</text>
-                    <view class="unit">（{{room.duration}}小时起）</view>
                 </view>
             </view>
             <view class="imgView">

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

@@ -17,10 +17,10 @@
                 <view class="item" wx:for="{{room.roomItemList}}" wx:for-item="roomItem" wx:key="*this">#{{roomItem.name}}</view>
             </view>
         </view>
-        <view class="priceView">
+        <!-- <view class="priceView">
             <view class="price">￥{{room.money > 0 ? room.money * room.duration : '免费'}}/</view>
             <view class="unit"><text decode>&nbsp;</text>{{room.duration}}小时 起</view>
-        </view>
+        </view> -->
     </view>
 
     <!-- 内容 -->
@@ -53,13 +53,13 @@
                 <van-icon name="arrow" size="44rpx" />
             </view>
         </view>
-        <view class="itemView" bind:tap="jumpMeetingCoupon">
+        <!-- <view class="itemView" bind:tap="jumpMeetingCoupon">
             <view class="label">优惠券</view>
             <view class="content">
                 <view class="coupon {{couponId ? 'select' : ''}}">{{couponId? couponData.ticketName : couponUseCount + '张可用'}}</view>
                 <van-icon name="arrow" size="44rpx" />
             </view>
-        </view>
+        </view> -->
         <view class="itemView">
             <view class="label">总金额</view>
             <view class="content">
@@ -68,23 +68,7 @@
         </view>
     </view>
 
-    <!-- 协议 -->
+    <view class="submitBtn" bind:tap="submitCase">提交预约</view>
-    <view class="protocolView">
-        <van-checkbox value="{{ protocolFlag }}" bind:tap="protocolChange" icon-size="26rpx"></van-checkbox>
-        <view bind:tap="protocolChange">我已阅读并同意</view>
-        <view class="protocolTitle" bind:tap="jumpProtocol">{{protocolTitle}}</view>
-    </view>
-
-    <!-- 合计 -->
-    <view class="amountView">
-        <view class="priceView" bind:tap="priceDetail">
-            <view class="title">合计:</view>
-            <view class="price">￥{{totalAmount}}</view>
-            <view class="describe">价格明细</view>
-            <van-icon name="arrow-up" size="28rpx" color="red" />
-        </view>
-        <view class="caseBtn" bind:tap="submitCase">提交订单</view>
-    </view>
 
     <!-- 提示 -->
     <van-dialog id="van-dialog" />

miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss

@@ -186,9 +186,9 @@
 
 .amountView {
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-end;
     align-items: center;
-    padding: 0 38rpx;
+    padding: 40rpx 38rpx;
 }
 
 .amountView .priceView {
@@ -215,6 +215,7 @@
 .amountView .caseBtn {
     border-radius: 10rpx;
     padding: 16rpx 60rpx;
+    width: 100%;
     color: white;
     font-size: 30rpx;
     background: #4e96f8;

miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml

@@ -18,10 +18,6 @@
                 <view class="name">空间面积</view>
                 <view class="value">{{detail.renArea}}m</view>
             </view>
-            <view class="typeItem">
-                <view class="name">办公面积</view>
-                <view class="value">{{detail.area}}m</view>
-            </view>
             <view class="typeItem">
                 <view class="name">形式</view>
                 <view class="value">{{detail.shape}}</view>
@@ -44,18 +40,18 @@
     </view>
 
     <!-- 价格 -->
-    <view class="priceView">
+    <!-- <view class="priceView">
         <view class="leftLineTitle">价格</view>
         <view class="content">￥{{detail.money > 0 ? detail.money + '/小时' : '免费'}}<text decode>&nbsp;</text>（{{detail.duration}}小时起）</view>
         <view class="remark" wx:if="{{detail.remake}}">
             <van-icon name="info-o" size="28rpx" />
             {{detail.remake}}
         </view>
-    </view>
+    </view> -->
 
     <!-- 地图 -->
     <view class="mapView">
-        <view class="leftLineTitle">空间周边</view>
+        <view class="leftLineTitle">会议地点</view>
         <map class="myMap" latitude="{{mapData.latitude}}" longitude="{{mapData.longitude}}" markers="{{mapData.markers}}" show-location bindtap="openMap"></map>
     </view>
 

miniprogram/pages/my/my.js

@@ -37,10 +37,10 @@ Page({
                 "text": "首页"
             },
             {
-                "pagePath": "pages/meeting/accessControl/accessControl",
+                "pagePath": "pages/meeting/meetingReservation/meetingReservation",
                 "iconPath": "/images/tabbar/openDoor.png",
                 "selectedIconPath": "/images/tabbar/openDoor.png",
-                "text": "开门",
+                "text": "预约",
                 "bulge": true,
             },
             {
@@ -52,32 +52,32 @@ Page({
         ],
         customerPages: [{
                 name: "预约记录",
-                url: "/pages/meeting/reservationRecord/reservationRecord",
+                url: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord",
-            },
-            {
-                name: "我的活动",
-                url: "/pages/myActivities/myActivities",
-            },
-            {
-                name: "我的入驻",
-                url: "/pages/my/serviceApply/serviceApply"
-            },
-            {
-                name: "我的建议",
-                url: "/pages/complaint/complaint",
             },
             // {
+            //     name: "我的活动",
+            //     url: "/pages/myActivities/myActivities",
+            // },
+            // {
+            //     name: "我的入驻",
+            //     url: "/pages/my/serviceApply/serviceApply"
+            // },
+            // {
+            //     name: "我的建议",
+            //     url: "/pages/complaint/complaint",
+            // },
+            // {
             //     name: "账号设置",
             //     url: "/pages/my/accountSetting/accountSetting",
             // },
-            {
+            // {
-                name: "我的服务",
+            //     name: "我的服务",
-                url: "/pages/enterpriseServices/myServiceList/myServiceList"
+            //     url: "/pages/enterpriseServices/myServiceList/myServiceList"
-            },
+            // },
-            {
+            // {
-                name: "我的报修",
+            //     name: "我的报修",
-                url: "/pages/parkRepair/parkRepair",
+            //     url: "/pages/parkRepair/parkRepair",
-            }
+            // }
         ],
         qrcodeParam: null,
     },
@@ -87,7 +87,7 @@ Page({
         const data = e.currentTarget.dataset
         console.log('switchTab', data)
         const url = data.path
-        if (url == 'pages/meeting/accessControl/accessControl') {
+        if (url == 'pages/meeting/meetingReservation/meetingReservation') {
             wx.navigateTo({
                 url: '/' + url
             })

miniprogram/pages/my/my.wxml

@@ -13,11 +13,11 @@
     <!-- 菜单 -->
     <view class="itemView">
         <!-- 扫一扫 -->
-        <view class="itemData" bindtap='jumpScan'>
+        <!-- <view class="itemData" bindtap='jumpScan'>
             <view class="label">扫一扫</view>
             <view class="propOpen"></view>
             <van-icon name="scan" size="40rpx" color="gray" />
-        </view>
+        </view> -->
         <!-- 菜单列表 -->
         <view class="itemData" wx:for="{{customerPages}}" wx:key="*this" bindtap='navigateTo' data-url="{{item.url}}" data-name="{{item.name}}">
             <view class="label">{{item.name}}</view>

miniprogram/pages/my/personalData/personalData.wxml

@@ -56,12 +56,12 @@
         <text class="iconfont iconyou" style="font-size:28rpx;color:#B2B2B2"></text>
       </view>
     </view> -->
-        <view class="listBox" bindtap='jumpPark' data-name="园区">
+        <view class="listBox" data-name="园区">
             <view style="width:24%;">园区</view>
             <view style="width:70%;text-align:right;color:#888888">{{parkName ? parkName : ''}}</view>
-            <view style="width:6%;text-align:right">
+            <!-- <view style="width:6%;text-align:right">
                 <text class="iconfont iconyou" style="font-size:28rpx;color:#B2B2B2"></text>
-            </view>
+            </view> -->
         </view>
         <view class="listBox" data-name="企业">
             <view style="width:24%;">企业</view>