From d8bba87d61f89baa6e2be4a056e21682f18b5326 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 13 Jun 2022 16:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                   |  4 ++--
 pages/my/components/product-picked.vue | 16 +++++++++++++---
 pages/my/my-order.vue                  |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 79f7b92..2087aa6 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -10,9 +10,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
 				// args.url = 'http://10.45.137.214:80' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data) {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/pages/my/components/product-picked.vue b/pages/my/components/product-picked.vue
index 9a00835..b8eded3 100644
--- a/pages/my/components/product-picked.vue
+++ b/pages/my/components/product-picked.vue
@@ -6,10 +6,16 @@
 				<view class="cu-avatar" :style="'background-image:url(' + product.goodsLogoUrl + '); min-width:150rpx; min-height:150rpx;'"></view>
 				<view class="margin-left-sm flex-column-between" style="width: 100%">
 					<view class="text-black text-lg">{{product.goodsName}}</view>
-					<view class="flex flex-wrap">
-						<view class="basis-xl">{{product.standardName}}</view>
-						<view class="basis-xs text-right">×{{product.num}}</view>
+					<view class="flex justify-between align-center" style="width: 480rpx;" v-for="(item,index) in pickedList" :key="index" v-if="index < 3">
+						<view class="basis-lg text-cut">{{item.standardName}}</view>
+						<view class="basis-xs text-cut text-right">×{{item.standardNum}}</view>
 					</view>
+					<view v-if="pickedList.length > 3">...</view>
+					<!-- <view class="flex justify-between align-center" style="width: 440rpx;" v-for="(item,index) in 4" :key="index" v-if="index < 3">
+						<view class="basis-lg text-cut">冰箱冰箱冰箱冰箱冰箱冰箱冰箱冰箱冰箱冰箱冰箱</view>
+						<view class="basis-xs text-cut">×10000</view>
+					</view>
+					<view>...</view> -->
 				</view>
 			</view>
 		</view>
@@ -23,6 +29,10 @@
 			product: {
 				type: Object,
 				default: null
+			},
+			pickedList: {
+				type: Array,
+				default: []
 			}
 		}
 	}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 6ba8b55..89d1e0d 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -31,7 +31,7 @@
 				</view>
 				<view class="padding-lr">
 					<view class="margin-top-sm">
-						<product-picked :product="shopOrder"></product-picked>
+						<product-picked :product="shopOrder" :pickedList="shopOrder.standardList"></product-picked>
 					</view>
 					<view class="flex justify-end align-end padding-bottom-sm">
 						<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text>