From 6df09b6f82133b6c4ab88a823d20f722584d9052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 30 Dec 2020 17:05:52 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8Dtabbar?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E8=A2=AB=E9=81=AE=E6=8C=A1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                                |   4 +-
 components/storeTabBar/storeTabBar.wxss |   1 +
 pages/mall/index.json                   |   3 +-
 pages/mall/index.wxml                   |  71 ++++-----
 pages/mall/index.wxss                   |   2 +-
 pages/ticket/index.js                   |   4 +-
 pages/ticket/index.wxml                 |   6 +-
 pages/ticket/index.wxss                 |   6 +-
 pages/user/index.wxml                   | 197 ++++++++++++------------
 9 files changed, 152 insertions(+), 142 deletions(-)

diff --git a/app.wxss b/app.wxss
index 44b0430..c2c81cc 100644
--- a/app.wxss
+++ b/app.wxss
@@ -10,8 +10,8 @@ page{
     font-size: 30rpx;
 }
 
-.tabBar{
-    margin-bottom: calc(48px + env(safe-area-inset-bottom));
+.tabBarContent{
+    border-bottom: solid calc(48px + env(safe-area-inset-bottom)) transparent;
 }
 
 /*
diff --git a/components/storeTabBar/storeTabBar.wxss b/components/storeTabBar/storeTabBar.wxss
index 4ffc7f7..51c5325 100644
--- a/components/storeTabBar/storeTabBar.wxss
+++ b/components/storeTabBar/storeTabBar.wxss
@@ -6,6 +6,7 @@
  */
 
  .tab-bar {
+    z-index: 999999;
     position: fixed;
     bottom: 0;
     left: 0;
diff --git a/pages/mall/index.json b/pages/mall/index.json
index c7f1412..cdc080e 100644
--- a/pages/mall/index.json
+++ b/pages/mall/index.json
@@ -8,5 +8,6 @@
 	},
 	"navigationBarTitleText": "商城",
 	"enablePullDownRefresh" : true,
-	"navigationBarBackgroundColor": "#ea4e2f"
+	"navigationBarTextStyle": "white",
+	"navigationBarBackgroundColor": "#2d6bf6"
 }
\ No newline at end of file
diff --git a/pages/mall/index.wxml b/pages/mall/index.wxml
index c7d8a90..a877171 100644
--- a/pages/mall/index.wxml
+++ b/pages/mall/index.wxml
@@ -1,43 +1,44 @@
 <!-- 企获客商城 -->
 <view class="mallBox">
     <view class="mallCont">
-        <!-- 搜索 -->
-        <navigator hover-class="none" url="/pages/mall/mall_search/mall_search" class="mallCont-search">
-            <image class="mallCont-search-icon" src="/static/mall_icon/mall_search.png"></image>
-            搜索商品
-        </navigator>
+        <view class="tabBarContent">
+            <!-- 搜索 -->
+            <navigator hover-class="none" url="/pages/mall/mall_search/mall_search" class="mallCont-search">
+                <image class="mallCont-search-icon" src="/static/mall_icon/mall_search.png"></image>
+                搜索商品
+            </navigator>
 
-        <!-- 轮播图 -->
-        <view class="banner">
-            <swiper class="banner-swiper" indicator-dots autoplay circular interval="3500" indicator-color="#ebebeb"
-                indicator-active-color="#fff">
-                <swiper-item wx:for="{{banners}}" wx:key="banners">
-                    <image class="banner-img" src="{{item.cover}}" mode="aspectFill"></image>
-                </swiper-item>
-            </swiper>
+            <!-- 轮播图 -->
+            <view class="banner">
+                <swiper class="banner-swiper" indicator-dots autoplay circular interval="3500" indicator-color="#ebebeb"
+                    indicator-active-color="#fff">
+                    <swiper-item wx:for="{{banners}}" wx:key="banners">
+                        <image class="banner-img" src="{{item.cover}}" mode="aspectFill"></image>
+                    </swiper-item>
+                </swiper>
+            </view>
+
+            <!-- 商城分类 -->
+            <mallIndex_nav categories="{{categories}}"></mallIndex_nav>
+
+            <!-- 免费券专区 -->
+            <block wx:if="{{freeCoupon.length > 0}}">
+                <mallIndex_coupon freeCoupon="{{freeCoupon}}"></mallIndex_coupon>
+            </block>
+
+            <!-- 优惠热卖 -->
+            <block wx:if="{{hotSale.length > 0}}">
+                <mallIndex_hot hotSale="{{hotSale}}"></mallIndex_hot>
+            </block>
+
+            <!-- 视频专区 -->
+            <mallIndex_video hotSale="{{videoArea}}"></mallIndex_video>
+
+            <!-- 为你推荐 -->
+            <block wx:if="{{pushList.length > 0}}">
+                <mallIndex_list push-list="{{pushList}}" loding-stats="{{lodingStats}}" has-more="{{page.has_more}}"></mallIndex_list>
+            </block>
         </view>
-
-        <!-- 商城分类 -->
-        <mallIndex_nav categories="{{categories}}"></mallIndex_nav>
-
-        <!-- 免费券专区 -->
-        <block wx:if="{{freeCoupon.length > 0}}">
-            <mallIndex_coupon freeCoupon="{{freeCoupon}}"></mallIndex_coupon>
-        </block>
-
-        <!-- 优惠热卖 -->
-        <block wx:if="{{hotSale.length > 0}}">
-            <mallIndex_hot hotSale="{{hotSale}}"></mallIndex_hot>
-        </block>
-
-        <!-- 视频专区 -->
-        <mallIndex_video hotSale="{{videoArea}}"></mallIndex_video>
-
-        <!-- 为你推荐 -->
-        <block wx:if="{{pushList.length > 0}}">
-            <mallIndex_list push-list="{{pushList}}" loding-stats="{{lodingStats}}" has-more="{{page.has_more}}"></mallIndex_list>
-        </block>
     </view>
 </view>
-
 <storeTabBar pages-url="pages/mall/index"></storeTabBar>
diff --git a/pages/mall/index.wxss b/pages/mall/index.wxss
index 3afc832..59a7e71 100644
--- a/pages/mall/index.wxss
+++ b/pages/mall/index.wxss
@@ -16,7 +16,7 @@ page {
 .mallBox::after {
     position: absolute;
     content: '';
-    background-color: #ea4e2f;
+    background-color: #2d6bf6;
     border-radius: 0 0 10% 10%;
     width: 100%;
     height: 38vh;
diff --git a/pages/ticket/index.js b/pages/ticket/index.js
index 020a5a8..4ed48b4 100644
--- a/pages/ticket/index.js
+++ b/pages/ticket/index.js
@@ -41,8 +41,8 @@ Page({
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow: function () {
-
+    onShow() {
+        wx.hideHomeButton()
         this.couponInfo();
     },
     couponInfo() {
diff --git a/pages/ticket/index.wxml b/pages/ticket/index.wxml
index e754f52..0cfb83f 100644
--- a/pages/ticket/index.wxml
+++ b/pages/ticket/index.wxml
@@ -1,5 +1,5 @@
 <!-- 优惠券 -->
-<view class="coupon">
+<view class="coupon tabBarContent">
     <!-- 轮播图 -->
     <view class="banner">
         <swiper class="banner-swiper" indicator-dots autoplay circular interval="3500" indicator-color="#ebebeb"
@@ -86,4 +86,6 @@
 
         </view>
     </view>
-</view>
\ No newline at end of file
+</view>
+
+<storeTabBar pages-url="pages/ticket/index"></storeTabBar>
diff --git a/pages/ticket/index.wxss b/pages/ticket/index.wxss
index cae3d14..760309c 100644
--- a/pages/ticket/index.wxss
+++ b/pages/ticket/index.wxss
@@ -3,8 +3,12 @@
  * 企获客商城
  */
 
+page{
+    background: white;
+}
+
  .coupon {
-    margin: 0 20rpx;
+    padding: 0 30rpx;
 }
 
 /* 轮播图 */
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index afbac32..85bac23 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,109 +1,110 @@
-<!-- 个人中心 -->
-<view class="userTop">
-    <view class="userTop-head">
-        <view class="userTop-name"> 艾米家的傻钢^ <text>游客</text> </view>
-        <image class="userTop-img" src="/static/images/goods_text.png"></image>
-    </view>
-    <view class="userTop-nav">
-        <!-- <view class="userTop-label"> <text>89</text> 钱包 </view> -->
-        <navigator hover-class="none" class="userTop-label" url="/pages/user/companyMine/myTeam/myTeam">
-            <text>128</text> 团队 </navigator>
-        <navigator hover-class="none" class="userTop-label" url="/pages/user/companyMine/focusedCompany/focusedCompany">
-            <text>11259</text> 关注企业 </navigator>
-    </view>
-    <view class="userTop-vip">
-        <view class="userTop-text">
-            <image src="/static/user_iocn/user_crown.png"></image>升级VIP会员 享会员特权
+<view class="tabBarContent">
+    <!-- 个人中心 -->
+    <view class="userTop">
+        <view class="userTop-head">
+            <view class="userTop-name"> 艾米家的傻钢^ <text>游客</text> </view>
+            <image class="userTop-img" src="/static/images/goods_text.png"></image>
         </view>
-        <view class="userTop-btn">
-            <image src="/static/user_iocn/user_vip.png"></image>立即开通
+        <view class="userTop-nav">
+            <!-- <view class="userTop-label"> <text>89</text> 钱包 </view> -->
+            <navigator hover-class="none" class="userTop-label" url="/pages/user/companyMine/myTeam/myTeam">
+                <text>128</text> 团队 </navigator>
+            <navigator hover-class="none" class="userTop-label" url="/pages/user/companyMine/focusedCompany/focusedCompany">
+                <text>11259</text> 关注企业 </navigator>
+        </view>
+        <view class="userTop-vip">
+            <view class="userTop-text">
+                <image src="/static/user_iocn/user_crown.png"></image>升级VIP会员 享会员特权
+            </view>
+            <view class="userTop-btn">
+                <image src="/static/user_iocn/user_vip.png"></image>立即开通
+            </view>
         </view>
     </view>
-</view>
-<view class="userNav">
-    <navigator hover-class="none" url="/pages/user/user_coupon/user_coupon" class="userNav-label">
-        <view class="userNav-label-img">
-            <image src="/static/user_iocn/userNav_00.png"></image>
+    <view class="userNav">
+        <navigator hover-class="none" url="/pages/user/user_coupon/user_coupon" class="userNav-label">
+            <view class="userNav-label-img">
+                <image src="/static/user_iocn/userNav_00.png"></image>
+            </view>
+            <text>我的卡券</text>
+        </navigator>
+        <navigator hover-class="none" url="/pages/mall/mall_order/mall_order" class="userNav-label">
+            <view class="userNav-label-img">
+                <image src="/static/user_iocn/userNav_01.png"></image>
+            </view>
+            <text>我的订单</text>
+        </navigator>
+        <view class="userNav-label">
+            <view class="userNav-label-img">
+                <image src="/static/user_iocn/userNav_02.png"></image>
+            </view>
+            <text>分享海报</text>
         </view>
-        <text>我的卡券</text>
-    </navigator>
-    <navigator hover-class="none" url="/pages/mall/mall_order/mall_order" class="userNav-label">
-        <view class="userNav-label-img">
-            <image src="/static/user_iocn/userNav_01.png"></image>
-        </view>
-        <text>我的订单</text>
-    </navigator>
-    <view class="userNav-label">
-        <view class="userNav-label-img">
-            <image src="/static/user_iocn/userNav_02.png"></image>
-        </view>
-        <text>分享海报</text>
     </view>
-</view>
 
-<view class="userTool">
-    <view class="userTool-title">
-        更多服务
-    </view>
-    <view class="userTool-list">
-        <navigator hover-class="none" url="/pages/user/companyMine/myActives/myActives" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_00.png"></image>
-            </view>
-            <text>活动参与</text>
-        </navigator>
-        <navigator hover-class="none" url="/pages/user/companyMine/companyOrder" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_01.png"></image>
-            </view>
-            <text>项目预购</text>
-        </navigator>
-        <navigator hover-class="none" url="/pages/mall/mall_cart/mall_cart" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_02.png"></image>
-                <view class="userTool-label-tips">2</view>
-            </view>
-            <text>我的购物车</text>
-        </navigator>
-        <view class="userTool-label">
-            <button class="userTool-label-img-button" size="mini" open-type="contact" bindcontact="handleContact"
-                style='border:0;background-color:#fff;width:94rpx;height:94rpx;padding:0;margin:0;margin-bottom:10rpx;'>
-                <image src="/static/user_iocn/userTool_03.png"></image>
-            </button>
-            <view>客服服务</view>
+    <view class="userTool">
+        <view class="userTool-title">
+            更多服务
         </view>
-        <navigator hover-class="none" url="/pages/mall/mall_address/mall_address" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_04.png"></image>
+        <view class="userTool-list">
+            <navigator hover-class="none" url="/pages/user/companyMine/myActives/myActives" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_00.png"></image>
+                </view>
+                <text>活动参与</text>
+            </navigator>
+            <navigator hover-class="none" url="/pages/user/companyMine/companyOrder" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_01.png"></image>
+                </view>
+                <text>项目预购</text>
+            </navigator>
+            <navigator hover-class="none" url="/pages/mall/mall_cart/mall_cart" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_02.png"></image>
+                    <view class="userTool-label-tips">2</view>
+                </view>
+                <text>我的购物车</text>
+            </navigator>
+            <view class="userTool-label">
+                <button class="userTool-label-img-button" size="mini" open-type="contact" bindcontact="handleContact"
+                    style='border:0;background-color:#fff;width:94rpx;height:94rpx;padding:0;margin:0;margin-bottom:10rpx;'>
+                    <image src="/static/user_iocn/userTool_03.png"></image>
+                </button>
+                <view>客服服务</view>
             </view>
-            <text>收货地址</text>
-        </navigator>
-        <navigator hover-class="none" url="/pages/user/companyMine/focusedProject/focusedProject"
-            class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_05.png"></image>
-            </view>
-            <text>项目关注</text>
-        </navigator>
-        <navigator hover-class="none" url="/pages/user/companyMine/myBlockchain/myBlockchain" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_06.png"></image>
-            </view>
-            <text>区块链证书</text>
-        </navigator>
-        <navigator class="userTool-label" hover-class="none" url="/pages/company/index">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_08.png"></image>
-            </view>
-            <text>企获客广场</text>
-        </navigator>
-        <navigator hover-class="none" url="/pages/user/setting/setting" class="userTool-label">
-            <view class="userTool-label-img">
-                <image src="/static/user_iocn/userTool_07.png"></image>
-            </view>
-            <text>设置</text>
-        </navigator>
+            <navigator hover-class="none" url="/pages/mall/mall_address/mall_address" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_04.png"></image>
+                </view>
+                <text>收货地址</text>
+            </navigator>
+            <navigator hover-class="none" url="/pages/user/companyMine/focusedProject/focusedProject"
+                class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_05.png"></image>
+                </view>
+                <text>项目关注</text>
+            </navigator>
+            <navigator hover-class="none" url="/pages/user/companyMine/myBlockchain/myBlockchain" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_06.png"></image>
+                </view>
+                <text>区块链证书</text>
+            </navigator>
+            <navigator class="userTool-label" hover-class="none" url="/pages/company/index">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_08.png"></image>
+                </view>
+                <text>企获客广场</text>
+            </navigator>
+            <navigator hover-class="none" url="/pages/user/setting/setting" class="userTool-label">
+                <view class="userTool-label-img">
+                    <image src="/static/user_iocn/userTool_07.png"></image>
+                </view>
+                <text>设置</text>
+            </navigator>
+        </view>
     </view>
 </view>
-
 <storeTabBar pages-url="pages/user/index"></storeTabBar>
\ No newline at end of file