用户订单列表接入接口

api/home.js

@@ -92,7 +92,7 @@ export function postUserAddressRemove(data) {
 
 // 查询用户订单接口
 export function getUserOrderPage(data) {
-	return request.get("v1/finance/order-page",data);
+	return request.get("v1/order/user",data);
 }
 
 // 根据用户订单NO查询物流信息

pages/order/index.vue

@@ -15,177 +15,91 @@
 				<view class="tabs">
 					<u-tabs  :is-scroll="true" :list="navigationList" @change="statusClick()" lineColor="#B22338"
 						:inactiveStyle="{ color: '#999999' }" :activeStyle="{ color: '#B22338', fontWeight: 'bold' }" 
-						keyName="title"></u-tabs>
+						keyName="title" :current="current"></u-tabs>
 				</view>
 			</view>
-			<view class="list" @click="goOrderDetails()">
-				<view class="myclient_list">
-					<view class="myclient_list_name">
-						<view class="nl">
-							重磅集合！花王系列、宝洁洗衣液等好物全重磅集合！
-						</view>
-						<view class="status">
-							待付款
-						</view>
-					</view>
-					<view class="myclient_list_content">
-
-						<view class="phone">
-							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/分期－手机@2x.png" />
-							<text>
-								手机号码:187998656565
-							</text>
-						</view>
-						<view class="time">
-							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
-							<text>
-								绑定时间:2023/04/26&nbsp;21:45:00
-							</text>
-						</view>
-					</view>
-				</view>
-				<view class="all-products-body">
-					<view class="all-products-item" @click="addGoodPopupShow = true">
-						<image
-							src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
-							mode="scaleToFill" />
-
-						<view class="all-products-item-content">
-							<view class="all-products-item-content-t">
-								宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
+			<view v-for="(item, index) in orderList" :key="index">
+				<view class="list" @click="goOrderDetails(item.orderId)">
+					<view class="myclient_list">
+						<view class="myclient_list_name">
+							<view class="nl">
+								{{item.mainTitle}}
 							</view>
-							<view class="all-products-item-content-b">
-								<view style="display:flex;">
-									<text class="red"> ¥48.00</text>
-								</view>
-
-								<view>
-									<view class="count"> x 1</view>
-								</view>
+							<view class="status">
+								{{item.orderStateDesc}}
 							</view>
 						</view>
-					</view>
-				</view>
-				<view class="self-pickup-point">
-					<view class="a-t">
-						最近的自提网点：
-					</view>
-					<view class="a-m">
-						<view class="am1">
-							<view class="am1-1">
-								上海市浦东新区秀浦路29号三层303室
+						<view class="myclient_list_content">
+				
+							<view class="phone">
+								<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/分期－手机@2x.png" />
+								<text>
+									团购日期: {{item.grouponStartTime}} 至 {{item.grouponEndTime}}
+								</text>
 							</view>
-							<view class="am1-2">
-								距您1.8km
-								<image src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
+							<view class="time">
+								<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
+								<text>
+									订单编号: {{item.orderNo}}
+								</text>
 							</view>
 						</view>
-						<view class="am2">
-							上海市浦东新区秀浦路29号三层303
-						</view>
-					</view>
-					<view class="a-b">
-						<view class="a-b1">
-							对接团长:
-							<text class="red">
-								陈晓旭
-							</text>
-						</view>
-						<view class="a-b2">
-							<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" />
-							<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" />
-						</view>
 					</view>
-				</view>
-				<view class="op-area">
-					<button class="action-btn" @click="goPay()">立即付款</button>
-				</view>
-
-			</view>
-			<view class="list" @click="goOrderDetails()">
-				<view class="myclient_list">
-					<view class="myclient_list_name">
-						<view class="nl">
-							重磅集合！花王系列、宝洁洗衣液等好物全重磅集合！
-						</view>
-						<view class="status">
-							待提货
+					<view class="all-products-body" v-for="(goods, index2) in item.goodsList" :key="index2">
+						<view class="all-products-item" @click="addGoodPopupShow = true">
+							<image
+								:src="goods.goodsImage"
+								mode="scaleToFill" />
+				
+							<view class="all-products-item-content">
+								<view class="all-products-item-content-t">
+									{{goods.goodsName}}
+								</view>
+								<view class="all-products-item-content-b">
+									<view style="display:flex;">
+										<text class="red"> ¥{{goods.goodsPrice}}</text>
+									</view>
+				
+									<view>
+										<view class="count"> x {{goods.goodsNum}}</view>
+									</view>
+								</view>
+							</view>
 						</view>
 					</view>
-					<view class="myclient_list_content">
-
-						<view class="phone">
-							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/分期－手机@2x.png" />
-							<text>
-								手机号码:187998656565
-							</text>
+					<view class="self-pickup-point">
+						<view class="a-t">
+							自提网点：
 						</view>
-						<view class="time">
-							<image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
-							<text>
-								绑定时间:2023/04/26&nbsp;21:45:00
-							</text>
-						</view>
-					</view>
-				</view>
-				<view class="all-products-body">
-					<view class="all-products-item" @click="addGoodPopupShow = true">
-						<image
-							src="https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/38e693de009644aa9de2dc6d6f7e747a_mergeImage.png"
-							mode="scaleToFill" />
-
-						<view class="all-products-item-content">
-							<view class="all-products-item-content-t">
-								宫中秘策（GOONGBE）进口儿童韩国进口儿童防晒霜80g
-							</view>
-							<view class="all-products-item-content-b">
-								<view style="display:flex;">
-									<text class="red"> ¥48.00</text>
+						<view class="a-m">
+							<view class="am1">
+								<view class="am1-1">
+									{{item.selfTakeName}}
 								</view>
-
-								<view>
-									<view class="count"> x 1</view>
+								<view class="am1-2">
+									<image src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
 								</view>
 							</view>
 						</view>
-					</view>
-				</view>
-				<view class="self-pickup-point">
-					<view class="a-t">
-						最近的自提网点：
-					</view>
-					<view class="a-m">
-						<view class="am1">
-							<view class="am1-1">
-								上海市浦东新区秀浦路29号三层303室
+						<view class="a-b">
+							<view class="a-b1">
+								对接团长:
+								<text class="red">
+									{{item.commander}}
+								</text>
 							</view>
-							<view class="am1-2">
-								距您1.8km
-								<image src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
+							<view class="a-b2">
+								<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" />
+								<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" />
 							</view>
 						</view>
-						<view class="am2">
-							上海市浦东新区秀浦路29号三层303
-						</view>
 					</view>
-					<view class="a-b">
-						<view class="a-b1">
-							对接团长:
-							<text class="red">
-								陈晓旭
-							</text>
-						</view>
-						<view class="a-b2">
-							<image src="http://www.gzzzyd.com/groupon/order_details/微信@2x.png" mode="scaleToFill" />
-							<image src="http://www.gzzzyd.com/groupon/order_details/电话键盘_填充@2x.png" mode="scaleToFill" />
-						</view>
+					<view class="op-area">
+						<button v-if="item.orderState == 1" class="action-btn" @click="goPay()">立即付款</button>
+						<button v-if="item.orderState == 2" class="info-btn" @click="goPay()">申请退货</button>
+						<button  v-if="item.orderState == 2" class="action-btn" @click="goPay()">取货码 877988</button>
 					</view>
 				</view>
-				<view class="op-area">
-					<button class="info-btn" @click="goPay()">申请退货</button>
-					<button class="action-btn" @click="goPay()">取货码 877988</button>
-				</view>
-
 			</view>
 			<view class="loadingicon acea-row row-center-wrapper" v-if="orderList.length > 0">
 				<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
@@ -255,24 +169,29 @@ export default {
 		return {
 			navigationList: [{
 				title: '全部',
-				id: 0
+				id: 0,
+				orderStatus: 0,
 			}
 			, 
 			{
 				title: '待付款',
-				id: 1
+				id: 1,
+				orderStatus: 1,
 			},
 			{
 				title: '待提货',
-				id: 2
+				id: 2,
+				orderStatus: 2,
 			},
 			{
 				title: '已完成',
-				id: 3
+				id: 3,
+				orderStatus: 4,
 			},
 			{
 				title: '售后',
-				id: 4
+				id: 4,
+				orderStatus: '',
 			},
 		],
 			pageHeight: app.globalData.windowHeight,
@@ -321,19 +240,30 @@ export default {
 			pay_orderId: '',
 			totalPrice: '0',
 			isAuto: false, //没有授权的不会自动授权
-			isShowAuth: false //是否隐藏授权
+			isShowAuth: false ,//是否隐藏授权
+			current: 0
 		};
 	},
 	computed: mapGetters(['isLogin']),
 	onShow () {
 		console.log("onShow事件,全局变量1--------", getApp().globalData.switchId, this.$route)
-		this.ContentIndex = getApp().globalData.switchId//获取到传参
-
+		let ContentIndex = getApp().globalData.switchId//获取到传参
+		if(ContentIndex == '待付款') {
+			this.current = 1;
+			this.orderStatus = 1;
+		} else if (ContentIndex == '待提货') {
+			this.current = 2;
+			this.orderStatus = 2;
+		} else if (ContentIndex == '已完成') {
+			this.current = 3;
+			this.orderStatus = 4;
+		}
+		
 		if (this.isLogin) {
 			this.page = 1;
 			this.orderList = []
 			this.loadend = false;
-			this.onLoadFun();
+			// this.onLoadFun();
 			this.getOrderList();
 		} else {
 			toLogin();
@@ -566,9 +496,9 @@ export default {
 		 * 切换类型
 		 */
 		statusClick: function (status) {
-			console.log(status);
-			if (status == this.orderStatus) return;
-			this.orderStatus = status;
+			console.log("切换类型 -> ", status.orderStatus);
+			if (status.orderStatus == this.orderStatus) return;
+			this.orderStatus = status.orderStatus;
 			this.loadend = false;
 			this.page = 1;
 			this.$set(this, 'orderList', []);
@@ -578,31 +508,28 @@ export default {
 		 * 获取订单列表
 		 */
 		getOrderList: function () {
-			// let that = this;
-			// if (that.loadend) return;
-			// if (that.loading) return;
-			// that.loading = true;
-			// that.loadTitle = that.$t(`加载更多`);
-			// getUserOrderPage({
-			// 	userId: this.$store.state.app.uid,
-			// 	current: that.page,
-			// 	size: that.limit,
-			// 	payFlag: this.orderStatus
-			// })
-			// 	.then(res => {
-			// 		let list = res.data || [];
-			// 		let loadend = list.length < that.limit;
-			// 		that.orderList = that.$util.SplitArray(list, that.orderList);
-			// 		that.$set(that, 'orderList', that.orderList);
-			// 		that.loadend = loadend;
-			// 		that.loading = false;
-			// 		that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
-			// 		that.page = that.page + 1;
-			// 	})
-			// 	.catch(err => {
-			// 		that.loading = false;
-			// 		that.loadTitle = that.$t(`加载更多`);
-			// 	});
+			let that = this;
+			if (that.loadend) return;
+			if (that.loading) return;
+			that.loading = true;
+			that.loadTitle = that.$t(`加载更多`);
+			getUserOrderPage({
+				current: that.page,
+				size: that.limit,
+				orderState: this.orderStatus
+			}).then(res => {
+				let list = res.data.records || [];
+				let loadend = list.length < that.limit;
+				that.orderList = that.$util.SplitArray(list, that.orderList);
+				that.$set(that, 'orderList', that.orderList);
+				that.loadend = loadend;
+				that.loading = false;
+				that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
+				that.page = that.page + 1;
+			}).catch(err => {
+				that.loading = false;
+				that.loadTitle = that.$t(`加载更多`);
+			});
 		},
 
 		/**

pages/user/index.vue

@@ -468,7 +468,7 @@ export default {
 			{
 				img: 'icon-daipingjia',
 				title: '已完成',
-				url: '/pages/order/index?status=4'
+				url: '/pages/order/index?status=3'
 			},
 			{
 				img: 'icon-a-shouhoutuikuan',