From 14fcb61ffeca7a40716ded7351e64de16a2f815b Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Fri, 21 Apr 2023 13:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/order_list/order_list.vue | 58 ++++++++++++++++++----------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index cc638a3..55b759d 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -65,43 +65,41 @@
 								</image>
 								<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
 									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<view class="width100 text1" >{{row.title}}</view>
+								<view class="width100 text1">{{row.title}}</view>
 							</view>
 						</view>
-						<view  class="width30 flright fotrt fcor666 font15 fotrt">
+						<view class="width30 flright fotrt fcor666 font15 fotrt">
 							<view class="font14 fcor333">
 								x1
 							</view>
 						</view>
 					</view>
-					<view v-if="row.productType == 12" class="width96 height22 mart10">
-						<view class="width70 flleft fotlt ">
+					<view v-if="row.productType == 12" class="width96  mart10">
+						<view class="width100   ">
 							<view class="font16 fontwig6 fcor333 alijusstart">
-								
-								<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig" style="width: 50rpx;height: 50rpx;">
+								<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig"
+									style="width: 50rpx;height: 50rpx;">
 								</image>
-								<!-- <view class="width100 text1" v-if="row.productType != 12">{{row.title}}</view> -->
-
-								<!-- <view class="po-ra" v-if="row.productType == 12&&row.ext6.split(',').length>1">
-									<scroll-view class="settle-goods" scroll-x="true">
-										<view class="settle-con">
-											<view class="settle-img" v-for="item in row.ext6.split(',')">
-												<image class="st-img" :src="imageUrl+'item'" mode="aspectFill"></image>
-											</view>
-
+								<view class="width100 text1">{{row.title}}</view>
+							</view>
+							<view class="po-ra width100 mart10" v-if="row.productType == 12&&row.ext6.length>1">
+								<scroll-view class="settle-goods" scroll-x="true">
+									<view class="settle-con">
+										<view class="settle-img" v-for="item in row.ext6">
+											<image class="st-img" :src="imageUrl+item" mode="aspectFill"></image>
 										</view>
 
-									</scroll-view>
-									<view class="fix-soon fcor666">
-										<view class="fix-price">
+									</view>
 
-											<text class="icon-ymt to-right font14 fcor666"></text>
+								</scroll-view>
+								<view class="fix-soon fcor666">
+									<view class="fix-price">
 
-										</view>
+										<text class="icon-ymt to-right font14 fcor666"></text>
 
 									</view>
-								</view> -->
 
+								</view>
 							</view>
 						</view>
 						<!-- <view  class="width30 flright fotrt fcor666 font15 fotrt">
@@ -216,6 +214,10 @@
 			}
 			this.list = this.orderList[this.typeId];
 			this.tabbarIndex = tbIndex;
+			// this.getUserOrderList();
+			// this.getDictionaryByCodeType();
+		},
+		onShow(){
 			this.getUserOrderList();
 			this.getDictionaryByCodeType();
 		},
@@ -289,7 +291,21 @@
 						if (res.return_data.total == (this.pageNum * this.pageSize)) {
 							this.isNoMoreData = true;
 						}
+
+						if (res.return_data.list.length > 0) {
+							res.return_data.list.map(item => {
+								if (item.ext6) {
+									item.ext6 = item.ext6.split(",")
+								}
+							})
+						}
+
+
 						this.orderList = this.orderList.concat(res.return_data.list);
+
+						//处理图片
+
+
 						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
 					} else {
 						this.orderList = [];