diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue index 8f31712..2ae395e 100644 --- a/my/order/payModifyDd.vue +++ b/my/order/payModifyDd.vue @@ -330,7 +330,7 @@ this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据 this.textareaData=this.orderXm.remark this.number=this.orderXm.massageNum - console.log('this.orderXm',this.orderXm.technicianType) + console.log('this.orderXm',this.orderXm) this.youhui() // this.getOrder() // couponMoney diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue index 5122709..f9efcb2 100644 --- a/pages/my/cureOderDrtail.vue +++ b/pages/my/cureOderDrtail.vue @@ -258,6 +258,9 @@ font-weight: 400; font-size: 38rpx; color: #FFFFFF; + position: fixed; + bottom: 0px; + margin-bottom: 10px; } .detail-foot-mian-txet span:nth-child(1){ color: #777777; @@ -357,6 +360,7 @@ flex-direction: column; align-items: center; padding: 5rpx 0rpx; + } .tese span:nth-child(1){ @@ -408,7 +412,7 @@ background-color: #fff; border-radius: 21rpx; padding: 15px; - margin-bottom: 10px; + margin-bottom: 50px; } .jianjie{ font-weight: 400; @@ -632,5 +636,8 @@ height: 100vh; position: relative; background-color: #f7f7f7; + display: flex; + flex-direction: column; + align-items: center; } \ No newline at end of file diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue index 4a84164..c4581a2 100644 --- a/pages/my/serviceOderDrtail.vue +++ b/pages/my/serviceOderDrtail.vue @@ -68,7 +68,7 @@ - {{item.status=='1'?'已使用':'未使用'}} + {{item.status=='1'?'已使用':'未使用'}} @@ -602,7 +602,7 @@ }, detail(item){ - if(item.status=='1'){ + if(item.status=='1'&&this.serviData.name!='index'){ uni.showToast({ title:'该项目已使用！' }) @@ -806,6 +806,9 @@ color: #ffffff; line-height: 80rpx; font-size: 36rpx; + position: fixed; + bottom: 0; + margin-bottom: 10px; } .header-top image{ width: 706.25rpx; @@ -888,6 +891,7 @@ flex-direction: column; align-items: center; padding: 15px 0px; + margin-bottom: 50px; } .tese span:nth-child(1){ @@ -1092,7 +1096,11 @@ } .content{ width: 100%; - height: auto; + height: 100vh; + position: relative; background-color: #f7f7f7; + display: flex; + flex-direction: column; + align-items: center; } \ No newline at end of file diff --git a/pages/order/index - 副本.vue b/pages/order/index - 副本.vue index 29b1762..b0ae67f 100644 --- a/pages/order/index - 副本.vue +++ b/pages/order/index - 副本.vue @@ -81,14 +81,14 @@ - 取消订单 修改订单 @@ -97,39 +97,112 @@ 联系客服 - + + + 待评价 + + + 去投诉 + + + 联系客服 + + + + + 联系客服 + + + + + 联系客服 + + + - 更多 + 取消订单 + + + 充值 + + + 加钟 + + + + + 联系客服 + + + 服务升级 + + + 去投诉 + + + 提前结束 + + + + + 取消订单 修改订单 - - 立即预约 + + 联系客服 - - 待评价 - - - 去投诉 + + + + 取消订单 - + 修改订单 + + + 联系客服 + + + + + 取消订单 + + 拒单详情 @@ -137,29 +210,28 @@ @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi"> 联系客服 - - - 去支付 - - - 服务升级 - - - 提前结束 - - - 充值 - - - 加钟 - - + + + 取消订单 + + + 立即预约 + + + 立即预约 + + + 联系客服 + + + @@ -329,9 +401,17 @@ // margin: "0 0 0 20rpx" // } earlyFinishReason:'', + currentDate:new Date() } }, + computed: { + getCurrentTime() { + const hours = this.currentDate.getHours().toString().padStart(2, '0'); + const minutes = this.currentDate.getMinutes().toString().padStart(2, '0'); + return `${hours}:${minutes}`; + } + }, onLoad() { this.userId = uni.getStorageSync('userId') this.nickName = uni.getStorageSync('nickName'); @@ -358,23 +438,27 @@ } }, methods: { + taocanDaiBd(url,item){ + this.$queue.setData('getJishi',''); + this.$queue.setData('mainData',item); + uni.navigateTo({ + url:url + }) + }, + goNav(url,item,text) { this.$queue.setData('xiangmu',item); console.log("oldOrdersId=======",item) - // if(item.isSupplement=='1'){ - // uni.navigateTo({ - // url:url - // }) - // } - if(item.oldOrdersId){//如果有订单有升级 那就去升级订单详情 + + if(item.isSupplement=='2'){//如果有订单有升级 那就去升级订单详情 uni.navigateTo({ url:'/my/order/payShengji?ordersId='+item.ordersId }) - }else if(item.addNum){ + }else if(item.addNum||(item.addNum&&item.isSupplement=='1')){ uni.navigateTo({ url:'/my/order/payJaZ?ordersId='+item.ordersId }) - }else if(item.addNum&&item.oldOrdersId){ + }else if(item.addNum&&item.isSupplement=='2'){ uni.navigateTo({ url:'/my/order/payJaZ?ordersId='+item.ordersId }) @@ -382,17 +466,64 @@ uni.navigateTo({ url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId }) - }else if(item.packageType=='104'||item.packageType=='105'||item.packageType=='106'){ - uni.navigateTo({ - url:'/my/order/paydingTCX?ordersId='+item.ordersId - }) }else{ uni.navigateTo({ url:url }) } - }, + timeToMilliseconds(timeStr) { + // 分割时分为数组 + let parts = timeStr.split(':'); + // 确保时和分是数字 + if (parts.length === 2 && !isNaN(parseInt(parts[0])) && !isNaN(parseInt(parts[1]))) { + // 将时和分转换为整数 + let hours = parseInt(parts[0]); + let minutes = parseInt(parts[1]); + // 计算并返回毫秒数 + return (hours * 60 + minutes) * 60 * 1000; + } else { + // 如果格式不正确，返回0或抛出错误 + return 0; // 或者 throw new Error('Invalid time format'); + } + }, + //获取列表数据 + getOrderList() { + let curTab = this.tabs[this.tabIndex].status + + let data = { + status: curTab, + page: this.page, + limit: this.limit + } + // selectOrdersList + this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => { + if (res.code == 0) { + uni.hideLoading(); + if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表 + this.goods = [...this.goods, ...res.data.list]; //追加新数据 + var timestamp = this.timeToMilliseconds(this.getCurrentTime); + var twoTime=2* 60 * 60 * 1000; + var time=''; + + for(var i=0;itwoTime){ + this.$set(this.goods[i], 'btnShow', 'true') + }else{ + this.$set(this.goods[i], 'btnShow', 'false') + } + + } + console.log("this.goods[i].serveTime.slice(15, 16)",this.goods) + } + + }).catch(() => { + //联网失败, 结束加载 + + }); + }, + gengBtn(index){//更多按钮 // console.log("inex=====",index) this.gengNum=index; @@ -409,24 +540,25 @@ // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 this.$refs.popupQ.open(type) }, - TuiPopup(typeTxte,type){//确认拒单 全额退款.同意按钮 关闭弹出框 - this.type = typeTxte + TuiPopup(typeTxte,type,id){//确认拒单 全额退款.同意按钮 关闭弹出框 + var that=this; + that.type = typeTxte let data = { - ordersId: this.qurenJd.ordersId, + ordersId: that.qurenJd.ordersId?that.qurenJd.ordersId:id.ordersId, isAuto: '0', type: type } - this.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => { + that.$Request.post('/app/artificer/cancelSupplementOrders', data).then(res => { if (res.code == 0) { uni.showToast({ title:'操作完成！' }) - this.getOrderList() - this.$refs.popupQ.close(typeTxte); + that.getOrderList() + that.$refs.popupQ.close(typeTxte); }else{ uni.showToast({ icon:'error', - title:'操作失败！' + title:res.msg }) } @@ -531,54 +663,8 @@ } return status; }, - getTimeStampWithoutSeconds(date) { - // 将日期转换为标准的UTC时间 - var utcDate = new Date( - date.getUTCFullYear(), - date.getUTCMonth(), - date.getUTCDate(), - date.getUTCHours(), - date.getUTCMinutes(), - 0); - // 返回不含秒的时间戳 - return utcDate.getTime(); - }, - //获取列表数据 - getOrderList() { - let curTab = this.tabs[this.tabIndex].status - - let data = { - status: curTab, - page: this.page, - limit: this.limit - } - // selectOrdersList - this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => { - if (res.code == 0) { - uni.hideLoading(); - if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表 - this.goods = [...this.goods, ...res.data.list]; //追加新数据 - var date = new Date(); // 当前日期和时间 - var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 - const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 - var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime()) - var time=''; - for(var i=0;itwoTime){ - this.$set(this.goods, 'btnShow', 'true') - }else{ - this.$set(this.goods, 'btnShow', 'false') - } - } - // if(){} - } - - }).catch(() => { - //联网失败, 结束加载 - - }); - }, + + // 切换菜单 tabChange(index) { uni.showLoading({ @@ -712,6 +798,9 @@