diff --git a/miniprogram/app.js b/miniprogram/app.js index f1dc08b..ad02a15 100644 --- a/miniprogram/app.js +++ b/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: { diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index 2eac384..0db01c6 100644 --- a/miniprogram/pages/index/index.js +++ b/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: "展厅预约", - img: "/profile/static/index/menu-ztyy.png", - path: "/pages/meeting/exhibition/list/list" - }, - { - name: "访客预约", - img: "/profile/static/index/menu-fkyy.png", - path: "/pages/meeting/visitorIinvitation/list/list" - }, + // { + // name: "展厅预约", + // img: "/profile/static/index/menu-ztyy.png", + // path: "/pages/meeting/exhibition/list/list" + // }, + // { + // name: "访客预约", + // img: "/profile/static/index/menu-fkyy.png", + // 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: "远程门禁", - img: "/profile/static/index/menu-ycmj.png", - path: "/pages/meeting/accessControl/accessControl" - }, - { - name: "报修服务", - img: "/profile/static/index/menu-bxfw.png", - path: "/pages/parkRepair/parkRepair" - }, - { - name: "投诉建议", - img: "/profile/static/index/menu-tsjy.png", - path: "/pages/complaint/complaint" - }, - { - name: "社群活动", - img: "/profile/static/index/menu-sqhd.png", - path: "/pages/community/community" - }, - { - name: "政策中心", - img: "/profile/static/index/menu-zczx.png", - path: "/pages/notice/notice" - }, - { - name: "入住申请", - img: "/profile/static/index/menu-rzsq.png", - path: "/pages/applyType/applyType" - }, + // { + // name: "远程门禁", + // img: "/profile/static/index/menu-ycmj.png", + // path: "/pages/meeting/accessControl/accessControl" + // }, + // { + // name: "报修服务", + // img: "/profile/static/index/menu-bxfw.png", + // path: "/pages/parkRepair/parkRepair" + // }, + // { + // name: "投诉建议", + // img: "/profile/static/index/menu-tsjy.png", + // path: "/pages/complaint/complaint" + // }, + // { + // name: "社群活动", + // img: "/profile/static/index/menu-sqhd.png", + // path: "/pages/community/community" + // }, + // { + // name: "政策中心", + // img: "/profile/static/index/menu-zczx.png", + // path: "/pages/notice/notice" + // }, + // { + // name: "入住申请", + // img: "/profile/static/index/menu-rzsq.png", + // 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 }) - // 登录用户是否选择园区 - _this.userIsPark() + // 园区id + 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({ diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 59dd759..6f3e3a4 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,14 +1,8 @@ - - - 当前园区:{{parkName? parkName:'请先选择园区'}} - > - - - - {{parkName}} + + {{parkName}} diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml index 10beddc..99d0711 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml @@ -9,8 +9,8 @@ - - + + 收起 @@ -23,17 +23,15 @@ - + {{room.capacityNum}}人间 | {{room.roomName}} | {{room.buildingName}} - #{{roomItem.name}} + #{{roomItem.name}} - ¥{{room.money > 0 ? room.money + '/小时' : '免费'}} -   - ({{room.duration}}小时起) + {{room.shape}} diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 72ce58e..4344881 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -17,10 +17,10 @@ #{{roomItem.name}} - + @@ -53,13 +53,13 @@ - + 总金额 @@ -68,23 +68,7 @@ - - - - 我已阅读并同意 - {{protocolTitle}} - - - - - - 合计: - ¥{{totalAmount}} - 价格明细 - - - 提交订单 - + 提交预约 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss index 656095a..7049a54 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxss +++ b/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; diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml index a2dec35..154ad54 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml @@ -18,10 +18,6 @@ 空间面积 {{detail.renArea}}m - - 办公面积 - {{detail.area}}m - 形式 {{detail.shape}} @@ -44,18 +40,18 @@ - + - 空间周边 + 会议地点 diff --git a/miniprogram/pages/my/my.js b/miniprogram/pages/my/my.js index 8d04499..504da22 100644 --- a/miniprogram/pages/my/my.js +++ b/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", - }, - { - name: "我的活动", - url: "/pages/myActivities/myActivities", - }, - { - name: "我的入驻", - url: "/pages/my/serviceApply/serviceApply" - }, - { - name: "我的建议", - url: "/pages/complaint/complaint", + 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/my/accountSetting/accountSetting", // }, - { - name: "我的服务", - url: "/pages/enterpriseServices/myServiceList/myServiceList" - }, - { - name: "我的报修", - url: "/pages/parkRepair/parkRepair", - } + // { + // name: "我的服务", + // url: "/pages/enterpriseServices/myServiceList/myServiceList" + // }, + // { + // name: "我的报修", + // 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 }) diff --git a/miniprogram/pages/my/my.wxml b/miniprogram/pages/my/my.wxml index 0fe4634..e9f4788 100644 --- a/miniprogram/pages/my/my.wxml +++ b/miniprogram/pages/my/my.wxml @@ -13,11 +13,11 @@ - + {{item.name}} diff --git a/miniprogram/pages/my/personalData/personalData.wxml b/miniprogram/pages/my/personalData/personalData.wxml index a56eba3..823f600 100644 --- a/miniprogram/pages/my/personalData/personalData.wxml +++ b/miniprogram/pages/my/personalData/personalData.wxml @@ -56,12 +56,12 @@ --> - + 园区 {{parkName ? parkName : ''}} - + 企业