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

App.vue

@@ -9,6 +9,13 @@ export default {
   onLaunch: function () {
     this.init();
     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) {
 	  if(options.referrerInfo.extraData){
@@ -46,24 +53,24 @@ export default {
      }
     },
     formatPlat() {
-      let modelmes = uni.getSystemInfoSync().model;
-      let tempMoble = Boolean;
-      if (
-        modelmes.indexOf("iPhone X") >= 0 ||
-        modelmes.indexOf("iPhone XR") >= 0 ||
-        modelmes.indexOf("iPhone XS") >= 0 ||
-        modelmes.indexOf("iPhone 12") >= 0 ||
-        modelmes.indexOf("iPhone 11") >= 0 ||
-        modelmes.indexOf("iPhone11") >= 0 ||
-        modelmes.indexOf("iPhone12") >= 0 ||
-        modelmes.indexOf("iPhoneXR") >= 0 ||
-        modelmes.indexOf("iPhoneX") >= 0
-      ) {
-        tempMoble = true;
-      } else {
-        tempMoble = false;
-      }
-      this.$uiConfig.is_bang = tempMoble;
+      // let modelmes = uni.getSystemInfoSync().model;
+      // let tempMoble = Boolean;
+      // if (
+      //   modelmes.indexOf("iPhone X") >= 0 ||
+      //   modelmes.indexOf("iPhone XR") >= 0 ||
+      //   modelmes.indexOf("iPhone XS") >= 0 ||
+      //   modelmes.indexOf("iPhone 12") >= 0 ||
+      //   modelmes.indexOf("iPhone 11") >= 0 ||
+      //   modelmes.indexOf("iPhone11") >= 0 ||
+      //   modelmes.indexOf("iPhone12") >= 0 ||
+      //   modelmes.indexOf("iPhoneXR") >= 0 ||
+      //   modelmes.indexOf("iPhoneX") >= 0
+      // ) {
+      //   tempMoble = true;
+      // } else {
+      //   tempMoble = false;
+      // }
+      // this.$uiConfig.is_bang = tempMoble;
     },
     formatNavigation() {
       uni.setNavigationBarColor({

components/tabbar/index.vue

@@ -9,19 +9,19 @@
   right: 0;
   z-index: 99999999;
   border-top: 1upx solid #ddd;
-  padding-top: 96rpx;
+  padding-top: 20rpx;
   background: #fff;
 }
 .tabbarMainIphone {
-  height: 156upx;
+  /* height: 156upx; */
   /* padding-bottom: 64upx; */
 }
 .tabBtnMina {
   width: 750upx;
   /* height: 88upx; */
-  position: absolute;
+  /* position: absolute;
   z-index: 2;
-  bottom: 0;
+  bottom: 0; */
   flex-direction: row;
   /* #ifndef */
   /* padding-bottom: constant(safe-area-inset-top);
@@ -33,7 +33,7 @@
   z-index: 99999;
 }
 .tabBtnMinaIphone {
-  height: 156upx;
+  /* height: 156upx; */
   /* padding-bottom: 64upx; */
 }
 .imgse {
@@ -114,15 +114,15 @@
       <view
         class="tabbarMain"
         :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"
       >
+	  <!-- 'height':height+'rpx', -->
         <view
           class="tabBtnMina"
-          :class="[flagTypeInfo ? 'tabBtnMinaIphone' : '']"
-          :style="{'height':height+'upx','padding-bottom':paddingBottom + 'rpx'}"
           mode=""
         >
+		<!-- 'height':height+'upx', -->
           <view
             class="itmMain"
             v-for="(x, i) in navs"
@@ -249,8 +249,8 @@ export default {
 	wx.getSystemInfo({
 		success(res) {
 			let lift=res.screenHeight-res.safeArea.bottom
-			that.paddingBottom = Number(lift)+10
-			console.log(lift)
+			that.paddingBottom = Number(lift)+20
+			
 		}
 	})
     // let port = uni.getSystemInfoSync().platform