From 3bcbbf5d5ddb972f796072c3fc429cf6a933138c Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Wed, 6 Dec 2023 09:41:19 +0800
Subject: [PATCH] =?UTF-8?q?12.06=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gasStation-uni/pages/my/my.vue             | 14 ++++-----
 gasStation-uni/pagesMy/myorder/myorder.vue | 34 +++++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 9c6c11c6b..c42cd2634 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -44,7 +44,7 @@
 				</view>
 			</view>
 			<view class="my-top-box" style="margin-top: 45px;">
-				<view class="centenr-sx" @click="gomyorder()">
+				<view class="centenr-sx" @click="gomyorder(0)">
 					<view class="centenr-img">
 						<image src="../../static/my/dingdan.png" mode=""></image>
 					</view>
@@ -54,7 +54,7 @@
 				</view>
 
 
-				<view class="centenr-sx">
+				<view class="centenr-sx" @click="gomyorder(1)">
 					<view class="centenr-img">
 						<image src="../../static/my/dsy.png" mode=""></image>
 					</view>
@@ -63,7 +63,7 @@
 					</view>
 				</view>
 
-				<view class="centenr-sx">
+				<view class="centenr-sx" @click="gomyorder(2)">
 					<view class="centenr-img">
 						<image src="../../static/my/ywc.png" mode=""></image>
 					</view>
@@ -71,7 +71,7 @@
 						已完成
 					</view>
 				</view>
-				<view class="centenr-sx">
+				<view class="centenr-sx" @click="gomyorder(3)">
 					<view class="centenr-img">
 						<image src="../../static/my/dpj.png" mode=""></image>
 					</view>
@@ -172,9 +172,9 @@
 			tabbar
 		},
 		methods: {
-			gomyorder() {
+			gomyorder(id) {
 				uni.navigateTo({
-					url: '/pagesMy/myorder/myorder'
+					url: '/pagesMy/myorder/myorder?id=' + id
 				})
 			},
 			gotodaby() {
@@ -405,4 +405,4 @@
 	.centenr-size {
 		font-size: 14px;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index 90cb97895..f36d4f0df 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -46,7 +46,7 @@
 							<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
 							<view class="" v-else>{{item.createTime}}</view>
 						</view>
-						<view class="end-box">
+						<view class="end-box" @click="goComment()">
 							<view class="anniu">
 								<text>评价有礼</text>
 							</view>
@@ -102,8 +102,10 @@
 				scrollTop: 0,
 			}
 		},
-		onLoad() {
-			this.getMyOrder()
+		onLoad(option) {
+			this.tapindex = option.id
+			this.getTapIndex(option.id)
+			// this.getMyOrder()
 			this.getStores()
 			this.getPayList()
 		},
@@ -204,14 +206,21 @@
 					method: 'get',
 					params: _this.map,
 				}).then((res) => {
-					if (_this.map.page == 1) {
-						_this.orderList = res.data.records
-						_this.list = res.data.records
-					} else {
-						_this.orderList = _this.orderList.concat(res.data.records)
-						_this.list = _this.list.concat(res.data.records)
+					uni.showLoading({
+						title: '加载中'
+					});
+					if (res.code == 200) {
+						if (_this.map.page == 1) {
+							_this.orderList = res.data.records
+							_this.list = res.data.records
+						} else {
+							_this.orderList = _this.orderList.concat(res.data.records)
+							_this.list = _this.list.concat(res.data.records)
+						}
+						_this.total = res.data.total
+						uni.hideLoading();
 					}
-					_this.total = res.data.total
+
 				})
 			},
 			getTapIndex(index) {
@@ -252,6 +261,11 @@
 					this.getMyOrder()
 				}
 			},
+			goComment() {
+				uni.navigateTo({
+					url: "/pagesMy/comment/comment"
+				})
+			},
 			goBack() {
 				uni.navigateBack()
 			}