modify: bottom

src/component/authorization-modal/authorization-modal.wxml

@@ -9,7 +9,7 @@
         <view class="auto-old"><span class="auto-old-num">2. </span>若在领取新会员卡过程中输入新手机号,会造成原会员及积分信息的更替。</view>
         <view class="auto-old"><span class="auto-old-num">3. </span>领取后的新会员卡,将存放在"微信-卡包"。</view>
       </view>
-      <view class='auth-shop' wx:else>广东7-Eleven申请获取授权，用于会员服务</view>
+      <view class='auth-shop' wx:else>微商城申请获取授权，用于会员服务</view>
       <button type='primary'  wx:if="{{!isAuthorizationActiveText}}" bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' disabled='{{!checkAll}}'>同意</button>
       <button type='primary'  wx:else class='agree' disabled='{{!checkAll}}' bindtap="handleActiveAgree">同意并领取新会员卡</button>
       <view class='rule-wrap'>

src/custom-tab-bar/index.js

 const app = getApp();
+const utils = require('../utils/util')
+const wxService = require('../utils/wxService')
 
 Component({
   //数据
   data: {
+    currentHeight: 52,
+    currentMarginTop: 25,
+    currentPaddingTop: 5,
     selected: 0,//当前tabBar页面
     color: "#cdcdcd",//未选中tabBar时的文字颜色
     selectedColor: "#22385d",//选中时tabBar文字颜色
@@ -36,6 +41,15 @@ Component({
     ]
   },
   ready() {
+    wxService.getSystemInfo().then(res => {
+      const {statusBarHeight} = res 
+      const {currentHeight,currentMarginTop,currentPaddingTop} = this.data
+        this.setData({
+        currentHeight: currentHeight + statusBarHeight,
+        currentMarginTop: currentMarginTop + (statusBarHeight) / 6,
+        currentPaddingTop: statusBarHeight== 44 ? currentPaddingTop + 5 : currentPaddingTop,
+      })
+    })
     
   },
   methods: {

src/custom-tab-bar/index.wxml

-<cover-view class="tab-bar">
+<cover-view class="tab-bar" style="height:{{currentHeight}}px">
 	<!-- 背景图片 -->
 	<cover-image class='tab-bar-bg' src='/assets/imgs/7_1_0/bg.png' />
 	<!-- 首页 -->
 	<cover-view
 	 class='tab-bar-index'
+	 style="margin-top:{{currentMarginTop}}px"
 	 data-index='0'
 	 data-path='{{list[0].pagePath}}'
 	 bindtap='tab_bar_index'
@@ -21,6 +22,7 @@
 	 data-index='1'
 	 data-path='{{list[1].pagePath}}'
 	 bindtap='tab_bar_index'
+	 style="margin-top:{{currentMarginTop}}px"
 	>
 		<cover-view class='tab-bar-icon'>
 			<cover-image src='{{selected == 1 ? list[1].selectedIconPath : list[1].iconPath}}' class='tab-bar-img' />
@@ -35,12 +37,13 @@
 			<cover-view style='width:100%;height:42rpx;' />
 			<cover-image class='tab-bar-img-add' src='{{addImgPath}}' />
 		</cover-view>
-		<cover-view class="share-text">分享号</cover-view>
+		<cover-view class="share-text"  style="padding-top:{{currentPaddingTop}}px">分享号</cover-view>
 	</cover-view>
 
 	<!-- 购物车 -->
 	<cover-view
 	 class='tab-bar-index'
+	 style="margin-top:{{currentMarginTop}}px"
 	 data-index='2'
 	 data-path='{{list[2].pagePath}}'
 	 bindtap='tab_bar_index'
@@ -55,6 +58,7 @@
 	<!-- 我的 -->
 	<cover-view
 	 class='tab-bar-index'
+	 style="margin-top:{{currentMarginTop}}px"
 	 data-index='3'
 	 data-path='{{list[3].pagePath}}'
 	 bindtap='tab_bar_index'

src/custom-tab-bar/index.wxss

@@ -6,13 +6,14 @@
   flex-direction: row;
   position: fixed;
   bottom: 0;
+  background-color: #fff;
 }
 /* 背景图片 */
 .tab-bar-bg{
   display: flex;
   position: absolute;
   width: 100%;
-  height: 100%;
+  height: 80%;
   z-index: -1;
 }
 /* 背景一条线 */
@@ -30,7 +31,7 @@
   flex: 1;
   font-size: 30rpx;
   height: 50px;
-  margin-top: 50rpx;
+  margin-top: 25px;
   z-index: 1;
   box-sizing: border-box;
 }
@@ -38,7 +39,7 @@
 .tab-bar-index-add{
   font-size: 30rpx;
   z-index: 1;
-  height: 70px;
+  height: 150rpx;
   text-align: center;
 }
 /* 图标字体结合内容快 */
@@ -52,7 +53,7 @@
 /* 图标字体结合内容快添加发布单独设置 */
 .tab-bar-icon_add{
   width: 100%;
-  height: 50px;
+  height: 66%;
   display: flex;
   flex-direction: column;
 }
@@ -62,10 +63,10 @@
   height: 37rpx;
   margin: 0 auto;
 }
-/* 内容快添加发布单独图片设置 */
+/* 内容块添加发布单独图片设置 */
 .tab-bar-img-add{
-  width: 74rpx;
-  height: 74rpx;
+  width: 80rpx;
+  height: 80rpx;
   margin: 0 auto;
 }
 /* 内容快挤位置 */

src/project.config.json

@@ -14,7 +14,7 @@
 	"compileType": "miniprogram",
 	"libVersion": "2.6.6",
 	"appid": "wx700028bf32a3be66",
-	"projectname": "7-Eleven",
+	"projectname": "微商城",
 	"debugOptions": {
 		"hidedInDevtools": []
 	},

src/utils/util.js

@@ -116,21 +116,6 @@ function aspectRatio(h,w) {
 }
 
 /** 
- * 全面屏
-*/
-// function checkFullSucreen () {
-//   const self = this
-//   wxService.getSystemInfo().then(res => {
-//     debugger
-//     if ((res.screenHeight - res.windowHeight - res.statusBarHeight - 32) > 72) {
-// 　　　　　//  处理相关逻辑
-//         self.globalData.isFullSucreen = true
-//        // setGlobalData('fullScreen', true)
-//     }
-//   })
-// }
-
-/** 
  * 解析 url 参数
 */
 function parseUrl(query){
@@ -320,5 +305,4 @@ module.exports = {
   aspectRatio,
   imageUtil,
   validateEmail
-  // checkFullSucreen
 }