From e784bbf596583e5853be0cdc56d1500bdc6b9113 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 14 Aug 2020 21:38:23 +0800
Subject: [PATCH] bug 8.14

---
 pageE/order/Index.vue | 5 +++--
 pages/shop/index.vue  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index 415aeaf..96b7c4c 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -195,8 +195,8 @@ export default {
 			this.current = current;
 		},
 		setViewHeight() {
-			const sys = uni.getSystemInfoSync();
-			this.swiperHeight = sys.windowHeight - 88 / 2 + 'px';
+			const res = uni.getSystemInfoSync();
+			this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
 		},
 	}
 };
@@ -207,6 +207,7 @@ export default {
 	background-color: #ECECEC;
 	display: flex;
 	flex-direction: column;
+	overflow: hidden;
 	.swiper-item {
 		.order-scroll {
 			.item-container {
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 6cccac4..24039fd 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -165,6 +165,8 @@
 			},
 			// 拼团推荐
 			getPinTuanPush() {
+				// 初始化拼团
+				this.pinTuanPush = {};
 				this.$u.api.getPinTuanPush().then(res => {
 					if (res.errCode == 0) {
 						this.pinTuanPush = res.data;