From bdb5acf275f2a9c3c451c66ea16acdfb734126c1 Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Fri, 3 Jan 2025 18:01:49 +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_moban/baojie.vue | 4 +- page_moban/baojieorder.vue | 268 +++++++++++++++++++++++++++++++++++++ page_moban/orderxq.vue | 150 ++++++++++++++++++++- page_shanghu/index.vue | 14 +- pages.json | 7 + 5 files changed, 429 insertions(+), 14 deletions(-) create mode 100644 page_moban/baojieorder.vue diff --git a/page_moban/baojie.vue b/page_moban/baojie.vue index 1997165..91b8881 100644 --- a/page_moban/baojie.vue +++ b/page_moban/baojie.vue @@ -2,11 +2,11 @@ - + diff --git a/page_moban/baojieorder.vue b/page_moban/baojieorder.vue new file mode 100644 index 0000000..1807b32 --- /dev/null +++ b/page_moban/baojieorder.vue @@ -0,0 +1,268 @@ + + + + + \ No newline at end of file diff --git a/page_moban/orderxq.vue b/page_moban/orderxq.vue index 03441cf..c018366 100644 --- a/page_moban/orderxq.vue +++ b/page_moban/orderxq.vue @@ -100,14 +100,14 @@ 实际消费时长 - 1小时 + {{timesc}} - 退款备注 + 押金退款备注 - -- + {{orderobj.depositRefundDesc == null ? '--' : orderobj.depositRefundDesc}} @@ -137,9 +137,49 @@ + + + + 退款{{index + 1}} + + + + 退款订单编号 + + + {{item.orderNo == null ? '--' : item.orderNo}} + + + + + 退款金额 + + + {{item.amount == null ? '--' : item.amount}} + + + + + 退款备注 + + + {{item.reason == null ? '--' : item.reason}} + + + + + 退款时间 + + + {{item.operTime == null ? '--' : item.operTime}} + + + - 退款 + 退款 + 结束订单 + 取消订单 @@ -177,7 +217,8 @@ }, maskflag:false, orderNo:'', - orderobj:{} + orderobj:{}, + timesc:'' } }, onLoad(option) { @@ -190,13 +231,101 @@ this.$u.get(`/appVerify/orderInfo?orderNo=${this.orderNo}`).then(res =>{ if(res.code == 200){ this.orderobj = res.data + let dateOne = new Date(res.data.reserveEndTime) + let dateTwo = new Date(res.data.reserveStartTime) + let timeDifference = dateOne - dateTwo + let millisecondsInSecond = 1000 + let millisecondsInMinute = millisecondsInSecond * 60 + let millisecondsInHour = millisecondsInMinute * 60 + let millisecondsInDay = millisecondsInHour * 24 + let days = Math.floor(timeDifference / millisecondsInDay) + timeDifference %= millisecondsInDay + let hours = Math.floor(timeDifference / millisecondsInHour) + timeDifference %= millisecondsInHour + let minutes = Math.floor(timeDifference / millisecondsInMinute) + timeDifference %= millisecondsInMinute + this.timesc = `${days == 0 ? '' : days + 天}${hours}时${minutes}分` } }) }, // 点击退款 btntk(){ this.maskflag = true - } + }, + // 点击取消订单 + btnqx(){ + let orderNos = this.orderobj.orderNo + let that = this + uni.showModal({ + title: '温馨提示', + content: '您确定要取消该订单吗?', + success: function (res) { + if (res.confirm) { + let data = { + orderNo:orderNos, + type:1 + } + that.$u.post(`/app/order/orderCancel?orderNo=${orderNos}`,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: 'success', + duration:2000 + }) + } + }) + } else if (res.cancel) { + + } + } + }) + }, + // 点击结束订单 + btnjies(){ + let orderNos = this.orderobj.orderNo + let that = this + uni.showModal({ + title: '温馨提示', + content: '您确定要结束该订单吗?', + success: function (res) { + if (res.confirm) { + let data = { + orderNo:orderNos, + type:2 + } + that.$u.post(`/app/order/orderEnd?orderNo=${orderNos}`,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: 'success', + duration:2000 + }) + } + }) + } else if (res.cancel) { + + } + } + }) + }, } } @@ -291,13 +420,18 @@ } .orderxx{ width: 680rpx; - height: 682rpx; + max-height: 682rpx; background: #FFFFFF; border-radius: 20rpx 20rpx 20rpx 20rpx; margin: auto; margin-top: 22rpx; padding: 30rpx 48rpx; box-sizing: border-box; + .name{ + margin-bottom: 20rpx; + font-size: 32rpx; + font-weight: 600; + } .bd{ display: flex; justify-content: space-between; @@ -378,6 +512,8 @@ } page { background: #F6F6F6; + padding-bottom: 150rpx; + box-sizing: border-box; } diff --git a/page_shanghu/index.vue b/page_shanghu/index.vue index 37ad276..50e39d4 100644 --- a/page_shanghu/index.vue +++ b/page_shanghu/index.vue @@ -88,18 +88,18 @@ 杆柜订单 - + 保洁订单 - - - 合伙人管理 - 保洁管理 + + + 合伙人管理 + 基础设置 @@ -170,6 +170,10 @@ uni.navigateTo({ url:'/page_moban/jichu' }) + }else if(num == 7){ //跳转到保洁订单 + uni.navigateTo({ + url:'/page_moban/baojieorder' + }) } }, // 跳转到收费模版 diff --git a/pages.json b/pages.json index fc66ab1..57a7ff8 100644 --- a/pages.json +++ b/pages.json @@ -403,6 +403,13 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + },{ + "path": "baojieorder", + "style": { + "navigationBarTitleText": "上传", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } },{ "path": "datingxq", "style": {