diff --git a/pages/active/limited-time/limited-time.vue b/pages/active/limited-time/limited-time.vue index a4fa047..de0511c 100644 --- a/pages/active/limited-time/limited-time.vue +++ b/pages/active/limited-time/limited-time.vue @@ -26,12 +26,13 @@ - - + diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue index 5c2ceeb..3276df1 100644 --- a/pages/login_package/login/login.vue +++ b/pages/login_package/login/login.vue @@ -66,6 +66,21 @@ + + + 其他登录方式 + + + + + - - - - - 搜索 + + + + + + 搜索 + - - - + + - - - {{ item.name }} + + + {{ item.name }} + - + @@ -56,12 +58,32 @@ export default { mixins: [MescrollMixin], components: { Header, TopSafe, MyBtn, PingItem, CustomTabBar, MescrollUni }, computed: { + isApp() { + // #ifdef APP-PLUS + return true; + // #endif + // #ifndef APP-PLUS + return false; + // #endif + }, mescrollTop() { // #ifdef MP-WEIXIN - return '420rpx'; + return '400rpx'; // #endif - // #ifndef MP-WEIXIN - return '336rpx'; + // #ifdef H5 + return '260rpx'; + // #endif + // #ifdef APP-PLUS + const statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0; + return (statusBarHeight * 2 + 248) + 'rpx'; + // #endif + }, + mescrollBottom() { + // #ifdef APP-PLUS + return '100rpx'; + // #endif + // #ifndef APP-PLUS + return '0rpx'; // #endif }, }, @@ -122,6 +144,11 @@ export default { this.getSearchList() }, onShow() { + /*#ifdef APP-PLUS*/ + uni.hideTabBar({ + animation: false, + }); + /*#endif*/ if (this.tabArr.length > 0) { const sortParams = uni.getStorageSync('sortParams'); if (sortParams) { @@ -195,6 +222,7 @@ export default { this.curTab = index; console.log("----", this.curTab) this.dataList = []; + this.mescroll && this.mescroll.scrollTo(0, 0); this.downCallback(); } }, @@ -249,10 +277,21 @@ export default {