Skip to content

M
mallapp
Commit 84d1071f authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 5e385440 63b32dae
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 28 deletions
App.vue
View file @ 84d1071f
...@@ -9,6 +9,13 @@ export default { ...@@ -9,6 +9,13 @@ export default {
onLaunch: function () { onLaunch: function () {
this.init(); this.init();
this.formatPlat(); this.formatPlat();
let that=this
wx.getSystemInfo({
success(res) {
let lift=res.screenHeight-res.safeArea.bottom
that.$uiConfig.is_bang = Number(lift)>0?true:false
}
})
}, },
onShow: function (options) { onShow: function (options) {
if(options.referrerInfo.extraData){ if(options.referrerInfo.extraData){
...@@ -46,24 +53,24 @@ export default { ...@@ -46,24 +53,24 @@ export default {
} }
}, },
formatPlat() { formatPlat() {
let modelmes = uni.getSystemInfoSync().model; // let modelmes = uni.getSystemInfoSync().model;
let tempMoble = Boolean; // let tempMoble = Boolean;
if ( // if (
modelmes.indexOf("iPhone X") >= 0 || // modelmes.indexOf("iPhone X") >= 0 ||
modelmes.indexOf("iPhone XR") >= 0 || // modelmes.indexOf("iPhone XR") >= 0 ||
modelmes.indexOf("iPhone XS") >= 0 || // modelmes.indexOf("iPhone XS") >= 0 ||
modelmes.indexOf("iPhone 12") >= 0 || // modelmes.indexOf("iPhone 12") >= 0 ||
modelmes.indexOf("iPhone 11") >= 0 || // modelmes.indexOf("iPhone 11") >= 0 ||
modelmes.indexOf("iPhone11") >= 0 || // modelmes.indexOf("iPhone11") >= 0 ||
modelmes.indexOf("iPhone12") >= 0 || // modelmes.indexOf("iPhone12") >= 0 ||
modelmes.indexOf("iPhoneXR") >= 0 || // modelmes.indexOf("iPhoneXR") >= 0 ||
modelmes.indexOf("iPhoneX") >= 0 // modelmes.indexOf("iPhoneX") >= 0
) { // ) {
tempMoble = true; // tempMoble = true;
} else { // } else {
tempMoble = false; // tempMoble = false;
} // }
this.$uiConfig.is_bang = tempMoble; // this.$uiConfig.is_bang = tempMoble;
}, },
formatNavigation() { formatNavigation() {
uni.setNavigationBarColor({ uni.setNavigationBarColor({
......
components/tabbar/index.vue
View file @ 84d1071f
...@@ -9,19 +9,19 @@ ...@@ -9,19 +9,19 @@
right: 0; right: 0;
z-index: 99999999; z-index: 99999999;
border-top: 1upx solid #ddd; border-top: 1upx solid #ddd;
padding-top: 96rpx; padding-top: 20rpx;
background: #fff; background: #fff;
} }
.tabbarMainIphone { .tabbarMainIphone {
height: 156upx; /* height: 156upx; */
/* padding-bottom: 64upx; */ /* padding-bottom: 64upx; */
} }
.tabBtnMina { .tabBtnMina {
width: 750upx; width: 750upx;
/* height: 88upx; */ /* height: 88upx; */
position: absolute; /* position: absolute;
z-index: 2; z-index: 2;
bottom: 0; bottom: 0; */
flex-direction: row; flex-direction: row;
/* #ifndef */ /* #ifndef */
/* padding-bottom: constant(safe-area-inset-top); /* padding-bottom: constant(safe-area-inset-top);
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
z-index: 99999; z-index: 99999;
} }
.tabBtnMinaIphone { .tabBtnMinaIphone {
height: 156upx; /* height: 156upx; */
/* padding-bottom: 64upx; */ /* padding-bottom: 64upx; */
} }
.imgse { .imgse {
...@@ -114,15 +114,15 @@ ...@@ -114,15 +114,15 @@
<view <view
class="tabbarMain" class="tabbarMain"
:class="[flagTypeInfo ? 'tabbarMainIphone' : '']" :class="[flagTypeInfo ? 'tabbarMainIphone' : '']"
:style="{'height':height+'rpx','position':'fixed','left':'0','right':'0'}" :style="{'position':'fixed','left':'0','right':'0','padding-bottom':paddingBottom + 'rpx'}"
v-if="navs && navs.length > 0" v-if="navs && navs.length > 0"
> >
<!-- 'height':height+'rpx', -->
<view <view
class="tabBtnMina" class="tabBtnMina"
:class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
:style="{'height':height+'upx','padding-bottom':paddingBottom + 'rpx'}"
mode="" mode=""
> >
<!-- 'height':height+'upx', -->
<view <view
class="itmMain" class="itmMain"
v-for="(x, i) in navs" v-for="(x, i) in navs"
...@@ -249,8 +249,8 @@ export default { ...@@ -249,8 +249,8 @@ export default {
wx.getSystemInfo({ wx.getSystemInfo({
success(res) { success(res) {
let lift=res.screenHeight-res.safeArea.bottom let lift=res.screenHeight-res.safeArea.bottom
that.paddingBottom = Number(lift)+10 that.paddingBottom = Number(lift)+20
console.log(lift)
} }
}) })
// let port = uni.getSystemInfoSync().platform // let port = uni.getSystemInfoSync().platform
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment