diff --git a/page_moban/datingxq.vue b/page_moban/datingxq.vue
index 610887b..086c904 100644
--- a/page_moban/datingxq.vue
+++ b/page_moban/datingxq.vue
@@ -28,6 +28,14 @@
{{obj.device.sn == null ? '' : obj.device.sn}}
+
+
+ 生成二维码
+
+
+
+
+
收费方式
@@ -94,9 +102,6 @@
-
-
-
@@ -147,6 +152,12 @@
uni.removeStorageSync('ruleIdlist')
},
methods: {
+ // 点击去生成二维码
+ btnewm(){
+ uni.navigateTo({
+ url:'/page_shanghu/erwm?equipmentId=' + this.obj.equipmentId + '&viewType=' + this.obj.viewType
+ })
+ },
// 点击未投列表放选择
btntouf(){
this.dtflags = false
@@ -281,7 +292,7 @@
if(res.data.type == 2){
this.ksfs = '麻将桌'
}else if(res.data.type == 3){
- this.ksfs = '棋牌桌'
+ this.ksfs = '台球桌'
}
this.obj = res.data
}
diff --git a/page_moban/pricemoben.vue b/page_moban/pricemoben.vue
index 52b8ce4..5382df9 100644
--- a/page_moban/pricemoben.vue
+++ b/page_moban/pricemoben.vue
@@ -20,7 +20,7 @@
- (订单结束{{item.refundDuration == null ? '--' : item.refundDuration}}分钟后退还押金)注：订单提前结束剩余消费时长、金额不返还
+ (订单结束{{item.refundDuration == 0 ? '立即' : item.refundDuration + '分钟后'}}退还押金)注：订单提前结束剩余消费时长、金额不返还
diff --git a/page_moban/shoufei.vue b/page_moban/shoufei.vue
index 2596dae..9c66e1a 100644
--- a/page_moban/shoufei.vue
+++ b/page_moban/shoufei.vue
@@ -23,7 +23,7 @@
- (订单结束{{item.refundDuration == null ? '--' : item.refundDuration}}分钟后退还押金)
+ (订单结束{{item.refundDuration == 0 ? '立即' : item.refundDuration + '分钟后'}}退还押金)
@@ -82,7 +82,7 @@
show:false,
tclist:[],
modelist:[],
- yajinindex:'',
+ yajinindex:-1,
selectedIndices:[],
ruleIdsone:[],
nameone:[],
@@ -94,7 +94,7 @@
onShow() {
this.tclist = []
this.modelist = []
- this.yajinindex = ''
+ this.yajinindex = -1
this.selectedIndices = []
this.ruleIdsone = []
this.getlist()
diff --git a/page_shanghu/cesuoxq.vue b/page_shanghu/cesuoxq.vue
index b9e371e..96a7bae 100644
--- a/page_shanghu/cesuoxq.vue
+++ b/page_shanghu/cesuoxq.vue
@@ -44,6 +44,14 @@
{{kstj}}
+
+
+ 生成二维码
+
+
+
+
+
@@ -185,6 +193,12 @@
this.getxx()
},
methods: {
+ // 生成二维码
+ btnewm(){
+ uni.navigateTo({
+ url:'/page_shanghu/erwm?equipmentId=' + this.obj.equipmentId
+ })
+ },
// 点击未投列表放选择
btntouf(){
this.dtflags = false
diff --git a/page_shanghu/dianpuroomadd.vue b/page_shanghu/dianpuroomadd.vue
index 506db66..cd1c119 100644
--- a/page_shanghu/dianpuroomadd.vue
+++ b/page_shanghu/dianpuroomadd.vue
@@ -756,7 +756,7 @@
name: this.dtname,
roomId: this.roomId,
type: this.type,
- picture: ''
+ picture: this.type == 2 ? 'https://api.ccttiot.com/smartmeter/img/static/uYJuFqo8fmq8vZ0xeSzP' : 'https://api.ccttiot.com/smartmeter/img/static/u8BAJ6O6waeSGyYlesEU'
}
this.$u.post(`/app/equipment`, data).then(res => {
if (res.code == 200) {
diff --git a/page_shanghu/editsheshi.vue b/page_shanghu/editsheshi.vue
index 2d7c422..2058c8d 100644
--- a/page_shanghu/editsheshi.vue
+++ b/page_shanghu/editsheshi.vue
@@ -68,8 +68,12 @@
+
+ 注：押金的金额需是基础价格的倍数
+
+
@@ -160,7 +164,11 @@
this.explain = res.data.explain
this.tuitimes = res.data.refundDuration
this.yajin = res.data.deposit
- this.tuitime = res.data.refundDuration + '分钟'
+ if(res.data.refundDuration == 0){
+ this.tuitime = '立即退还'
+ }else{
+ this.tuitime = res.data.refundDuration + '分钟'
+ }
}
})
},
@@ -217,53 +225,61 @@
},
// 确定新建and修改
btnshop(){
- let data = {
- ruleId:this.ruleId,
- mode:this.type,
- hours:1,
- price:this.price,
- minHours:this.mintime,
- explain:this.explain,
- refundDuration:this.tuitimes,
- deposit:this.yajin
- }
- if(this.anniutxt == '确认新建'){
- this.$u.post(`/app/rule`,data).then(res => {
- if (res.code == 200) {
- uni.showToast({
- title: '新建成功',
- icon: 'success',
- duration: 2000
- })
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
- }else{
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
- })
- }
- })
- }else if(this.anniutxt == '确认修改'){
- this.$u.put(`/app/rule`,data).then(res => {
- if (res.code == 200) {
- uni.showToast({
- title: '修改成功',
- icon: 'success',
- duration: 2000
- })
- setTimeout(()=>{
- uni.navigateBack()
- },1000)
- }else{
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
- })
- }
+ if(this.yajin % this.price == 0){
+ let data = {
+ ruleId:this.ruleId,
+ mode:this.type,
+ hours:1,
+ price:this.price,
+ minHours:this.mintime,
+ explain:this.explain,
+ refundDuration:this.tuitimes,
+ deposit:this.yajin
+ }
+ if(this.anniutxt == '确认新建'){
+ this.$u.post(`/app/rule`,data).then(res => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: '新建成功',
+ icon: 'success',
+ duration: 2000
+ })
+ setTimeout(()=>{
+ uni.navigateBack()
+ },1000)
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }else if(this.anniutxt == '确认修改'){
+ this.$u.put(`/app/rule`,data).then(res => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: '修改成功',
+ icon: 'success',
+ duration: 2000
+ })
+ setTimeout(()=>{
+ uni.navigateBack()
+ },1000)
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }
+ }else{
+ uni.showToast({
+ title: '押金需是基础价格的倍数',
+ icon: 'none',
+ duration: 2000
})
}
},
diff --git a/page_shanghu/erwm.vue b/page_shanghu/erwm.vue
index bc57f7d..87d106e 100644
--- a/page_shanghu/erwm.vue
+++ b/page_shanghu/erwm.vue
@@ -13,7 +13,7 @@
- SN:{{sn}}
+
@@ -31,11 +31,31 @@
bgc: {
backgroundColor: "#DEF1DA",
},
- sn:''
+ sn:'',
+ roomId:'',
+ viewType:'',
+ equipmentId:'',
+ https:''
}
},
onLoad(option) {
- this.sn = option.sn
+ if(option.equipmentId){ //设施
+ this.equipmentId = option.equipmentId
+ if(option.viewType){ //判断是否为卫生间
+ this.viewType = option.viewType
+ }else{
+ this.viewType = ''
+ }
+ this.https = 'https://testcha.chuangtewl.com?equipmentId=' + this.equipmentId + '&viewType=' + this.viewType
+ }else if(option.roomId){ //房间
+ this.roomId = option.roomId
+ this.viewType = option.viewType
+ this.https = 'https://testcha.chuangtewl.com?roomId=' + this.roomId + '&viewType=' + this.viewType
+ }else if(option.storeId){ //大门
+ this.storeId = option.storeId
+ this.https = 'https://testcha.chuangtewl.com?storeId=' + this.storeId
+ }
+ console.log(option)
this.qrFun()
},
mounted() {
@@ -74,7 +94,7 @@
this.wemflag = true
uQRCode.make({
canvasId: 'qrcode',
- text: 'https://kg.chuantewulian.cn/w?s=' + this.sn,
+ text: this.https,
size: 300,
margin: 0,
backgroundColor: '#ffffff',
diff --git a/page_shanghu/roomxq.vue b/page_shanghu/roomxq.vue
index 6b67fc7..f62fe16 100644
--- a/page_shanghu/roomxq.vue
+++ b/page_shanghu/roomxq.vue
@@ -222,7 +222,7 @@
// 点击添加设施
btnaddsb(){
uni.navigateTo({
- url:'/page_shanghu/roomsheshi?roomId=' + this.roomId
+ url:'/page_shanghu/roomsheshi?roomId=' + this.roomId
})
},
// 点击房间下线维护
@@ -435,7 +435,7 @@
// 跳转到保存二维码
btnewm(){
uni.navigateTo({
- url:'/page_shanghu/erwm'
+ url:'/page_shanghu/erwm?roomId=' + this.roomId + '&viewType=' + this.roomobj.viewType
})
},
// 点击进行扫码
diff --git a/page_shanghu/toufsb.vue b/page_shanghu/toufsb.vue
index 58e08d6..21a5b59 100644
--- a/page_shanghu/toufsb.vue
+++ b/page_shanghu/toufsb.vue
@@ -36,6 +36,14 @@
{{kstj}}
+
+
+ 生成二维码
+
+
+
+
+
设备绑定
@@ -160,6 +168,12 @@
this.getmendian()
},
methods: {
+ // 点击去生成二维码
+ btnewm(){
+ uni.navigateTo({
+ url:'/page_shanghu/erwm?storeId=' + this.storeId
+ })
+ },
// 点击解绑店门
btnjieb(){
let that = this
diff --git a/page_user/dingdanxq.vue b/page_user/dingdanxq.vue
index 685a828..b41e8b5 100644
--- a/page_user/dingdanxq.vue
+++ b/page_user/dingdanxq.vue
@@ -333,9 +333,17 @@
},
// 续单
btnxudan(){
- uni.navigateTo({
- url:'/page_user/xudan?roomId=' + this.orderobj.roomId + '&orderNo=' + this.orderNo + '&viewType=' + this.viewType
- })
+ if(this.orderobj.mode == 2){
+ uni.navigateTo({
+ url:'/page_user/xudan?roomId=' + this.orderobj.roomId + '&orderNo=' + this.orderNo + '&viewType=' + this.viewType
+ })
+ }else{
+ uni.showToast({
+ title: '押金收费暂不支持续单',
+ icon: 'none',
+ duration:2000
+ })
+ }
}
}
}
diff --git a/page_user/lurukz.vue b/page_user/lurukz.vue
index 7893004..c9f99ed 100644
--- a/page_user/lurukz.vue
+++ b/page_user/lurukz.vue
@@ -145,7 +145,7 @@
btnmy() {
uni.reLaunch({
- url: '/pages/my'
+ url: '/page_user/luru'
})
},
qrcode() {
diff --git a/page_user/xudan.vue b/page_user/xudan.vue
index fc377ab..375b61d 100644
--- a/page_user/xudan.vue
+++ b/page_user/xudan.vue
@@ -38,7 +38,7 @@
-->
-
+
套餐选择：
@@ -50,6 +50,17 @@
+
+
+ 收费方式：
+
+
+ {{tclist[0].price == null ? '--' : tclist[0].price}}元/小时，最低消费{{tclist[0].minHours == null ? '--' : tclist[0].minHours}}小时，押金金额{{tclist[0].deposit == null ? '--' : tclist[0].deposit}}元
+
+
时长选择：
@@ -60,7 +71,7 @@
至
- {{jstime.slice(10,16)}}
+ {{jstime.length > 10 ? jstime.slice(10,16) : jstime}}
@@ -212,92 +223,6 @@
value: 'wx',
label: '微信支付'
}],
- list: [
- [{
- value: '1',
- label: '00'
- },
- {
- value: '2',
- label: '01'
- }, {
- value: '3',
- label: '02'
- }, {
- value: '4',
- label: '03'
- }, {
- value: '5',
- label: '04'
- }, {
- value: '6',
- label: '05'
- }, {
- value: '7',
- label: '06'
- }, {
- value: '8',
- label: '07'
- }, {
- value: '9',
- label: '08'
- }, {
- value: '10',
- label: '09'
- }, {
- value: '11',
- label: '10'
- }, {
- value: '12',
- label: '11'
- }, {
- value: '13',
- label: '12'
- }, {
- value: '14',
- label: '13'
- }, {
- value: '15',
- label: '14'
- }, {
- value: '16',
- label: '15'
- }, {
- value: '17',
- label: '16'
- }, {
- value: '18',
- label: '17'
- }, {
- value: '19',
- label: '18'
- }, {
- value: '20',
- label: '19'
- }, {
- value: '21',
- label: '20'
- }, {
- value: '22',
- label: '21'
- }, {
- value: '23',
- label: '22'
- }, {
- value: '24',
- label: '23'
- },
- ],
- [{
- value: '3',
- label: '00'
- },
- {
- value: '4',
- label: '30'
- }
- ],
- ],
kstime: '',
jstime: '',
timetype: '',
@@ -331,7 +256,6 @@
this.viewType = option.viewType
this.getstoredetail()
this.getstoredetails()
- this.gettaocan()
this.getbiaoqian()
this.hourPointsArray = this.getCurrentHourPoints() //计算从当前时间往后推24小时
},
@@ -545,9 +469,32 @@
this.$u.get(`/app/rule/getListByRoomId?roomId=${this.roomId}`).then(res => {
if (res.code == 200) {
this.tclist = res.data
+ if(res.data[0].mode == 1){
+ // this.kstime = e.hour + ':' + e.minute
+ // let shijian = '20' + this.ksriqi + ' ' + this.kstime
+ // console.log(shijian,shijian.slice(2,5));
+ // if(shijian.slice(2,5) == 'Wed'){
+ // this.timeshijian = this.formatDate(shijian)
+ // }else{
+ // this.timeshijian = this.parseTime(shijian)
+ // }
+ this.jstime = this.addOneHourToTimess(this.kstime.slice(10,16))
+ console.log(this.jstime,this.kstime);
+ this.price = this.tclist[0].deposit //订单金额
+ this.hourstime = Math.ceil(this.tclist[0].deposit / this.tclist[0].price) //订单时间
+ }
}
})
},
+ // 押金计算结束时间
+ addOneHourToTimess(timeString, date = new Date()) {
+ let [hours, minutes] = timeString.split(':').map(Number)
+ let timeDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), hours, minutes, 0, 0)
+ timeDate.setHours(timeDate.getHours() + Math.ceil(this.tclist[0].deposit / this.tclist[0].price)) //加上套餐中的小时
+ let newHours = timeDate.getHours()
+ let newMinutes = String(timeDate.getMinutes()).padStart(2, '0') // 格式化分钟为两位数
+ return `${String(newHours).padStart(2, '0')}:${newMinutes}`
+ },
// 查询个人信息
getinfo() {
this.$u.get(`/getAppInfo`).then(res => {
@@ -562,10 +509,10 @@
// let formattedDateString = time.replace(/\//g, "-")
let data = {
payType: this.zfssid,
- ruleId: this.tcobj.ruleId,
+ ruleId:this.tclist[0].mode == 2 ? this.tcobj.ruleId : this.tclist[0].mode,
viewType:this.viewType,
type: 2,
- mode: 2,
+ mode: this.tclist[0].mode,
hours: this.hourstime,
price: this.price,
originalOrderNo:this.orderNo
@@ -765,6 +712,7 @@
this.$u.get(`/appVerify/orderInfo?orderNo=${this.orderNo}`).then(res => {
if (res.code == 200) {
this.kstime = res.data.reserveEndTime
+ this.gettaocan()
}
})
},
@@ -1325,6 +1273,7 @@
font-size: 26rpx;
color: #48893B;
line-height: 46rpx;
+ margin-top: 10rpx;
}
}
}
@@ -1418,7 +1367,7 @@
.shichangxz {
display: flex;
align-items: center;
- margin-top: 50rpx;
+ margin-top: 30rpx;
// width: 3000rpx;
justify-content: space-between;
diff --git a/pages.json b/pages.json
index e09782b..5e23c8c 100644
--- a/pages.json
+++ b/pages.json
@@ -19,6 +19,15 @@
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
+ },{
+ "path": "pages/myorder/orderxd",
+ "style": {
+ "navigationBarTitleText": "首页",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3996FD",
+ "navigationBarTextStyle": "#FFFFFF",
+ "navigationStyle": "custom"
+ }
},{
"path": "pages/login/login",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e111e00..7df8aa8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,8 +29,8 @@
{{shopobj.address == undefined ? '--' : shopobj.address}}
-
-
+
+
空闲 {{item.idleNum}}
{{item.tag}}
-
+
- 一号桌
+ {{item.roomName}}
开台
@@ -207,7 +207,7 @@
{{jinxintxt}}
-
@@ -240,12 +240,13 @@
biaostoreqianlist: [],
mdindex:-1,
viewType:'',
- tit:''
+ tit:'',
+ tabarr:[],
+ type:''
}
},
onLoad(option) {
this.tit = option.tit
- this.getroombq()
if (option.storeId) {
this.storeId = option.storeId
uni.setStorageSync('storeId', this.storeId)
@@ -254,6 +255,8 @@
}
},
onShow() {
+ this.tabindex = 0
+ this.getroombq()
this.jinxinflag = false //如果进行了tab切换 则隐藏
this.getbiaoqian()
this.getstorebiaoqian()
@@ -276,7 +279,10 @@
this.viewType = item.viewType
this.mdindex = index
},
-
+ // 点击隐藏进行中订单
+ btnyc(){
+ this.jinxinflag = false
+ },
// 拿到房间标签进行对比
getMatchingLabel(val) {
const matchingItem = this.biaoqianlist.find(item => item.dictValue === val)
@@ -300,7 +306,6 @@
this.$u.get(`/appVerify/getDictData?dictType=ss_room_tags`).then((res) => {
if (res.code == 200) {
this.biaoqianlist = res.data
- this.getstoredetail()
}
})
},
@@ -309,6 +314,13 @@
this.$u.get(`/app/room/getTagListByStoreId?storeId=${this.storeId}`).then(res => {
if (res.code == 200) {
this.tabarr = res.data
+ if(this.tabarr[0].type){
+ this.type = this.tabarr[0].type
+ }else{
+ this.type = ''
+ }
+ this.getstoredetail()
+ console.log(this.tabarr);
}
})
},
@@ -320,8 +332,10 @@
},
// 点击切换tab类型
- btngundong(section, index) {
+ btngundong(type, index) {
this.tabindex = index
+ this.type = type
+ this.getstoredetail()
},
@@ -592,7 +606,7 @@
getstoredetail() {
this.reservationStatus = {}
let data = {
- type: this.biaoqianlist[0].type == null ? '' : this.biaoqianlist[0].type
+ type: this.type
}
this.$u.get(`/app/store/${this.storeId}`, data).then(res => {
if (res.code == 200) {
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index 9b21836..a4e964e 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -41,7 +41,7 @@
-
+
套餐选择：
@@ -53,6 +53,17 @@
+
+
+ 收费方式：
+
+
+ {{tclist[0].price == null ? '--' : tclist[0].price}}元/小时，最低消费{{tclist[0].minHours == null ? '--' : tclist[0].minHours}}小时，押金金额{{tclist[0].deposit == null ? '--' : tclist[0].deposit}}元
+
+
时长选择：
@@ -190,8 +201,9 @@
-
+
+
@@ -203,7 +215,7 @@
bgc: {
backgroundColor: "",
},
- indexone: -1,
+ indexone: 0,
indextwo: -1,
yudingflag: false,
show: false,
@@ -215,92 +227,14 @@
value: 'wx',
label: '微信支付'
}],
- list: [
- [{
- value: '1',
- label: '00'
- },
- {
- value: '2',
- label: '01'
- }, {
- value: '3',
- label: '02'
- }, {
- value: '4',
- label: '03'
- }, {
- value: '5',
- label: '04'
- }, {
- value: '6',
- label: '05'
- }, {
- value: '7',
- label: '06'
- }, {
- value: '8',
- label: '07'
- }, {
- value: '9',
- label: '08'
- }, {
- value: '10',
- label: '09'
- }, {
- value: '11',
- label: '10'
- }, {
- value: '12',
- label: '11'
- }, {
- value: '13',
- label: '12'
- }, {
- value: '14',
- label: '13'
- }, {
- value: '15',
- label: '14'
- }, {
- value: '16',
- label: '15'
- }, {
- value: '17',
- label: '16'
- }, {
- value: '18',
- label: '17'
- }, {
- value: '19',
- label: '18'
- }, {
- value: '20',
- label: '19'
- }, {
- value: '21',
- label: '20'
- }, {
- value: '22',
- label: '21'
- }, {
- value: '23',
- label: '22'
- }, {
- value: '24',
- label: '23'
- },
- ],
- [{
- value: '3',
- label: '00'
- },
- {
- value: '4',
- label: '30'
- }
- ],
- ],
+ params: {
+ year: false,
+ month: false,
+ day: false,
+ hour: true,
+ minute: true,
+ second: false
+ },
kstime: '',
jstime: '',
timetype: '',
@@ -341,6 +275,41 @@
let arr = this.getCurrentWeekdayAndNextFiveDays();
this.weekdayAndDateSequence = this.convertDates(arr)
console.log(this.weekdayAndDateSequence);
+ // 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期
+ this.ksriqi = this.weekdayAndDateSequence[0].date
+ let shijian = '20' + this.ksriqi + ' ' + this.kstime
+ if(shijian.slice(2,5) == 'Wed'){
+ this.timeshijian = this.formatDate(shijian)
+ }else{
+ this.timeshijian = this.parseTime(shijian)
+ }
+ if (this.tcobj.hours && this.kstime != '') {
+ this.jstime = this.addOneHourToTime(this.kstime)
+ }
+ this.indexone = 0
+ if(this.indexone != 0){
+ this.$u.get(`/app/order/getReservedTimePeriods?roomId=${this.roomId}&startTime=${'20' + this.ksriqi}`).then(res => {
+ if (res.code == 200) {
+ if(res.data == ''){
+ this.roomList = []
+ for(let i = 0;i < 24;i++){
+ this.roomList.push(false)
+ }
+ this.hourPointsArray = this.getDangtiantime()
+ }else{
+ this.roomList = res.data
+ this.hourPointsArray = this.getDangtiantime()
+ this.arr = this.getDangtiantimes()
+ this.getgengxinriqiday()
+ }
+ }
+ })
+ }else{
+ this.getstoredetail()
+ this.gettaocan()
+ this.hourPointsArray = this.getCurrentHourPoints() //计算从当前时间往后推24小时
+ }
+ // 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期// 默认选中第一个日期
},
methods: {
// 拿到标签进行对比
@@ -373,23 +342,23 @@
Jan: '01', Feb: '02', Mar: '03', Apr: '04',
May: '05', Jun: '06', Jul: '07', Aug: '08',
Sep: '09', Oct: '10', Nov: '11', Dec: '12'
- };
+ }
let month = monthMap[monthName];
if (!month) {
- console.error('无法识别的月份:', monthName);
+ console.error('无法识别的月份:', monthName)
return item; // 或者处理错误
}
// 构建新的日期字符串
let newDateStr = `${year.slice(2,4)}-${month}-${day.padStart(2, '0')}`;
-
+
// 返回一个新的对象，或者你可以直接修改原始对象（但通常不推荐这样做，因为它会改变原始数据）
return {
...item,
date: newDateStr
- };
- });
+ }
+ })
},
// 拿到当前时间后24小时格式成两位数
initializeData() {
@@ -398,7 +367,7 @@
// 获取当前时间的小时部分（0-23）
const currentHour = now.getHours()
// 初始化小时数组
- this.hours = [];
+ this.hours = []
this.arr = []
// 遍历从当前小时开始的24个小时
for (let i = 0; i < 24; i++) {
@@ -503,15 +472,15 @@
const formattedDateString = `${hours}:${minutes}:${seconds}`;
hourPoints.push(formattedDateString);
}
- return hourPoints;
+ return hourPoints
},
// 获取当前时间和日期+后面五天时间
getCurrentWeekdayAndNextFiveDays() {
// 获取当前日期和时间
- const now = new Date();
+ const now = new Date()
// 获取当前是星期几（0代表周日，1代表周一，...，6代表周六）
- const currentWeekday = now.getDay();
+ const currentWeekday = now.getDay()
const result = [];
result.push({
date: now.toLocaleDateString('zh-CN', {
@@ -523,8 +492,8 @@
});
// 往后推五天，并添加到数组中
for (let i = 1; i < 5; i++) {
- const newDate = new Date(now);
- newDate.setDate(now.getDate() + i);
+ const newDate = new Date(now)
+ newDate.setDate(now.getDate() + i)
result.push({
date: newDate.toLocaleDateString('zh-CN', {
year: '2-digit',
@@ -575,10 +544,10 @@
roomId: this.roomId,
viewType:this.viewType,
payType: this.zfssid,
- ruleId: this.tcobj.ruleId,
+ ruleId:this.tclist[0].mode == 2 ? this.tcobj.ruleId : this.tclist[0].ruleId,
type: 1,
reserveStartTime: this.timeshijian,
- mode: 2,
+ mode: this.tclist[0].mode,
hours: this.hourstime,
price: this.price
}
@@ -642,7 +611,7 @@
icon: 'none',
duration: 2000
})
- } else if (!this.tcobj.hours) {
+ } else if (!this.tcobj.hours && this.tclist[0].mode == 2) {
uni.showToast({
title: '请先选择套餐',
icon: 'none',
@@ -760,16 +729,31 @@
},
// 确认选择时间
confirm(e) {
- this.kstime = e[0].label + ':' + e[1].label
- let shijian = '20' + this.ksriqi + ' ' + this.kstime
- console.log(shijian,shijian.slice(2,5));
- if(shijian.slice(2,5) == 'Wed'){
- this.timeshijian = this.formatDate(shijian)
+ if(this.tclist[0].mode == 2){
+ this.kstime = e.hour + ':' + e.minute
+ let shijian = '20' + this.ksriqi + ' ' + this.kstime
+ console.log(shijian,shijian.slice(2,5));
+ if(shijian.slice(2,5) == 'Wed'){
+ this.timeshijian = this.formatDate(shijian)
+ }else{
+ this.timeshijian = this.parseTime(shijian)
+ }
+ if (this.tcobj.hours) {
+ this.jstime = this.addOneHourToTime(this.kstime)
+ }
}else{
- this.timeshijian = this.parseTime(shijian)
- }
- if (this.tcobj.hours) {
- this.jstime = this.addOneHourToTime(this.kstime)
+ this.kstime = e.hour + ':' + e.minute
+ let shijian = '20' + this.ksriqi + ' ' + this.kstime
+ console.log(shijian,shijian.slice(2,5));
+ if(shijian.slice(2,5) == 'Wed'){
+ this.timeshijian = this.formatDate(shijian)
+ }else{
+ this.timeshijian = this.parseTime(shijian)
+ }
+ this.jstime = this.addOneHourToTimess(this.kstime)
+ this.price = this.tclist[0].deposit //订单金额
+ this.hourstime = Math.ceil(this.tclist[0].deposit / this.tclist[0].price) //订单时间
+ console.log(Math.ceil(this.tclist[0].deposit / this.tclist[0].price),'0000');
}
},
// 判断是否需要格式化
@@ -791,6 +775,15 @@
let newMinutes = String(timeDate.getMinutes()).padStart(2, '0') // 格式化分钟为两位数
return `${String(newHours).padStart(2, '0')}:${newMinutes}`
},
+ // 计算结束时间
+ addOneHourToTimess(timeString, date = new Date()) {
+ let [hours, minutes] = timeString.split(':').map(Number)
+ let timeDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), hours, minutes, 0, 0)
+ timeDate.setHours(timeDate.getHours() + Math.ceil(this.tclist[0].deposit / this.tclist[0].price)) //加上套餐中的小时
+ let newHours = timeDate.getHours()
+ let newMinutes = String(timeDate.getMinutes()).padStart(2, '0') // 格式化分钟为两位数
+ return `${String(newHours).padStart(2, '0')}:${newMinutes}`
+ },
// 请求门店详细信息
getstoredetail() {
this.$u.get(`/app/room/${this.roomId}`).then(res => {
@@ -860,10 +853,10 @@
let endHour = room.endTime.slice(room.endTime.length - 8, room.endTime.length - 6) //取预定结束时间小时
let timefen = room.startTime.slice(room.endTime.length - 5, room.endTime.length - 3) //取预定结束时间分钟
// 获取当前日期
- const now = new Date();
- const year = now.getFullYear();
- const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以要加1，并用padStart确保是两位数
- const day = String(now.getDate()).padStart(2, '0'); // 用padStart确保是两位数
+ const now = new Date()
+ const year = now.getFullYear()
+ const month = String(now.getMonth() + 1).padStart(2, '0')// 月份从0开始，所以要加1，并用padStart确保是两位数
+ const day = String(now.getDate()).padStart(2, '0')// 用padStart确保是两位数
if(endHour < startHour){
startHour = '00'
}
@@ -889,23 +882,23 @@
for (let hour = 0; hour < 24; hour++) {
let formattedHour = String(hour).padStart(2, '0')
if(formattedHour == '00'){
- timeString = `00:00:01`;
+ timeString = `00:00:01`
}else{
timeString = `${formattedHour}:00:00`
}
- hourPoints.push(timeString);
+ hourPoints.push(timeString)
}
- return hourPoints;
+ return hourPoints
},
// this.arr使用方法 00:00 - 23:00
getDangtiantimes() {
const hourPoints = [];
for (let hour = 0; hour < 24; hour++) {
- const formattedHour = String(hour).padStart(2, '0');
- const timeString = `${formattedHour}:00:00`;
- hourPoints.push(timeString);
+ const formattedHour = String(hour).padStart(2, '0')
+ const timeString = `${formattedHour}:00:00`
+ hourPoints.push(timeString)
}
- return hourPoints;
+ return hourPoints
},
// 选择套餐
btntc(index, item) {
@@ -959,9 +952,9 @@
return time_str
},
formatDate(inputDate) {
- const parts = inputDate.match(/(\d+)\D+(\w+)\s+(\w+)\s+(\d+)\s+(\d+)\s+(\d+):(\d+)/);
+ const parts = inputDate.match(/(\d+)\D+(\w+)\s+(\w+)\s+(\d+)\s+(\d+)\s+(\d+):(\d+)/)
if (!parts) {
- throw new Error('Invalid date format');
+ throw new Error('Invalid date format')
}
const [, dayOfMonth, , month, , year, hour, minute] = parts;
const monthMap = {
@@ -971,10 +964,10 @@
};
const monthNum = monthMap[month];
let formattedHour = (parseInt(hour, 10) + 1).toString().padStart(2, '0');
- let formattedMinute = minute.padStart(2, '0');
+ let formattedMinute = minute.padStart(2, '0')
let formattedSecond = '00'; // 原始字符串中没有秒，所以默认为00
- const formattedDate = `${year}-${monthNum}-${dayOfMonth.padStart(2, '0')} ${formattedHour}:${formattedMinute}:${formattedSecond}`;
- return formattedDate;
+ const formattedDate = `${year}-${monthNum}-${dayOfMonth.padStart(2, '0')} ${formattedHour}:${formattedMinute}:${formattedSecond}`
+ return formattedDate
}
}
}
@@ -1446,7 +1439,7 @@
.shichangxz {
display: flex;
align-items: center;
- margin-top: 50rpx;
+ margin-top: 30rpx;
// width: 3000rpx;
justify-content: space-between;
diff --git a/pages/myorder/orderxd.vue b/pages/myorder/orderxd.vue
new file mode 100644
index 0000000..3ab1a7b
--- /dev/null
+++ b/pages/myorder/orderxd.vue
@@ -0,0 +1,1553 @@
+
+
+
+
+
+
+
+
+ 【{{shopobj.storeName == null ? '--' : shopobj.storeName}}】
+
+
+
+
+
+
+
+ {{shopobj.roomName == null ? '--' : shopobj.roomName}}
+
+
+
+ {{getMatchingLabel(item)}}
+
+
+
+ ￥{{shopobj.hour == null ? '--' : shopobj.hour}}/小时
+
+
+
+
+
+
+
+ 日期选择：
+
+
+
+ {{item.weekday}}
+ {{item.date.slice(-5)}}
+
+
+
+
+
+ 套餐选择：
+
+
+
+ {{item.explain == null ? '--' : item.explain}}
+ ￥{{item.price == null ? '--' : item.price}}
+
+
+
+
+
+ 时长选择：
+
+
+
+ {{kstime}}
+
+ 至
+
+ {{jstime}}
+
+
+
+
+
+
+
+
+
+
+ {{item == '00:00:00' ? '次日' : item.slice(0,2)}}
+
+
+
+
+ 已被下单时段
+
+
+ 可下单时段
+
+
+
+
+
+
+
+
+
+ 订单总价
+ ￥{{price == null ? '--' : price}}
+
+
+ 下单时长
+ {{hourstime == null ? '--' : hourstime}}小时
+
+
+ 下单时间段
+
+ {{timeshijian.slice(0,-3) + '至'}}{{jstime == null ? '--' : jstime}}
+ --
+
+
+
+
+ 续单
+ {{shopobj.hour == null ? '--' : shopobj.hour}}元/小时
+
+
+
+ 扣款策略
+ {{zfss}}
+
+
+
+
+
+
+
+
+
+ 合计：
+
+
+ ￥{{price == null ? '--' : price}} 共{{hourstime == null ? '--' : hourstime}}小时
+
+
+
+
+ 确认下单
+
+
+
+
+
+
+
+
+ 下单信息确认
+
+
+
+
+ 预约门店：【{{shopobj.storeName == null ? '--' : shopobj.storeName}}】
+
+
+ 下单包间：{{shopobj.roomName == null ? '--' : shopobj.roomName}}
+
+
+ 开始时间：{{timeshijian.slice(0,-3)}}
+
+
+ 下单时长：{{hourstime}}小时
+
+
+
+
+ 下单须知：
+
+
+ 1、下单的订单将全时段保留。迟到不可顺延和退款；
+
+
+ 2、为避免包厢被其他用户预约而给您带来不好的体 验，如需续单，请提前续单!
+
+
+ 3、订单开始前1小时内取消订单需核收15%退单费， 请合理规划您的时间;
+
+
+
+
+ 返回修改
+
+
+ 立即下单
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index e720b04..26c1c67 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -352,7 +352,10 @@
onlyFromCamera: true,
scanType: ['qrCode'],
success: res => {
- console.log(res);
+ console.log(res)
+ uni.navigateTo({
+ url:'/pages/myorder/orderxd?roomId=' + 65
+ })
},
fail: err => {
console.error('扫描失败：', err)