From 4a25180e9cf13167a50df153232199d879676d37 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Fri, 2 Jul 2021 17:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E8=AE=A2=E5=8D=95=E9=99=90=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/apply-details.vue  |  2 +-
 pages/order/apply-refund.vue   |  2 +-
 pages/order/confirm-atonce.vue |  2 +-
 pages/order/confirm-order.vue  | 16 +++++++++++-----
 pages/order/index.vue          |  2 +-
 pages/order/order-details.vue  |  2 +-
 pages/order/unpay-details.vue  |  2 +-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 92995d1..f112d0d 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start" style="padding: 32rpx 32rpx 30rpx 32rpx;">
 						<image :src="orderDetails.order.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box text-black1 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.order.goods.name">
+							<view class="bref-box text-black1 lf-line-2 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.order.goods.name">
 								{{orderDetails.order.goods.name}}
 							</view>
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.order.number}}</text>
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index ace4faf..67c43f1 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start" style="padding: 32rpx 32rpx 30rpx 32rpx;">
 						<image :src="applyDetails.order.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box text-black1 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="applyDetails.order.goods.name">
+							<view class="bref-box text-black1 lf-line-2 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="applyDetails.order.goods.name">
 								{{applyDetails.order.goods.name}}
 							</view>
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{applyDetails.order.number}}</text>
diff --git a/pages/order/confirm-atonce.vue b/pages/order/confirm-atonce.vue
index 0e00d7a..09a24b1 100644
--- a/pages/order/confirm-atonce.vue
+++ b/pages/order/confirm-atonce.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start padding-top-sm padding-lr">
 						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box margin-top-xs lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
+							<view class="bref-box margin-top-xs lf-line-2 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
 								{{orderDetails.goods.name}}
 							</view>
 							<view class="flex justify-between align-center text-center">
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 2eeae69..ea99d15 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start padding-top-sm padding-lr">
 						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
+							<view class="bref-box lf-font-32 lf-line-2 lf-font-bold" style="height: 88rpx;line-height: 44rpx;color: #222;">
 								{{orderDetails.goods.name}}
 							</view>
 							<view class="flex justify-between align-center text-center">
@@ -133,9 +133,13 @@
 		methods: {
 			changeNum(num) {
 				if(num > this.limit) {
-					this.$msg('该商品限购'+this.limit+'件')
-					this.num = this.limit
-					return
+					if(this.limit == 0 || this.limit == '') {
+						this.num = num
+					}else {
+						this.$msg('该商品限购'+this.limit+'件')
+						this.num = this.limit
+						return
+					}
 				}else if(num < 1) {
 					this.num = 1
 				}
@@ -149,12 +153,14 @@
 				})
 			},
 			reduce() {
-				if (this.num === 1) return
+				if (this.num === 1 || this.num === 0) return
 				this.num--
 			},
 			add() {
 				if(this.num < this.limit) {
 					this.num++
+				}else if(this.limit == 0 || this.limit == ''){
+					this.num++
 				}else {
 					this.$msg('该商品限购'+this.limit+'件')
 					this.num = this.limit
diff --git a/pages/order/index.vue b/pages/order/index.vue
index eea3276..10bbd45 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -248,7 +248,7 @@
 	.title {
 		font-size: 28rpx;
 		color: $u-content-color;
-		height: 98rpx;
+		height: 93rpx;
 	}
 
 	// tab
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index a28e213..ff24a8d 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -7,7 +7,7 @@
 					<view class="flex justify-between align-start" style="padding: 32rpx 32rpx 30rpx 32rpx;">
 						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box text-black1 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.goods.name">
+							<view class="bref-box lf-line-2 text-black1 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.goods.name">
 								{{orderDetails.goods.name}} 
 							</view>
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 8372167..733e3ba 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -8,7 +8,7 @@
 					<view class="flex justify-between align-start" style="padding: 32rpx 32rpx 30rpx 32rpx;">
 						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 240rpx; height: 240rpx;border-radius: 10rpx;"></image>
 						<view class="flex-sub padding-left-sm">
-							<view class="bref-box text-black1 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.goods.name">
+							<view class="bref-box text-black1 lf-line-2 lf-font-32 lf-font-bold" style="height: 88rpx;line-height: 44rpx;" v-if="orderDetails.goods.name">
 								{{orderDetails.goods.name}} 
 							</view>
 							<text class="block text-gray lf-font-28" style="margin-top: 20rpx;line-height: 40rpx;">数量 <text class="margin-left margin-right-xs text-gray">x</text>{{orderDetails.number}}</text>