From dcea9608af6a4923fb37c0771d40da36dfbfb0f1 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Mon, 7 Sep 2020 14:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=95=E7=A9=BF=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/mine/order-item/index.vue |  1 -
 components/mine/order-item/try.vue   | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index 79dd301..33a07bc 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -67,7 +67,6 @@ export default {
 		}
 	},
 	methods: {
-		
 		cancelOrder() {
 			this.$u.api.cancelOrder({
 				order_id: this.order.order_id,
diff --git a/components/mine/order-item/try.vue b/components/mine/order-item/try.vue
index fe7f10b..bb95790 100644
--- a/components/mine/order-item/try.vue
+++ b/components/mine/order-item/try.vue
@@ -12,9 +12,7 @@
 				<image :src="order.goods_image"></image>
 				<view class="goods-text">
 					<view class="goods-name u-line-2">{{ order.goods_name }}</view>
-					<!-- <view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
-						<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
-					</view> -->
+					<view class="goods-sku u-line-1" v-if="order.goods_spec">{{ order.goods_spec | concatSpec }}</view>
 					<!-- <view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view> -->
 				</view>
 			</view>
@@ -38,7 +36,18 @@ export default {
 	created() {
 		this.viewState();
 	},
-	filters: {},
+	filters: {
+		concatSpec(value) {
+			let spec = '';
+			for (const key in value) {
+				if (value.hasOwnProperty(key)) {
+					const element = value[key];
+					spec = spec + element + ';'
+				}
+			}
+			return spec;
+		}
+	},
 	methods: {
 		// "goods_try_order_status": 0,    试穿订单状态 0:待处理订单 20:同意 40:拒绝此订单 50:完成
 		viewState() {
@@ -131,6 +140,7 @@ export default {
 					line-height: 38rpx;
 				}
 				.goods-sku {
+					align-self: baseline;
 					max-width: 230rpx;
 					background: rgba(236,236,236,1);
 					border-radius: 6rpx;