From a0c86d7dd7ff224c2bfc475ff1923df808825819 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Tue, 22 Aug 2023 17:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=A1=A5=E5=85=85=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=92=8C=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pages_zhentou/order/order.vue | 33 ++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index d0ad5f9..3908168 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="order_box">
 		<view class="order_title">
-			<p @click="handleTab(1)" class="tit" :class="active == 1 ? 'actived' : ''">全部</p>
-			<p @click="handleTab(2)" class="tit" :class="active == 2 ? 'actived' : ''">待付款</p>
-			<p @click="handleTab(3)" class="tit" :class="active == 3 ? 'actived' : ''">待发货</p>
-			<p @click="handleTab(4)" class="tit" :class="active == 4 ? 'actived' : ''">待收货</p>
-			<p @click="handleTab(5)" class="tit" :class="active == 5 ? 'actived' : ''">已完成</p>
+			<p @click="handleTab(1)" class="tit" :class="active == '' ? 'actived' : ''">全部</p>
+			<p @click="handleTab(2)" class="tit" :class="active == 1 ? 'actived' : ''">待付款</p>
+			<p @click="handleTab(3)" class="tit" :class="active == 2 ? 'actived' : ''">待发货</p>
+			<p @click="handleTab(4)" class="tit" :class="active == 3 ? 'actived' : ''">待收货</p>
+			<p @click="handleTab(5)" class="tit" :class="active == 4 ? 'actived' : ''">已完成</p>
 		</view>
 		<view class="order_content" v-for="(item,index) in orderData" :key="index">
 			<view class="order_item" @click="handleCheck(item)">
@@ -68,7 +68,7 @@
 		data() {
 			return {
 				imgPrefix: getApp().globalData.imgPrefix,
-				active: 1,
+				active: '',
 				orderData: [],
 				current: 0,
 				size: 10,
@@ -78,11 +78,16 @@
 					contentdown: "点击查看更多",
 					contentrefresh: "正在加载...",
 					contentnomore: "没有更多数据了",
-				}
+				},
+				userInfo: {}
 			}
 		},
-		mounted() {
-			this.loadMore();
+		onLoad() {
+			let userInfo = uni.getStorageSync('userInfo');
+			if(userInfo) {
+				this.userInfo = JSON.parse(userInfo);
+				this.loadMore();
+			}
 		},
 		methods: {
 			// 查看物流
@@ -94,9 +99,9 @@
 			loadMore() {
 				if (this.hasMore) {
 					this.current = this.current + 1;
-					this.staus = 'loading';
+					this.status = 'loading';
 					uni.request({
-						url: getApp().globalData.baseUrl + '/blade-desk/order/page?current=' + this.current + '&size=' + this
+						url: getApp().globalData.baseUrl + '/blade-desk/order/page?buyerPhone=' + this.userInfo.phone + '&status=' + this.active + '&current=' + this.current + '&size=' + this
 							.size,
 						method: 'GET',
 						header: {
@@ -122,7 +127,11 @@
 				}
 			},
 			handleTab(val) {
-				this.active = val
+				this.active = val;
+				this.current = 0;
+				this.orderData = [];
+				this.hasMore = true;
+				this.loadMore();
 			},
 			handleCheck(row) {
 				let item = encodeURIComponent(JSON.stringify(row))