From 868a080155ae6a7f2f5ef88f3787206287b73627 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Wed, 12 Mar 2025 17:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8C=B6=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- page_fenbaotwo/hexiao/index.vue | 3 - page_fenbaotwo/hexiao/youhuijuan.vue | 2 - page_fenbaotwo/tixian.vue | 50 ++++++------ page_shanghu/roomxq.vue | 4 +- page_user/dingdanxq.vue | 4 +- page_user/lijikaishi.vue | 4 + page_user/sheshikz.vue | 118 +++++++++++++-------------- page_user/xudan.vue | 68 +++++++++++---- page_user/zhaoshang.vue | 2 +- pages/index/index.vue | 25 +++--- pages/my.vue | 1 - pages/myorder/index.vue | 57 ++++++++----- pages/myorder/orderxd.vue | 8 +- pages/nearbystores/index.vue | 18 ++-- 14 files changed, 210 insertions(+), 154 deletions(-) diff --git a/page_fenbaotwo/hexiao/index.vue b/page_fenbaotwo/hexiao/index.vue index 1c9a104..ab0cddb 100644 --- a/page_fenbaotwo/hexiao/index.vue +++ b/page_fenbaotwo/hexiao/index.vue @@ -112,7 +112,6 @@ box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.15); border-radius: 18rpx 18rpx 18rpx 18rpx; padding: 28rpx 30rpx; - box-sizing: border-box; .tishi{ margin-top: 6rpx; .tit{ @@ -188,6 +187,4 @@ } } } - - \ No newline at end of file diff --git a/page_fenbaotwo/hexiao/youhuijuan.vue b/page_fenbaotwo/hexiao/youhuijuan.vue index cb90bf6..bb59add 100644 --- a/page_fenbaotwo/hexiao/youhuijuan.vue +++ b/page_fenbaotwo/hexiao/youhuijuan.vue @@ -108,6 +108,4 @@ } } } - - \ No newline at end of file diff --git a/page_fenbaotwo/tixian.vue b/page_fenbaotwo/tixian.vue index 850b0ec..6d0b643 100644 --- a/page_fenbaotwo/tixian.vue +++ b/page_fenbaotwo/tixian.vue @@ -7,7 +7,7 @@ 账户余额(元) - ￥{{user.balance == null ? 0 : user.balance}} (可提现金额￥{{user.withdrawalAmount == null ? 0 : user.withdrawalAmount}}) + ￥{{user.balance == null ? 0 : user.balance}} (可提现金额￥{{user.withdrawalAmount == null ? 0 : user.withdrawalAmount}}) 累计提现：￥{{user.totalWithdrawAmount == null ? 0 : user.totalWithdrawAmount}} @@ -24,15 +24,15 @@ ￥ - - + 全部提现 - 提现服务费为 ￥{{shouxuobj.withdrawHandlingCharge == null ? '' : shouxuobj.withdrawHandlingCharge}} 最低提现￥{{shouxuobj.minAmount == null ? '' : shouxuobj.minAmount}} 最高提现￥{{shouxuobj.maxAmount == null ? '' : shouxuobj.maxAmount}} + 提现服务费为 ￥{{shouxuprice.toFixed(2)}} 最低提现￥{{shouxuobj.minAmount == null ? '' : shouxuobj.minAmount}} 最高提现￥{{shouxuobj.maxAmount == null ? '' : shouxuobj.maxAmount}} @@ -75,7 +75,8 @@ currentindex:-1, shouxuobj:'', money:'', - id:'' + id:'', + shouxuprice:'' } }, onLoad(option) { @@ -86,6 +87,21 @@ }, methods: { + btnmoney(){ + this.money = this.user.withdrawalAmount + if(this.shouxuobj.handlingChargeType == 1){ + this.shouxuprice = this.shouxuobj.withdrawHandlingCharge / 10 * this.money + }else{ + this.shouxuprice = this.shouxuobj.withdrawHandlingCharge + } + }, + inputs(e){ + if(this.shouxuobj.handlingChargeType == 1){ + this.shouxuprice = this.shouxuobj.withdrawHandlingCharge / 10 * this.money + }else{ + this.shouxuprice = this.shouxuobj.withdrawHandlingCharge + } + }, // 点击进行提现 btntx(){ if(this.shouxuobj.collectionCode == null && this.shouxuobj.name == '线下收款码'){ @@ -130,10 +146,14 @@ }, // 点击选择提现方式 btntxxz(item,index){ - console.log(item); this.id = item.userChannelId this.currentindex = index this.shouxuobj = item + if(item.handlingChargeType == 1){ + this.shouxuprice = item.withdrawHandlingCharge / 10 * this.money + }else{ + this.shouxuprice = item.withdrawHandlingCharge + } }, // 获取个人信息 getinfo(){ @@ -242,7 +262,6 @@ page { background: #F7FAFE; } - .addtj { margin-top: 44rpx; width: 646rpx; @@ -255,13 +274,11 @@ font-size: 36rpx; color: #48893B; } - .cont { display: flex; flex-wrap: wrap; margin: 0 auto; width: 634rpx; - .top_box { padding: 28rpx 32rpx; margin-top: 38rpx; @@ -270,14 +287,12 @@ background: #48893B; border-radius: 28rpx 28rpx 28rpx 28rpx; border-radius: 20rpx; - .tip { font-weight: 400; font-size: 28rpx; color: #FFFFFF; line-height: 38rpx; } - .txt { margin-top: 28rpx; margin-bottom: 28rpx; @@ -287,7 +302,6 @@ line-height: 54rpx; } } - .tit { margin-top: 100rpx; display: flex; @@ -300,7 +314,6 @@ display: flex; justify-content: space-between; width: 100%; - .tit_line { margin-right: 12rpx; width: 4rpx; @@ -310,7 +323,6 @@ } } - .input_box { display: flex; flex-wrap: nowrap; @@ -321,7 +333,6 @@ background: #FFFFFF; box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1); border-radius: 20rpx; - .yuan { margin-left: 36rpx; font-weight: 500; @@ -329,11 +340,9 @@ color: #48893B; line-height: 72rpx; } - .ipt { width: 60%; } - .altx { display: flex; align-items: center; @@ -350,7 +359,6 @@ line-height: 38rpx; } } - .pay_type { .type_box { width: 100%; @@ -363,18 +371,15 @@ background: #FFFFFF; box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1); border-radius: 20rpx; - .box_left { display: flex; align-items: center; flex-wrap: nowrap; margin-left: 22rpx; - image { width: 50rpx; height: 50rpx; } - .text { margin-left: 30rpx; font-weight: 400; @@ -383,7 +388,6 @@ line-height: 44rpx; } } - .box_right { display: flex; align-items: center; @@ -395,14 +399,12 @@ border: 2rpx solid #444444; border-radius: 50%; } - .act1 { color: #FFFFFF; background-color: #48893B; } } } - .btn { display: flex; align-items: center; diff --git a/page_shanghu/roomxq.vue b/page_shanghu/roomxq.vue index cf15c59..6827c9b 100644 --- a/page_shanghu/roomxq.vue +++ b/page_shanghu/roomxq.vue @@ -348,7 +348,7 @@ duration: 2000 }) } else { - this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=false`).then(res => { + this.$u.post(`/app/device/admin/adminAll/${this.roomId}/switch?open=false`).then(res => { if (res.code == 200) { uni.showToast({ title: '全部关闭成功', @@ -378,7 +378,7 @@ duration: 2000 }) } else { - this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=true`).then(res => { + this.$u.post(`/app/device/admin/adminAll/${this.roomId}/switch?open=true`).then(res => { if (res.code == 200) { uni.showToast({ title: '全部开启成功', diff --git a/page_user/dingdanxq.vue b/page_user/dingdanxq.vue index 58f1722..d8febf0 100644 --- a/page_user/dingdanxq.vue +++ b/page_user/dingdanxq.vue @@ -82,7 +82,7 @@ 自助操作 - + 控制设备 @@ -471,7 +471,7 @@ // 点击开包厢门 btnkbxm(){ if(this.orderobj.roomType2 == 1){ - this.$u.post(`/app/device/adminAll/${this.orderobj.roomId}/switch?open=true`).then(res => { + this.$u.post(`/app/device/adminAll/${this.orderobj.roomId}/switch?open=true&orderNo=${this.orderNo}`).then(res => { if (res.code == 200) { uni.showToast({ title: '开启包厢门成功', diff --git a/page_user/lijikaishi.vue b/page_user/lijikaishi.vue index 9bd0d05..22718a8 100644 --- a/page_user/lijikaishi.vue +++ b/page_user/lijikaishi.vue @@ -678,7 +678,9 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) + targetDate.setSeconds(1) let currentDate = new Date(); + currentDate.setSeconds(0) console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ @@ -720,7 +722,9 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) + targetDate.setSeconds(1) let currentDate = new Date(); + currentDate.setSeconds(0) console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ diff --git a/page_user/sheshikz.vue b/page_user/sheshikz.vue index 67de1f3..53aa7c6 100644 --- a/page_user/sheshikz.vue +++ b/page_user/sheshikz.vue @@ -276,65 +276,65 @@ } }, // 设施全关 - btnguan(){ - const allDeviceIdsAreNull = this.roomList.every(item => item.deviceId == null) - if (allDeviceIdsAreNull) { - uni.showToast({ - title: '该房间设施暂无绑定设备', - icon: 'none', - duration: 2000 - }) - } else { - this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=false`).then(res => { - if (res.code == 200) { - uni.showToast({ - title: '全部关闭成功', - icon: 'success', - duration: 2000 - }) - this.roomList.forEach(item => { - item.device.powerStatus = 0 - }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - } - }) - } - }, - // 设施全开 - btnkai(){ - const allDeviceIdsAreNull = this.roomList.every(item => item.deviceId == null) - if (allDeviceIdsAreNull) { - uni.showToast({ - title: '该房间设施暂无绑定设备', - icon: 'none', - duration: 2000 - }) - } else { - this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=true`).then(res => { - if (res.code == 200) { - uni.showToast({ - title: '全部开启成功', - icon: 'success', - duration: 2000 - }) - this.roomList.forEach(item => { - item.device.powerStatus = 1 - }) - } else { - uni.showToast({ - title: res.msg, - icon: 'none', - duration: 2000 - }) - } - }) - } - }, + // btnguan(){ + // const allDeviceIdsAreNull = this.roomList.every(item => item.deviceId == null) + // if (allDeviceIdsAreNull) { + // uni.showToast({ + // title: '该房间设施暂无绑定设备', + // icon: 'none', + // duration: 2000 + // }) + // } else { + // this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=false`).then(res => { + // if (res.code == 200) { + // uni.showToast({ + // title: '全部关闭成功', + // icon: 'success', + // duration: 2000 + // }) + // this.roomList.forEach(item => { + // item.device.powerStatus = 0 + // }) + // } else { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000 + // }) + // } + // }) + // } + // }, + // // 设施全开 + // btnkai(){ + // const allDeviceIdsAreNull = this.roomList.every(item => item.deviceId == null) + // if (allDeviceIdsAreNull) { + // uni.showToast({ + // title: '该房间设施暂无绑定设备', + // icon: 'none', + // duration: 2000 + // }) + // } else { + // this.$u.post(`/app/device/adminAll/${this.roomId}/switch?open=true`).then(res => { + // if (res.code == 200) { + // uni.showToast({ + // title: '全部开启成功', + // icon: 'success', + // duration: 2000 + // }) + // this.roomList.forEach(item => { + // item.device.powerStatus = 1 + // }) + // } else { + // uni.showToast({ + // title: res.msg, + // icon: 'none', + // duration: 2000 + // }) + // } + // }) + // } + // }, // 点击控制房间设施 btnroomkg(num,index,item){ console.log(item); diff --git a/page_user/xudan.vue b/page_user/xudan.vue index 85005d6..745000d 100644 --- a/page_user/xudan.vue +++ b/page_user/xudan.vue @@ -101,19 +101,26 @@ - 订单总价 + 预存费用订单总价 ￥{{price == null ? '--' : price}} - - 续单时长 + + 计费规则 + 1小时{{tcobj.price}}元 + + + 预定时长 {{hourstime == null ? '--' : hourstime}}小时 - - 续单时间段 - - {{kstime.slice(0,-3) + '至'}}{{jstime == null ? '--' : jstime.slice(10,16)}} - -- + + 预存费用剩余金额会根据您实际使用时间扣除使用后退还您的账户 + 时长选择： @@ -443,7 +432,17 @@ } console.log(startHour, endHour, room.startTime, room.endTime) for (let i = 0; i < 24; i++) { - if (timefen == '00') { //判断预定结束是否包含分钟 不包含正常走判断 包含则将时间往后延长1 + if(startHour == endHour){ + if (timefen == '00'){ + if (this.arr[i] <= endHour) { + room.reservationStatus[i] = true + } + }else{ + if (this.arr[i] <= Number(endHour) + 1) { + room.reservationStatus[i] = true + } + } + }else if(timefen == '00') { //判断预定结束是否包含分钟 不包含正常走判断 包含则将时间往后延长1 if (this.arr[i] > startHour && this.arr[i] <= endHour) { room.reservationStatus[i] = true } @@ -574,7 +573,7 @@ ruleId:this.ruleId, // type: 1, reserveStartTime: this.timeshijian, - mode: this.tclist[0].mode, + mode: this.tclist[this.tcindex].mode, hours: this.hourstime, price: this.price } @@ -686,8 +685,10 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) - let currentDate = new Date() - console.log(targetDate,currentDate,'020202'); + targetDate.setSeconds(1) + let currentDate = new Date(); + currentDate.setSeconds(0) + // console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ title: '请选择当前时间之后', @@ -701,11 +702,11 @@ uni.showToast({ title: '该时间段已被预订，请选择其他时间段', icon: 'none', - duration: 2000 + duration: 2000 }) } } - } else { + } else { //微信支付 let mergedData = this.hourPointsArray.map((time, index) => { let roomNumber = Object.keys(this.roomList)[index] let roomStatus = this.roomList[roomNumber] @@ -728,7 +729,11 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) - let currentDate = new Date(); + targetDate.setSeconds(1) + targetDate.setSeconds(1) + let currentDate = new Date(); + currentDate.setSeconds(0) + currentDate.setSeconds(0) console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ @@ -912,11 +917,23 @@ } console.log(startHour, endHour, room.startTime, room.endTime) for (let i = 0; i < 24; i++) { - if (timefen == '00') { //判断预定结束是否包含分钟 不包含正常走判断 包含则将时间往后延长1 + if(startHour == endHour){ + console.log(1); + if (timefen == '00'){ + if (this.arr[i].slice(0,2) <= endHour) { + room.reservationStatus[i] = true + } + }else{ + console.log(2,this.arr); + if (this.arr[i].slice(0,2) <= Number(endHour) + 1) { + room.reservationStatus[i] = true + } + } + }else if (timefen == '00') { //判断预定结束是否包含分钟 不包含正常走判断 包含则将时间往后延长1 if (this.arr[i].slice(0,2) > startHour && this.arr[i].slice(0,2) <= endHour) { room.reservationStatus[i] = true } - } else { + }else { if (this.arr[i].slice(0,2) > startHour && Number(this.arr[i].slice(0,2) - 1) <= Number(endHour)) { room.reservationStatus[i] = true } diff --git a/pages/myorder/orderxd.vue b/pages/myorder/orderxd.vue index 3ab1a7b..957a880 100644 --- a/pages/myorder/orderxd.vue +++ b/pages/myorder/orderxd.vue @@ -648,7 +648,9 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) - let currentDate = new Date(); + targetDate.setSeconds(1) + let currentDate = new Date(); + currentDate.setSeconds(0) console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ @@ -690,7 +692,9 @@ if (!isBooked) { let timeshijian = this.timeshijian let targetDate = new Date(timeshijian.replace(/-/g, '/')) - let currentDate = new Date(); + targetDate.setSeconds(1) + let currentDate = new Date(); + currentDate.setSeconds(0) console.log(targetDate,currentDate,'020202'); if (targetDate < currentDate) { uni.showToast({ diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue index e2e806c..9172d6f 100644 --- a/pages/nearbystores/index.vue +++ b/pages/nearbystores/index.vue @@ -206,7 +206,7 @@ 已连接 - +