From d1c8aab546c96346312d699f01cce5fe107783c0 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 28 Jun 2024 23:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/index.vue | 53 +++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 4c842bf..6542f52 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -709,31 +709,34 @@
 			cancel(e) {
 				console.log(11)
 				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
-					success: function(res) {
-						if (res.confirm) {
-							let data = {
-								ordersId: e.ordersId,
-								accomplishLongitude: that.longitude,
-								accomplishLatitude: that.latitude
-							}
-							that.$queue.showLoading('提交中...')
-							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
-								uni.hideLoading();
-								if (res.code == 0) {
-									that.mescroll.resetUpScroll()
-									websocketUtils.uploadAudioEnd(); //关闭音频上传
-								} else {
-									that.$queue.showToast(res.msg);
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
+				uni.navigateTo({
+					url:'/my/order/revenueDetails?ordersId='+e.ordersId
+				})
+				// uni.showModal({
+				// 	title: '提示',
+				// 	content: '如果服务未完成点击完成订单会遭到平台违规处理，请确认服务是否完毕?',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			let data = {
+				// 				ordersId: e.ordersId,
+				// 				accomplishLongitude: that.longitude,
+				// 				accomplishLatitude: that.latitude
+				// 			}
+				// 			that.$queue.showLoading('提交中...')
+				// 			that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+				// 				uni.hideLoading();
+				// 				if (res.code == 0) {
+				// 					that.mescroll.resetUpScroll()
+				// 					websocketUtils.uploadAudioEnd(); //关闭音频上传
+				// 				} else {
+				// 					that.$queue.showToast(res.msg);
+				// 				}
+				// 			})
+				// 		} else if (res.cancel) {
+				// 			console.log('用户点击取消');
+				// 		}
+				// 	}
+				// });
 			},
 			//时间弹框开关
 			bindData(index) {