From 21d3201c4bd5bcd52061eaccc1a5b72808b7df75 Mon Sep 17 00:00:00 2001
From: Niujiawei <niujiawei>
Date: Tue, 11 Aug 2020 21:18:34 +0800
Subject: [PATCH] 2020.08.10

---
 components/mine/order-item/index.vue | 17 ++++++++++++++---
 components/remaining/remaining.vue   |  2 +-
 pageB/sdetails/index.vue             | 16 +++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index cf260cb..a2df1c6 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -13,7 +13,7 @@
 				<view class="goods-text">
 					<view class="goods-name u-line-2">{{ goods.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>
+						<text v-for="(spec, index) in goods.goods_spec" :key="index" class="goods-sku-text">{{ spec + ';' }}</text>
 					</view>
 					<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
 					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
@@ -173,11 +173,22 @@ export default {
 				.goods-sku {
 					display: inline-block;
 					max-width: 230rpx;
-					background: rgba(236,236,236,1);
+					// background: rgba(236,236,236,1);
 					border-radius: 6rpx;
-					padding: 10rpx 15rpx;
+					// padding: 10rpx 15rpx;
 					font-size: 24rpx;
 					color: rgba(153,153,153,1);
+					.goods-sku-text:first-child{
+						padding: 10rpx 4rpx 10rpx 15rpx;
+					}
+					.goods-sku-text{
+						background: rgba(236,236,236,1);
+						padding: 10rpx 4rpx 10rpx 4rpx;
+						display: inline-block;
+					}
+					.goods-sku-text:last-child{
+						padding: 10rpx 15rpx 10rpx 4rpx;
+					}
 				}
 				.goods-time {
 					font-size: 24rpx;
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 612bd66..2b8dfec 100644
--- a/components/remaining/remaining.vue
+++ b/components/remaining/remaining.vue
@@ -311,7 +311,7 @@
 					color: rgba(51, 51, 51, 1);
 					display: block;
 					text-align: left;
-					margin: 80rpx auto 33rpx;
+					margin: 33rpx auto 33rpx;
 					letter-spacing: 1rpx;
 					text-align: justify;
 					line-height: 36rpx;
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 1edd690..bc56f3d 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -115,6 +115,7 @@
 		<!-- 选择规格数量 -->
 		<u-popup v-model="showSpec" mode="bottom">
 			<scroll-view scroll-y="true" class="spec-popup">
+				<button class="button"></button>
 				<view>
 					<view class="head">
 						<image class="image" :src="goodsInfo.goods_image"></image>
@@ -949,9 +950,22 @@ export default {
 		}
 	}
 	.spec-popup {
-		padding: 30rpx;
+		padding:30rpx;
 		box-sizing: border-box;
 		max-height: 750rpx;
+		.button{
+			height: 30rpx;
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			z-index: 999;
+			background: #fff;
+			border: none !important;
+			&::after{
+				border: none !important;
+			}
+		}
 		.head{
 			display: flex;
 			margin-bottom: 30rpx;