Merge pull request 'bug 8.14' (#209) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/209

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 {

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;