theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/209
This commit is contained in:
hansu 2020-08-14 21:38:48 +08:00
commit 7deb5d312b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pageE/order/Index.vue
View File

@ -195,8 +195,8 @@ export default {
this.current = current; this.current = current;
}, },
setViewHeight() { setViewHeight() {
const sys = uni.getSystemInfoSync(); const res = uni.getSystemInfoSync();
this.swiperHeight = sys.windowHeight - 88 / 2 + 'px'; this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
}, },
} }
}; };
@ -207,6 +207,7 @@ export default {
background-color: #ECECEC; background-color: #ECECEC;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
.swiper-item { .swiper-item {
.order-scroll { .order-scroll {
.item-container { .item-container {

2
pages/shop/index.vue
View File

@ -165,6 +165,8 @@
}, },
// 拼团推荐 // 拼团推荐
getPinTuanPush() { getPinTuanPush() {
// 初始化拼团
this.pinTuanPush = {};
this.$u.api.getPinTuanPush().then(res => { this.$u.api.getPinTuanPush().then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
this.pinTuanPush = res.data; this.pinTuanPush = res.data;