diff --git a/my/order/pay - 副本.vue b/my/order/pay - 副本.vue new file mode 100644 index 0000000..dbb0647 --- /dev/null +++ b/my/order/pay - 副本.vue @@ -0,0 +1,2243 @@ + + + + + \ No newline at end of file diff --git a/my/order/pay.vue b/my/order/pay.vue index d61089a..dbb0647 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -88,7 +88,7 @@ @click="bindphone(order.artificer.phone)"> --> - {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}} diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue index 1cdf2c0..12e22ab 100644 --- a/my/order/payJaZ.vue +++ b/my/order/payJaZ.vue @@ -288,8 +288,11 @@ 升级费用: - ¥ - {{order.sumMoney?order.sumMoney:0}} + ¥ + + {{order.sumMoney?order.sumMoney:'0'}} + + 合计: diff --git a/my/order/payding.vue b/my/order/payding.vue index 1d56b45..9ad173e 100644 --- a/my/order/payding.vue +++ b/my/order/payding.vue @@ -279,7 +279,11 @@ 取消订单 + v-if="order.status != 3 && + order.status != 4 && + order.status != 5&& + order.status != 10" + >取消订单 --> - {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}} @@ -195,7 +195,11 @@ 取消订单 + v-if="order.status != 3 && + order.status != 4 && + order.status != 5&& + order.status != 10" + >取消订单 \ No newline at end of file diff --git a/pages/order/index - 副本.vue b/pages/order/index - 副本.vue new file mode 100644 index 0000000..29b1762 --- /dev/null +++ b/pages/order/index - 副本.vue @@ -0,0 +1,930 @@ + + + + + + \ No newline at end of file diff --git a/pages/order/index.vue b/pages/order/index.vue index 5b00cf5..becdabd 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -59,40 +59,149 @@ - - - - - 更多 - + 取消订单 修改订单 - - 立即预约 + + 去支付 - + 联系客服 + + + + + 取消订单 + + + 修改订单 + + + 联系客服 + + + + 待评价 - + 去投诉 - + 联系客服 + + + + + 联系客服 + + + + + 联系客服 + + + + + 更多 + + + 取消订单 + + + 充值 + + + 加钟 + + + + + 联系客服 + + + 服务升级 + + + 去投诉 + + + 提前结束 + + + + + + 取消订单 + + + 修改订单 + + + 联系客服 + + + + + 取消订单 + + + 修改订单 + + + 联系客服 + + + + + 取消订单 + + 拒单详情 @@ -100,29 +209,18 @@ @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi"> 联系客服 - - - 去支付 - - - 服务升级 - - - 提前结束 - - - 充值 - - - 加钟 - - + + + 立即预约 + + + 联系客服 + + + @@ -292,9 +390,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'); @@ -321,6 +427,57 @@ } }, methods: { + 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(() => { + //联网失败, 结束加载 + + }); + }, goNav(url,item,text) { this.$queue.setData('xiangmu',item); console.log("oldOrdersId=======",item) @@ -494,54 +651,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[i], 'btnShow', 'true') - }else{ - this.$set(this.goods[i], 'btnShow', 'false') - } - } - // if(){} - } - - }).catch(() => { - //联网失败, 结束加载 - - }); - }, + + // 切换菜单 tabChange(index) { uni.showLoading({