...

apis/request.js

@@ -3,8 +3,8 @@ import {errInfo} from './err'
 import {updToken} from './updateToken'
 
 // 请求方式配置
-const api 	 	 = "https://new-web-test.cnskl.com/api/"
+// const api 	 	 = "https://new-web-test.cnskl.com/api/"
-// const api 	 = "https://mi-org.cnskl.com/api/"
+const api 	 = "https://mi-org.cnskl.com/api/"
 const header = {
 	"Accept"	: "application/json"
 }

app.wxss

@@ -10,8 +10,8 @@ page{
     font-size: 30rpx;
 }
 
-.tabBar{
+.tabBarContent{
-    margin-bottom: calc(48px + env(safe-area-inset-bottom));
+    border-bottom: solid calc(48px + env(safe-area-inset-bottom)) transparent;
 }
 
 /*

components/storeTabBar/storeTabBar.js

@@ -22,7 +22,7 @@ Component({
     data: {
         selected        : 0,
         color           : "#4e4f51",
-        selectedColor   : "#0b0041",
+        selectedColor   : "#2b6bf6",
         list            : []
     },
 

components/storeTabBar/storeTabBar.wxss

@@ -6,6 +6,7 @@
  */
 
  .tab-bar {
+    z-index: 999999;
     position: fixed;
     bottom: 0;
     left: 0;

pages/config/config.js

@@ -14,12 +14,12 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(e) {
-        if (e.companyoid && e.companyoid == "") {
+        // if (e.companyoid && e.companyoid == "") {
-            wx.showToast({
+        //     wx.showToast({
-                title: "参数错误，缺少companyoId"
+        //         title: "参数错误，缺少companyoId"
-            })
+        //     })
-            return
+        //     return
-        }
+        // }
         wx.getStorage({
             key     : 'compayId',
             success : res=>{
@@ -40,18 +40,12 @@ Page({
                             case "ticket":
                                 newTabBar.push(ticket)
                                 break;
-                            default :
-                                newTabBar.push(user)
-                                break;
                         }
                     })
-
+                    getApp().globalData.storeTabBarConfig = newTabBar.concat([user])
-                    if(tabBarVal.length == newTabBar.length){
+                    wx.redirectTo({
-                        getApp().globalData.storeTabBarConfig = newTabBar
+                        url: newTabBar[0].pagePath,
-                        wx.redirectTo({
+                    })
-                            url: newTabBar[0].pagePath,
-                        })
-                    }
                 }).catch(()=>{
                     this.setData({
                         loding: false

pages/mall/index.json

@@ -8,5 +8,6 @@
 	},
 	"navigationBarTitleText": "商城",
 	"enablePullDownRefresh" : true,
-	"navigationBarBackgroundColor": "#ea4e2f"
+	"navigationBarTextStyle": "white",
+	"navigationBarBackgroundColor": "#2d6bf6"
 }

pages/mall/index.wxml

@@ -1,43 +1,44 @@
 <!-- 企获客商城 -->
 <view class="mallBox">
     <view class="mallCont">
-        <!-- 搜索 -->
+        <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 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>
+                搜索商品
+            </navigator>
 
-        <!-- 轮播图 -->
+            <!-- 轮播图 -->
-        <view class="banner">
+            <view class="banner">
-            <swiper class="banner-swiper" indicator-dots autoplay circular interval="3500" indicator-color="#ebebeb"
+                <swiper class="banner-swiper" indicator-dots autoplay circular interval="3500" indicator-color="#ebebeb"
-                indicator-active-color="#fff">
+                    indicator-active-color="#fff">
-                <swiper-item wx:for="{{banners}}" wx:key="banners">
+                    <swiper-item wx:for="{{banners}}" wx:key="banners">
-                    <image class="banner-img" src="{{item.cover}}" mode="aspectFill"></image>
+                        <image class="banner-img" src="{{item.cover}}" mode="aspectFill"></image>
-                </swiper-item>
+                    </swiper-item>
-            </swiper>
+                </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>

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;

pages/ticket/index.js

@@ -41,8 +41,8 @@ Page({
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow: function () {
+    onShow() {
-
+        wx.hideHomeButton()
         this.couponInfo();
     },
     couponInfo() {

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"
@@ -87,3 +87,5 @@
         </view>
     </view>
 </view>
+
+<storeTabBar pages-url="pages/ticket/index"></storeTabBar>

pages/ticket/index.wxss

@@ -3,8 +3,12 @@
  * 企获客商城
  */
 
+page{
+    background: white;
+}
+
  .coupon {
-    margin: 0 20rpx;
+    padding: 0 30rpx;
 }
 
 /* 轮播图 */

pages/user/index.wxml

@@ -20,6 +20,7 @@
         </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">
@@ -61,7 +62,7 @@
         <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 wx:if='{{info.cart_counts>0}}' class="userTool-label-tips">{{ info.cart_counts}}</view>
+                <view class="userTool-label-tips">2</view>
             </view>
             <text>我的购物车</text>
         </navigator>
@@ -85,13 +86,13 @@
             </view>
             <text>项目关注</text>
         </navigator>
-        <navigator hover-class="none" url="/pages/user/companyMine/myBlockchain/myBlockchain?name={{info.user.nickname}}" class="userTool-label">
+        <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">
+        <navigator class="userTool-label" hover-class="none" open-type="reLaunch" url="/pages/company/index">
             <view class="userTool-label-img">
                 <image src="/static/user_iocn/userTool_08.png"></image>
             </view>
@@ -105,5 +106,4 @@
         </navigator>
     </view>
 </view>
-
 <storeTabBar pages-url="pages/user/index"></storeTabBar>