From d0fd00436448dd7b82031f840e22d9e6aecb6053 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 31 十二月 2024 15:41:22 +0800
Subject: [PATCH] -

---
 src/pages/order/order.vue |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index 4dbbb24..22b8ba7 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -26,8 +26,10 @@
 								</text> -->
 									<!-- <up-tag class='c-m-r-10' :text="item.orderStatusName" shape="circle" type="success"
 										plain plainFill size='mini'></up-tag> -->
-									<up-text :type="item.orderStatus==0?'primary':'success'"
+									<up-text v-if="item.isEn" :type="item.orderStatus==0?'primary':'success'"
 										:text="item.orderStatusName" size='12'></up-text>
+									<up-text v-else type="error" text="宸蹭笅鏋�" size='12'></up-text>
+
 									<!-- <up-button class='c-m-r-10' :text="item.isEn?'涓嬫灦':'涓婃灦'" disabled shape="circle"
 										v-if="item.orderStatus==0" :type="item.isEn?'error':'primary'" size='mini'
 										@click.stop="manageOrder(item)"></up-button> -->
@@ -133,7 +135,7 @@
 		uni.stopPullDownRefresh();
 	})
 	const current4 = ref(0);
-	const list = ref(['鍏ㄩ儴', '宸蹭笂鏋�', '宸蹭笅鏋�']);
+	const list = ref(['鍏ㄩ儴', '鍙戝竷涓�', '宸蹭笅鏋�']);
 	const changePicker = (val) => {
 		console.log(val);
 		workTime.value = val.startDate.result + '鑷�' + val.endDate.result
@@ -213,22 +215,37 @@
 			orderId: item.id
 		}
 		console.log(obj);
-		item.isLoading = true
 		if (item.isEn) {
-			$api.deleteOrder(obj).then(res => {
-				if (res.code == 1) {
-					$util.showToast({
-						title: '涓嬫灦鎴愬姛锛�'
-					})
-					PostMyListPageCompany()
-				} else {
-					$util.showToast({
-						title: res.error
-					})
-				}
-				item.isLoading = false
+			uni.showModal({
+			        title: '鎻愮ず',
+			        content: '纭涓嬫灦璇ュ伐浣滃悧锛熶笅鏋跺悗灏嗗垹闄ょ浉鍏虫暟鎹紒',
+			        success: function(res) {
+			        if (res.confirm) {
+						// 鎵ц纭鍚庣殑鎿嶄綔
+						item.isLoading = true
+						$api.deleteOrder(obj).then(req => {
+							if (req.code == 1) {
+								$util.showToast({
+									title: '涓嬫灦鎴愬姛锛�'
+								})
+								PostMyListPageCompany()
+							} else {
+								$util.showToast({
+									title: req.error
+								})
+							}
+							item.isLoading = false
+						})
+			        } 
+			        else {
+			            // 鎵ц鍙栨秷鍚庣殑鎿嶄綔
+			        }
+			    }
 			})
+			
 		} else {
+			item.OldId = item.id
+			item.id = 0
 			$api.saveOrder(item).then(res => {
 				if (res.code == 1) {
 					$util.showToast({

--
Gitblit v1.9.1