diff --git a/app.js b/app.js
index 0df5ad2..4437718 100644
--- a/app.js
+++ b/app.js
@@ -5,66 +5,111 @@ var api = require("./api/api.js")
 
 //公共方法和变量
 App({
-  editTabBar: function () {
+  editTabBar: function (taht,stoid,url) {
+    var that=this;
+    var th = taht
     //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
-
-    var curPageArr = getCurrentPages(); //获取加载的页面
-    var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
+    var custum_data=this.globalData.custum_data;
+    var isIpx=this.globalData.isIpx;
+    //var curPageArr = getCurrentPages(); //获取加载的页面
+    //var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
+    var curPage=th;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
-      pagePath = '/' + pagePath;
+          pagePath = '/' + pagePath;
     }
-    console.log("获取加载的页面:="+curPageArr)
-    console.log("获取当前页面的对象:="+curPage)
-    console.log("当前页面url:="+pagePath)
-    var tabBar = this.globalData.tabBar;
-    for (var i = 0; i < tabBar.list.length; i++) {
-      tabBar.list[i].active = false;
-      if (tabBar.list[i].weappurl == pagePath) {
-        tabBar.list[i].active = true; //根据页面地址设置当前页面状态    
-      }
+    if(isIpx){
+         if(custum_data){
+             that.set_custom_nav(custum_data,isIpx,pagePath,url,curPage);
+         }else{
+             var tabBar = {
+                 'iscustom':2,
+                 'url':url,
+                 'active':pagePath,
+                 'isIpx':isIpx,
+                 cartGoodsNum:this.globalData.cartGoodsNum
+             }
+             curPage.setData({
+                 tabBar:tabBar,
+                 isIpx:isIpx,
+                 cartGoodsNum:this.globalData.cartGoodsNum
+             })
+         }
+
+    }else{
+        var isIpx = false;
+        wx.getSystemInfo({
+            success: (res) => {
+                // console.log(res)
+                let modelmes = res.model; //手机品牌
+                if (modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
+                    isIpx = true
+                }
+                //缓存住，下次就不调用接口了
+                that.globalData.isIpx=isIpx;
+                getApp().request.promiseGet("/api/weshop/storeFooter/get/"+stoid, {
+                }).then(res => {
+                    var e = res;
+                    if(e.data.code != -1){
+                        that.globalData.custum_data=e.data.data;
+                        that.set_custom_nav(e.data.data,isIpx,pagePath,url,curPage);
+                    }else{
+                        var tabBar = {
+                            'iscustom':2,
+                            'url':url,
+                            'active':pagePath,
+                            'isIpx':isIpx,
+                            cartGoodsNum:this.globalData.cartGoodsNum
+                        }
+                        curPage.setData({
+                            tabBar:tabBar,
+                            isIpx:isIpx,
+                            cartGoodsNum:this.globalData.cartGoodsNum
+                        })
+                    }
+
+                })
+            },
+        })
     }
-    curPage.setData({
-      tabBar: tabBar
-    });
   },
+  set_custom_nav(data,isIpx,pagePath,url,curPage){
+      //缓存住，下次就不调用接口了
+      var itemList = data.data;
+      itemList = JSON.parse(itemList)
+      //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
+      for (var i = 0; i < itemList.length; i++) {
+          itemList[i].active = false;
+          if (itemList[i].weappurl == pagePath) {
+              itemList[i].active = true; //根据页面地址设置当前页面状态
+          }
+      }
 
+      //如果当服务端返回的值有数据就渲染数据到页面
+      var tabBar = {
+          'iscustom':1,
+          'url':url,
+          'active':pagePath,
+          'list':itemList,
+          'backgroundColor': data.bkcolor,
+          'selectedColor' : data.fontcolor_sele,
+          'color':data.fontcolor,
+          'length':itemList.length,
+          'isIpx':isIpx,
+          cartGoodsNum:this.globalData.cartGoodsNum
+      }
+      curPage.setData({
+          tabBar:tabBar,
+          isIpx:isIpx,
+          cartGoodsNum:this.globalData.cartGoodsNum
+      })
+  },
+    
   globalData: {
-    tabBar: {
-      "color": "#6e6d6b",//文字未选择color
-      "selectedColor": "#f23030",//文字被选择后color
-      "borderStyle": "white",//
-      "backgroundColor": "#ffffff",//背景color
-      "iscustom":'',
-      "url":"",
-      "list": [
-        {
-          "weappurl": "/pages/index/index/index",
-          "nav_name": "首页",
-          "src": "/miniapp/images/bar/index.png",
-          "src_sele": "/miniapp/images/bar/index_on.png"
-        },
-        {
-          "weappurl": "/pages/goods/categoryList/categoryList",
-          "nav_name": "分类",
-          "src": "/miniapp/images/bar/fl.png",
-          "src_sele": "/miniapp/images/bar/fl_on.png"
-        },
-        {
-          "weappurl": "/pages/cart/cart/cart",
-          "nav_name": "购物车",
-          "src": "/miniapp/images/bar/car.png",
-          "src_sele": "/miniapp/images/bar/car_on.png"
-        },
-        {
-          "weappurl": "/pages/user/index/index",
-          "nav_name": "我的",
-          "src": "/miniapp/images/bar/user.png",
-          "src_sele": "/miniapp/images/bar/user_on.png"
-        }
-      ]
-    },
-      isTabBar:false,
+     cartGoodsNum:0,       //购物车总数量
+      isTabBar :false,
+      isIpx: false,   //适配IPhoneX
+      url:"",
       setting: t,
       wechatUser: null,
       userInfo: null,
@@ -86,17 +131,23 @@ App({
       to_group:null,      //参团传递的数据
       wxapp_buy_obj:null, //微信小程序购买的Object
       pk_store:null,      //选择的门店
+      first_leader:null,  //分享会员ID
+      guide_id:null,      //分享导购ID
+
+      windowWidth:0,  //整个窗体的宽度
   },
     auth: o,
     request: a,
     onLaunch: function() {
         this.initExt();
         var t = this.globalData.setting;
+        //console.log(t)
         t.resourceUrl = t.url + "/template/mobile/rainbow";
         var clientWidth = wx.getSystemInfoSync().windowWidth;
         var rpxR = 750 / clientWidth;
         var calc = wx.getSystemInfoSync().windowHeight * rpxR;
         this.globalData.heigth=calc;
+        this.globalData.windowWidth=clientWidth;
 
         var app=this;
         if(!app.globalData.userInfo){
@@ -106,6 +157,44 @@ App({
                app.globalData.user_id= app.globalData.userInfo.user_id;
             }
         }
+
+        wx.getSystemInfo({
+          success: (res) => {
+            // console.log(res)
+            let modelmes = res.model; //手机品牌
+            console.log('手机品牌', modelmes)
+            if (modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
+              this.globalData.isIpx = true
+            }
+          },
+        })
+        console.log(t.stoid,this.globalData.user_id)
+        var tha = this
+        wx.request({
+          url: t.url+'/api/weshop/cart/page',
+          data: {
+              store_id:t.stoid,
+              user_id:tha.globalData.user_id,
+              state:0,
+              is_gift:0
+            },
+          methods:'GET',
+          header: {
+              'content-type': 'json'
+          },
+          success: function(e){
+           
+            var num = 0;
+                  for (var i = 0; i < e.data.data.pageData.length; i++) {
+                    num += e.data.data.pageData[i].goods_num;
+                  }
+                  console.log("购物车数量：=",num)
+                  tha.globalData.cartGoodsNum=num
+          },
+          fail: function(){}
+      })
+        
+
     },
 
     //---初始化第三方----
@@ -294,7 +383,6 @@ App({
 
     //同步化，在调用的时候要await
    async get_isbuy() {
-
       var th=this;
       await api.check_isbuy({ store_id: t.stoid, type: 5 }).then(res=>{
          var o=res;
@@ -333,6 +421,7 @@ App({
 
     //----智能跳转，判断 非tabBar,tabBar页面的跳转----
     goto:function (url) {
+
         var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList",
                        "/pages/goods/categoryList/categoryList?type=2",
                        "/pages/goods/categoryList/categoryList?type=1",
@@ -340,10 +429,12 @@ App({
         if(arr_tabbar.indexOf(url)!=-1){
              if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
              if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
-             wx.switchTab({ url: url, })  //跳到tabbar页
+             wx.navigateTo({ url: url, })  //跳到tabbar页
+
         }else{
             wx.navigateTo({ url: url, })  //跳到非tabbar页
         }
+        //wx.navigateTo({ url: url, })  //跳到非tabbar页
     },
 
     //显示提示，word提示内容，type 0失败，提示   1成功
@@ -473,7 +564,14 @@ App({
                 }
 			},1000);
 		}
-	}
+	},
+
+    //清空登录时候缓存的值
+    onHide:function () {
+        this.globalData.is_test=0;
+        this.globalData.guide_id=null;                 //导购清空
+        this.globalData.first_leader=null;             //分享的会员清空
+    }
 	
 
 });
diff --git a/app.json b/app.json
index 80c7662..83e2937 100644
--- a/app.json
+++ b/app.json
@@ -117,38 +117,6 @@
     "backgroundColor": "#ffffff",
     "enablePullDownRefresh": true
   },
-  "tabBar": {
-    "color": "#6e6d6b",
-    "selectedColor": "#f23030",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index/index",
-        "text": "首页",
-        "iconPath": "packageA/images/bar/index.png",
-        "selectedIconPath": "packageA/images/bar/index_on.png"
-      },
-      {
-        "pagePath": "pages/goods/categoryList/categoryList",
-        "text": "分类",
-        "iconPath": "packageA/images/bar/fl.png",
-        "selectedIconPath": "packageA/images/bar/fl_on.png"
-      },
-      {
-        "pagePath": "pages/cart/cart/cart",
-        "text": "购物车",
-        "iconPath": "packageA/images/bar/car.png",
-        "selectedIconPath": "packageA/images/bar/car_on.png"
-      },
-      {
-        "pagePath": "pages/user/index/index",
-        "text": "我的",
-        "iconPath": "packageA/images/bar/user.png",
-        "selectedIconPath": "packageA/images/bar/user_on.png"
-      }
-    ]
-  },
   "debug": false,
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/components/diy_advertising/diy_advertising.js b/components/diy_advertising/diy_advertising.js
index a2f3aa1..6f66ec4 100644
--- a/components/diy_advertising/diy_advertising.js
+++ b/components/diy_advertising/diy_advertising.js
@@ -16,9 +16,10 @@ Component({
     interval:3000,
     duration:1000,
     someData: {},
-    max_sw_height:null,
+    max_sw_height:getApp().globalData.windowWidth,
   },
   methods: {
+
     customMethod: function () { },
     //---智能跳转---
     go_url:function(e){
diff --git a/components/diy_advertising/diy_advertising.wxml b/components/diy_advertising/diy_advertising.wxml
index 08f65c4..fe1a1ae 100644
--- a/components/diy_advertising/diy_advertising.wxml
+++ b/components/diy_advertising/diy_advertising.wxml
@@ -1,9 +1,9 @@
 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!--上下两块-->
 <block wx:if='{{object.style==0}}'>
-<view class="zwp_s1">
+<view class="zwp_s1" style="background-color: {{object.bg_color?object.bg_color:'none'}}">
   <block wx:for="{{object.data}}" wx:key="{{index}}">
-    <view class='s1'>
+    <view class='s1' style="padding: 0 {{object.two_side}}px">
       <view class='s1_gk'>
         <block wx:if="{{item.src==''}}">
           <text>建议宽度640</text>
@@ -80,19 +80,31 @@
 </view>
 <view class="clear"></view>
 <!--2行三列-->
-<view class='s4' wx:if='{{object.style==3}}'>
+<view class='s4' wx:if='{{object.style==3}}'
+      style="padding:0 {{object.two_side}}px;display: flex; background-color:{{object.bg_color?object.bg_color:'none'}}">
 
   <block wx:for="{{object.data}}" wx:key="{{index}}">
 
-    <view class='s4_gk'>
+    <view class='s4_gk' wx:if="{{index==0}}" style="width:{{(max_sw_height-2*object.two_side-2*object.jian_ge)/3}}px">
       <block wx:if="{{item.src==''}}">
         <text>200*200</text>
       </block>
       <block wx:if="{{item.src!=''}}">
-        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" ></image></navigator>
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" ></image></view>
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" ></image></navigator>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix"></image></view>
       </block>
     </view>
+
+    <view class='s4_gk' wx:else style="margin-left:{{object.jian_ge}}px; width:{{(max_sw_height-2*object.two_side-2*object.jian_ge)/3}}px">
+      <block wx:if="{{item.src==''}}">
+        <text>200*200</text>
+      </block>
+      <block wx:if="{{item.src!=''}}">
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix"></image></navigator>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}"  mode="widthFix"></image></view>
+      </block>
+    </view>
+
   </block>
 </view>
 <view class="clear"></view>
@@ -137,10 +149,10 @@
         <text>300*150</text>
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
-        <navigator url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
+        <navigator url="{{object.data[2].wxapp_imgurl}}"  class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
           <image src="{{object.data[2].src}}"></image>
         </navigator>
-        <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url" wx:else>
+        <view data-url="{{object.data[2].wxapp_imgurl}}"  class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[2].src}}"></image>
         </view>
 
@@ -388,9 +400,14 @@
 <!--幻灯片-->
 <block wx:if='{{object.style==4}}'>
 
-  <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" >
+
+  <swiper class="swiper"  autoplay="{{autoplay}}" current="{{object.sw_index}}"
+          indicator-dots="true"
+          indicator-color="{{object.dot_color}}"
+          indicator-active-color="{{object.dot_color_act}}"
+          interval="{{object.swiper_time?object.swiper_time*1000:interval}}" duration="{{duration}}"
+          style="height:{{max_sw_height}}rpx" >
     <block wx:for="{{object.data}}" wx:for-index="index" >
-   
 
         <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
           <swiper-item><image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" /></swiper-item>
@@ -400,10 +417,10 @@
           <swiper-item><image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" /></swiper-item>
         </view>
 
-
-      
-      
     </block>
   </swiper>
 
+
+
+
 </block>
diff --git a/components/diy_advertising/diy_advertising.wxss b/components/diy_advertising/diy_advertising.wxss
index 60f24cc..72e1551 100644
--- a/components/diy_advertising/diy_advertising.wxss
+++ b/components/diy_advertising/diy_advertising.wxss
@@ -17,7 +17,6 @@
 }
 
 .s1 {
-  width: 100%;
   display: flex;
 }
 
@@ -152,14 +151,10 @@
 
 .s4_gk {
   /* background-color: rgb(129, 213, 249); */
-  width: 32%;
   color: #fff;
   font-size: 32rpx;
-  height: 240rpx;
   text-align: center;
-  margin-left: 1%;
   float: left;
-  margin-bottom: 8rpx;
 }
 
 .s4_gk1 {
@@ -331,8 +326,8 @@
   width: 100%;
   margin: 0;
 }
-
-
-.zwp_s1{
-  margin-bottom: 8rpx;
-}
\ No newline at end of file
+.sw_con{
+    position: relative;
+}
+.clicle{ width: 20rpx; height: 20rpx}
+.dots{ position: absolute; bottom: 10rpx; width: 100%; display: flex; justify-content: center}
diff --git a/packageA/images/share/ct_num.png b/images/share/ct_num.png
index c6e1ac3..c6e1ac3 100644
--- a/packageA/images/share/ct_num.png
+++ b/images/share/ct_num.png
diff --git a/packageA/images/share/default_g_img.gif b/images/share/default_g_img.gif
index a5369e2..a5369e2 100644
--- a/packageA/images/share/default_g_img.gif
+++ b/images/share/default_g_img.gif
diff --git a/packageA/images/share/hui_hear_pic.png b/images/share/hui_hear_pic.png
index 91144c7..91144c7 100644
--- a/packageA/images/share/hui_hear_pic.png
+++ b/images/share/hui_hear_pic.png
diff --git a/packageA/images/share/mackground.png b/images/share/mackground.png
index 6bcf62e..6bcf62e 100644
--- a/packageA/images/share/mackground.png
+++ b/images/share/mackground.png
diff --git a/packageA/images/share/miao_share.png b/images/share/miao_share.png
index f788197..f788197 100644
--- a/packageA/images/share/miao_share.png
+++ b/images/share/miao_share.png
diff --git a/packageA/images/share/q_tj.png b/images/share/q_tj.png
index 56136e5..56136e5 100644
--- a/packageA/images/share/q_tj.png
+++ b/images/share/q_tj.png
diff --git a/packageA/images/share/s_gou.png b/images/share/s_gou.png
index 5e4e765..5e4e765 100644
--- a/packageA/images/share/s_gou.png
+++ b/images/share/s_gou.png
diff --git a/packageA/images/share/share_bg.png b/images/share/share_bg.png
index a3177c6..a3177c6 100644
--- a/packageA/images/share/share_bg.png
+++ b/images/share/share_bg.png
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 81a9eea..05f1aae 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -55,11 +55,9 @@ Page({
   },
   onShow: function() {
     var th = this;
-    //th.setData({
-    //  isTabBar:  getApp().globalData.isTabBar,
-    //});
-    
-    t.editTabBar();    //显示自定义的底部导航
+    //调用底部导航
+    t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
+
     this.getCardList();
     if(getApp().globalData.user_id)  getApp().requestCardNum();
     //--获取是否又秒杀活动--
@@ -81,6 +79,12 @@ Page({
 
   },
 
+  onHide(){
+    for(var i = 1; i < 100; i++) {
+      clearInterval(i);
+    }
+  },
+
   //-------------获取购物车列表,要安装门店进行分类订单-----------
   getCardList: function() {
     var th = this;
@@ -1102,7 +1106,7 @@ Page({
   },
   //跳到首页
   goto: function(e) {
-    wx.switchTab({
+    navigateTo({
       url: '/pages/index/index/index',
     })
   },
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 725c2da..8744b68 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -180,10 +180,6 @@
 </view>
 
 
-
-
 <warn id="warn"></warn>
-<!-- <view wx:if="{{isTabBar == true}}">
-  <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
-</view> -->
\ No newline at end of file
+<import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" />
\ No newline at end of file
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 4439f04..2f4dac1 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -31,7 +31,7 @@ page {
   align-items: center;
   justify-content: center;
   background-color: rgb(255, 255, 255);
-  margin-bottom: 99rpx;
+  margin-bottom: 160rpx;
 }
 
 radio {
@@ -143,7 +143,7 @@ radio {
   height: 100rpx;
   position: fixed;
   left: 0;
-  bottom: 0;
+  bottom: 45px;
   font-size: 28rpx;
   color: #666;
   background-color: rgb(255, 255, 255);
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4f5b5f6..51abda5 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -142,7 +142,7 @@ Page({
     var th=this;
     if (th.data.isclose==0){
 
-      wx.switchTab({
+      wx.navigateTo({
         url: "/pages/index/index/index"
       })
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 7a5c415..7d85168 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -217,7 +217,7 @@ Page({
     onShow: function() {
        var th=this;
        if (th.data.isclose==0){
-         wx.switchTab({
+         wx.navigateTo({
            url: "/pages/index/index/index"
          })
        }else{
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 31e5b8a..0bd9bda 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -62,7 +62,7 @@ Page({
   onShow: function() {
     var th = this;
     if (th.data.isclose == 0) {
-      wx.switchTab({
+      wx.navigateTo({
         url: "/pages/index/index/index"
       })
     }
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 997e781..fcd1c55 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -47,13 +47,14 @@ Page({
       is_pl_time:0,
       requestData:null, //风格三的商品数据列表 分页
       stylePage:1, //商品列表分页标识
+
       //风格三使用
       url: t.globalData.setting.imghost,
       currentPage: 1,
       requestData: null,
       allData: null,
       openFilterModal: !1,
-      baseUrl: "api/weshop/goods/page?1=1&orderField=goods_id&orderType=desc&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
+      baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
       requestUrl: "",
       tabname: "goods_id",   //排序的字段
       adname: "desc",        //升降的字段
@@ -152,10 +153,8 @@ Page({
 
     onShow:function(){
       var that=this;
-      that.setData({
-        isTabBar:  getApp().globalData.isTabBar,
-      });
-      t.editTabBar();    //显示自定义的底部导航
+      //调用底部导航
+      t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
       //this.requestFirstCategoris();
       if(getApp().globalData.user_id)  getApp().requestCardNum();
       getApp().getConfig2(function (e) {
@@ -463,9 +462,12 @@ Page({
       success: function (e) {
           var arr=new Array();
           var dda = e.data.data.pageData;
-       s.setData({brand_list:dda});
+          s.setData({brand_list:dda});
           for (var i = 0; i < dda.length; i++) {
-              if(dda[i].logo && dda[i].logo.indexOf("http")<0)  dda[i].logo = oo.imghost+dda[i].logo;
+            //console.log(dda[i].logo)
+              if(dda[i].logo && dda[i].logo.indexOf("http")<0){
+                dda[i].logo = oo.imghost+dda[i].logo;
+              }
               if (arr.length>0){
                 var find = 0;
                 //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
@@ -487,8 +489,15 @@ Page({
           }
           //进行排序
           arr.sort(compare("zm"));
+          for(var i=0;i< arr.length;i++){
+            for(var j=0;j<arr[i].array.length;j++){
+              if(arr[i].array[j].logo == ""){
+                arr[i].array[j].logo= s.data.iurl+"/miniapp/images/no_brand_def.jpg";
+              }
+            }
+          }
           s.setData({ groups: arr });              
-
+          //console.log(s.data.groups)
       }
     });
   },
@@ -507,10 +516,22 @@ Page({
   },
     //图片失败，默认图片
     bind_bnerr_pp: function (e) {
+        var list = this.data.groups
         var _errImg = e.target.dataset.errorimg;
-        var _errObj = {};
-        _errObj[_errImg] = this.data.iurl+"/miniapp/images/no_brand_def.jpg\n";
-        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+        var idx = e.target.dataset.idx;
+        var pix = e.target.dataset.pix;
+        // for(var i=0;i< list.length;i++){
+        //   for(var j=0;j<list[i].array.length;j++){
+        //     if(list[i].array[j].logo == ""){
+        //       list[i].array[j].logo= this.data.iurl+"/miniapp/images/no_brand_def.jpg";
+        //     }
+        //   }
+        // }
+        // this.setData({groups:list})
+        // var _errObj = {};
+        // _errObj[_errImg] = this.data.iurl+"/miniapp/images/no_brand_def.jpg\n";
+        //console.log(this.data.groups)
+       //this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     },
     //商品图片失败，默认图片
   goods_bnerr: function (e) {
@@ -534,15 +555,6 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   
   },
-
-
-   //---图片失败，默认图片---
-     bind_Goodsbnerr: function (e) {
-      var _errImg = e.target.dataset.errorimg;
-      var _errObj = {};
-      _errObj[_errImg] ="/miniapp/images/default_g_img.gif";
-      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
-    },
   // 新的版本分类点击一级分类
  click_classify:function(e){
    clearInterval(this.data.timer);
@@ -619,7 +631,7 @@ Page({
     })
   },
   onUnload: function () {
-    this.destroyActivityTimer();
+    //this.destroyActivityTimer();
   },
 
 
@@ -688,7 +700,7 @@ Page({
   // },
   // 左侧更新
   scrollLower: function (data) {
-    console.log("上拉加载更多", JSON.stringify(data))
+    //console.log("上拉加载更多", JSON.stringify(data))
     var that = this;
     clearInterval(that.data.timer);
     that.setData({
@@ -714,7 +726,7 @@ Page({
           s.setData({
             msgStatus: false,
           });
-          //如果有数据 怕断分页为第一页的时候直接渲染数据
+          //如果有数据 判断分页为第一页的时候直接渲染数据
           if (page > 1) {
             //如果分页不是在第一页 那么就把返回的数据追加到原有数据后面
             var arr = s.data.requestData
@@ -765,46 +777,43 @@ Page({
               countDownNum: countDownNum,
               requestData: []
             });
-            s.setData({
-             timer:setInterval(function () {
-                if (countDownNum == 0) {
-                  clearInterval(s.data.timer);
-                  //关闭定时器之后，可作其他处理   
-                  s.setData({
-                    msgStatus: false,
-                  })
-
-                  //如果没有数据就把分页初始化成第一页
-                  //没有数据根据当前分类id去找到下一个分类id再次传递给服务端请求数据
-                  var dataArray = s.data.one_level_classify
-                  var index = s.data.index
-                  console.log(dataArray[index + 1])
-                  if (dataArray[index + 1] == undefined || dataArray[index + 1] == "undefined"){
-                    console.log("dataArray[index + 1] = undefined")
-                    s.setData({
-                      stylePage: 1,
-                      msgStatus: true,
-                      lastMsg: true
-                    });
-                  }else{
-                    s.setData({
-                      stylePage: 1,
-                      index: index + 1,
-                      select_classify_on: index + 1,
-                      cat_id: dataArray[index + 1]['items']['id'],
-                      classify_name: dataArray[index + 1]['items']['name']
-                    });
-                    s.style(s.data.stylePage, dataArray[index + 1]['items']['id']);
-                  }
-                  
-                }
-                countDownNum--;
+            s.data.timer=setInterval(function () {
+              if (countDownNum == 0) {
+                clearInterval(s.data.timer);
+                //关闭定时器之后，可作其他处理   
                 s.setData({
-                  countDownNum: countDownNum
+                  msgStatus: false,
                 })
-              }, 1000)
 
-            })
+                //如果没有数据就把分页初始化成第一页
+                //没有数据根据当前分类id去找到下一个分类id再次传递给服务端请求数据
+                var dataArray = s.data.one_level_classify
+                var index = s.data.index
+                console.log(dataArray[index + 1])
+                if (dataArray[index + 1] == undefined || dataArray[index + 1] == "undefined"){
+                  console.log("dataArray[index + 1] = undefined")
+                  s.setData({
+                    stylePage: 1,
+                    msgStatus: true,
+                    lastMsg: true
+                  });
+                }else{
+                  s.setData({
+                    stylePage: 1,
+                    index: index + 1,
+                    select_classify_on: index + 1,
+                    cat_id: dataArray[index + 1]['items']['id'],
+                    classify_name: dataArray[index + 1]['items']['name']
+                  });
+                  s.style(s.data.stylePage, dataArray[index + 1]['items']['id']);
+                }
+                
+              }
+              countDownNum--;
+              s.setData({
+                countDownNum: countDownNum
+              })
+            }, 1000)
           }
           
           
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index f2997a4..4f86dc6 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -19,7 +19,7 @@
         </view>
   </view>
   <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
-   <swiper current="{{currentTab}}" duration="300"  bindanimationfinish="swiperTab" style="height:{{abc}}rpx;">
+   <swiper current="{{currentTab}}" duration="300"  bindanimationfinish="swiperTab" style="height:{{abc}}rpx;margin-bottom:120rpx">
       <!--------分类---------->
       <swiper-item >
             <scroll-view scroll-y="true" class="fenlei-list" 
@@ -83,14 +83,14 @@
    <view class="no-data" wx:if="{{!is_date}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">暂无分类</view>
-      <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+      <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
    </view>
   </block>
   <block wx:elif="{{is_do}}">
     <view class="no-data" >
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">商家暂未设置分类</view>
-      <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+      <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
    </view>
   </block>
 </block>
@@ -112,11 +112,12 @@
                     <input bindfocus="goseach" class="search-cont" placeholder="搜索你想要的生活" type="text"></input>
                 </view>
         </view>
+        
           <!-- 分类项目内容 -->
-          <view class="flex project_height" style="margin-left:-10rpx">
+          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx">
                <!-- 分类项目的类型 -->
-               <view class="project_type">
-           <view class="project_type-frame">
+               <view class="project_type" style="background-color:#eee">
+           <view class="project_type-frame" style="margin-bottom:120rpx">
            <view wx:if="{{is_show_gb}}">
               <view  bindtap="click_classify"  class="share_type fs30 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
                <text>国</text><text>家</text>
@@ -184,11 +185,11 @@
         <view class="classify_content-frame flex flex-wrap">
 
          <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
-         <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
+         <view class="brand_img_frame" wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
 
             <view class="brand_img t-c">
-               <image class=" brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
-                <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
+              <image class="brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+              <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
          </view>
 
@@ -260,7 +261,7 @@
         <view class="no-data" >
             <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
             <view class="no-data-title">商家暂未设置分类</view>
-            <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+            <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
         </view>
     </block>
 
@@ -287,8 +288,8 @@
           <!-- 分类项目内容 -->
           <view class="flex project_height" style="margin-left:-10rpx;">
             <!-- 分类项目的类型 -->
-            <view class="project_type" style="height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:120rpx;">
-              <view class="project_type-frame" style="margin-bottom:50px;">
+            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:120rpx;">
+              <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
                   <view  bindtap="click_classify"  class="share_type fs30 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
                     <text>国</text><text>家</text>
@@ -316,7 +317,7 @@
               </view>
             </view>
             <!-- 分类项目的内容 -->
-            <view class="classify_content" style="margin-left:26%;margin-top:60px">
+            <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
         <view class="classify_name fs28 flex-space-between">
@@ -349,10 +350,10 @@
         <view class="classify_content-frame flex flex-wrap">
 
          <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
-         <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
+         <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
 
             <view class="brand_img t-c">
-               <image class=" brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+               <image class=" brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
                 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
          </view>
@@ -365,7 +366,7 @@
         <block  wx:if="{{is_show_pl}}">
           <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
               <view style="width:100%;height:100%;">
-                <view class="classify_name fs28 flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="position:fixed;z-index:999999;top:65px;width:70%;background-color:#ffffff;left:26%;padding:0 10rpx;">
+                <view class="classify_name fs28 flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="position:fixed;z-index:999999;top:130rpx;width:70%;background-color:#ffffff;left:27%;padding:0 10rpx;">
                   <view class="classify_title ellipsis-1">{{classify_name}}</view>
                   <view class="flex select_more" >
                     <view class="red-co fs24" >更多</view>
@@ -382,7 +383,7 @@
                     <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
                       <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
                         <view class="img-wrap">
-                          <image src="{{url+item.original_img}}" binderror="bind_Goodsbnerr" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+                          <image src="{{url+item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
                         </view>
                         <view class="item-cont">
                           <view class="title">{{item.goods_name}}</view>
@@ -465,7 +466,7 @@
                       <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px">
                       <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view><view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view> </view>
                       <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view>
-                      <!-- <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> -->
+                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->
                     </view>
                     
                 </scroll-view>
@@ -482,12 +483,10 @@
         <view class="no-data" >
             <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
             <view class="no-data-title">商家暂未设置分类</view>
-            <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+            <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
         </view>
     </block>
 
 </block>
-<!-- <view wx:if="{{isTabBar == true}}">
   <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
-</view> -->
\ No newline at end of file
+  <template is="tabBar" data="{{tabBar}}" />
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 2a79d0e..3f369be 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -244,15 +244,23 @@ margin: auto;
 margin-top: 35rpx;
 }
 .select_classify{
-  background: #d60021;
-border-radius: 30rpx;
-color: #fff;
+  /* 20200530 update */
+/* background: #d60021; */
+background:white;
+/* border-radius: 30rpx; */
+/* color: #fff; */
+color:black;
 height: 48rpx;
 line-height: 45rpx;
+font-weight:700;
 
 }
 .select_classify.width80{
-  width: 74.5%;
+  /* 20200530updata */
+  /* width: 74.5%; */
+  width: 100%;
+  height: 100rpx;
+  line-height: 100rpx;
 }
  .select_classify.width80.text-indent{
  text-indent: 38rpx;
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7a5c8b6..098e621 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -752,6 +752,9 @@ Page({
   onUnload: function() {},
   onHide: function() {
     this.data.is_timer = 0;
+    for(var i = 1; i < 100; i++) {
+      clearInterval(i);
+    }
   },
   //----------三个选项按钮-----------
   tabClick: function(t) {
@@ -3137,7 +3140,7 @@ Page({
           var vpath = res.path;
           var context = wx.createCanvasContext('share');
           //先画背景
-          var pg_path = "../../../images/share/share_bg.png";
+          var pg_path = "/pacj/images/share/share_bg.png";
           context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
           //--昵称---
           context.setFontSize(24 * unit)
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 095eded..b9784b7 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -824,7 +824,7 @@
       <view>收藏</view>
     </view>
     <view class="shopping-cart cart-ico new_split">
-      <navigator openType="switchTab" url="/pages/cart/cart/cart">
+      <navigator  url="/pages/cart/cart/cart">
         <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
         <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
         <view>购物车</view>
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index ef97e90..2aa4d1c 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -127,7 +127,7 @@
     <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">没有相关的数据</view>
-      <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+      <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
     </view>
   </view>
   <view hidden="{{!openFilterModal}}">
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 0abc014..0666b43 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -110,7 +110,7 @@
   <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
     <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
     <view class="no-data-title">没有相关的数据</view>
-    <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+    <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
   </view>
 </view>
 <view hidden="{{!openFilterModal}}">
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index d25120c..48e0915 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -15,6 +15,7 @@ var regeneratorRuntime = require('../../../utils/runtime.js');
 var api = require('../../../api/api.js');
 var d = getApp().globalData;
 
+
 Page({
   data: {
     url: o.imghost,
@@ -71,13 +72,12 @@ Page({
     new_image: "", //新人有礼弹窗图片
     new_nav: "", //新人页面跳转地址
 	
-	w_holiday_pop:0
+  w_holiday_pop:0,
 
   },
 
   onLoad: function() {
     var th = this;
-    
     //看一下商家是否开通了权益
     //--初始化是否有打勾--
     getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
@@ -92,7 +92,7 @@ Page({
         });
       }
     })
-   
+    
 
   },
   //关闭新用户领取广告
@@ -104,42 +104,14 @@ Page({
   },
 
   async onShow() {
-    var th = this;
-    //获取底部导航
-    // await getApp().request.promiseGet("/api/weshop/storeFooter/get/"+o.stoid, {
-      
-    // }).then(res => {
-    //   var e = res;
-    //   console.log(e)
-    //   if(e.data.code != -1){
-    //     getApp().globalData.isTabBar = true
-    //     //console.log(JSON.parse(e))
-    //     var itemList = e.data.data.data;
-        
-    //     itemList = JSON.parse(itemList)
-    //     for(var i=0; i<itemList.length; i++){
-    //       itemList[i]['active'] = false
-    //     }
-    //     console.log(itemList)
-    //     getApp().globalData.tabBar.backgroundColor = e.data.data.bkcolor
-    //     getApp().globalData.tabBar.selectedColor = e.data.data.fontcolor_sele
-    //     getApp().globalData.tabBar.color = e.data.data.fontcolor
-    //     getApp().globalData.tabBar.list = itemList
-    //     getApp().globalData.tabBar.iscustom = '1'
-    //     getApp().globalData.tabBar.url = "";
-    //     wx.hideTabBar({})
-    //   }else{
-    //     getApp().globalData.isTabBar = true
-    //     getApp().globalData.tabBar.iscustom = '2'
-    //     getApp().globalData.tabBar.url = th.data.url;
-    //   }
-    //   th.setData({
-    //     isTabBar:  getApp().globalData.isTabBar,
-    //   }); 
-    // })
-    // console.log("isTabBar:="+getApp().globalData.isTabBar)
-    // t.editTabBar();    //显示自定义的底部导航
-    
+  
+    var th = this
+  
+    //调用底部导航
+    getApp().globalData.url=th.data.url
+    t.editTabBar(th,o.stoid,th.data.url);
+
+
     if (getApp().globalData.user_id) getApp().requestCardNum();
     await this.init_load();
     //显示的时候要开启计时器
@@ -201,13 +173,16 @@ Page({
       }
     })
   },
-
   //当隐藏的时候就关闭计时器
   onHide: function() {
     this.data.is_timer = 0;
     clearInterval(this.data.pt_timer);
 	clearInterval(this.data.w_holiday_pop);
 	this.data.w_holiday_pop=0;
+    for(var i = 1; i < 100; i++) {
+      clearInterval(i);
+    }
+
   },
 
   //同步初始加载
@@ -229,6 +204,15 @@ Page({
           isTemplate: 1,
           bgcolor_t: temp_data.bkcolor
         });
+
+        //---如果有设定顶部的颜色的时候--
+        if(temp_data.top_color && temp_data.top_color!='null' ){
+          wx.setNavigationBarColor({
+            frontColor: '#ffffff', // 必写项
+            backgroundColor: temp_data.top_color, // 必写项
+          })
+        }
+
       }
     })
 
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 97f187e..2c18783 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -69,7 +69,7 @@
         </navigator>
       </view>
       <view class="venues_item">
-        <navigator openType="switchTab" url="/pages/goods/categoryList/categoryList">
+        <navigator  url="/pages/goods/categoryList/categoryList">
           <image src="{{url}}/miniapp/images/index/fenlei.png"></image>
           <view>全部分类</view>
         </navigator>
@@ -246,7 +246,7 @@
   </view>
 
   <!-- 好物推荐 -->
-  <view class="title" style="margin-bottom:{{isTabBar == true ? '50px' : '0'}}">
+  <view class="title" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}};">
     <!-- 标题 -->
     <view>
       <!-- 中文名标题 -->
@@ -359,9 +359,9 @@
     </view>
   </view>
 </block>
-<!-- <view wx:if="{{isTabBar == true}}"> -->
-  <!-- <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" /> -->
-<!-- </view> -->
+
+  <import src="../../tabbar/tabbar.wxml" />
+  <template is="tabBar" data="{{tabBar}}"/>
+
 
 
diff --git a/pages/tabbar/tabbar.js b/pages/tabbar/tabbar.js
index 2371de0..e69de29 100644
--- a/pages/tabbar/tabbar.js
+++ b/pages/tabbar/tabbar.js
@@ -1,67 +0,0 @@
-// pages/tabbar.js
-var d = getApp().globalData;
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    isTabBar:d.isTabBar
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/tabbar/tabbar.wxml b/pages/tabbar/tabbar.wxml
index b5e6a70..6abe180 100644
--- a/pages/tabbar/tabbar.wxml
+++ b/pages/tabbar/tabbar.wxml
@@ -1,13 +1,122 @@
 <!--pages/tabbar.wxml-->
-
   <template name="tabBar">
-    <view class="tab-bar" style="position:fixed;color: {{tabBar.color}}; background: {{tabBar.backgroundColor}}; {{tabBar.position=='top'? 'top: 0' : 'bottom: 0'}};width:100%;height:50px;z-index:9999999">
+    <!-- 如果是自定义的话 -->
+    <view hidden="{{tabBar.iscustom=='2'}}" class="tab-bar" style="width:100%;height:{{tabBar.isIpx ? '168rpx' : '100rpx'}};position:fixed;color: {{tabBar.color}}; background: {{tabBar.backgroundColor}}; bottom: 0;z-index:9999999;padding:2px 0;">
       <block wx:for="{{tabBar.list}}" wx:key="weappurl">
-        <navigator url="{{item.weappurl}}" bindtap="goto({{item.weappurl}})"  class="tabbar_item {{item.clas}}" style="{{item.active? 'color: '+(item.selectedColor? item.selectedColor : tabBar.selectedColor) : ''}};position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-          <view style="width:50%;height:50%;margin-left:25%;"><image src="{{tabBar.url}}{{item.src_sele}}" wx:if="{{item.active&&item.src_sele}}" class="img" style="width:100%;height:100%"></image>
-          <image src="{{tabBar.url}}{{item.src}}" wx:if="{{!item.active&&item.src}}" class="img" style="width:100%;height:100%"></image></view>
-          <view style="width:100%;height:100%;"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.8rem">{{item.nav_name}}</text></view>
-        </navigator>
+
+       <block wx:if="{{!item.active}}">
+            <navigator url="{{item.weappurl}}" open-type="redirect"  class="tabbar_item {{item.clas}}" style="position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:2px 0;">
+                <view wx:if="{{item.nav_name=='购物车'}}" style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: absolute;z-index: 100;right: 0">
+                    {{tabBar.cartGoodsNum}}
+                </view>
+              <view style="width:35%;height:30px;margin-left:33%;">
+                   <image src="{{item.src}}" wx:if="{{!item.active}}" mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
+              </view>
+              <view style="height:20px;line-height:15px; position: relative; top: -15rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
+            </navigator>
+       </block>
+       <block wx:else>
+           <view  class="tabbar_item {{item.clas}}" style="color: {{item.selectedColor? item.selectedColor :tabBar.selectedColor}};position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:2px 0;">
+               <view wx:if="{{item.nav_name=='购物车'}}" style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: absolute;z-index: 100;right:0">
+                   {{tabBar.cartGoodsNum}}
+               </view>
+               <view style="width:35%;height:30px;margin-left:33%;">
+                   <block wx:if="{{item.active}}">
+                       <image src="{{item.src_sele}}"  mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
+                   </block>
+                   <block wx:else>
+                       <navigator  url="{{item.weappurl}}">
+                           <image src="{{item.src}}" wx:if="{{!item.active}}" mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
+                       </navigator>
+                   </block>
+               </view>
+               <view style="height:20px;line-height:15px; position: relative; top: -15rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
+           </view>
+       </block>
+
       </block>
     </view>
+
+
+   <!-- 如果是默认的话 -->
+    <view hidden="{{tabBar.iscustom=='1'}}" class="tab-bar" style="width:100%;height:{{tabBar.isIpx ? '168rpx' : '100rpx'}};position:fixed;color:#6e6d6b; background:#ffffff; bottom: 0;z-index:9999999;padding:2px 0;">
+    <!-- 1 -->
+    <block wx:if="{{tabBar.active!='/pages/index/index/index'}}">
+        <navigator url="/pages/index/index/index" class="tabbar_item {{item.clas}}" open-type="redirect" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+          <view style="width:30%;height:57rpx;margin-left:35%;">
+               <image src="{{tabBar.url}}/miniapp/images/bar/index.png" class="img" style="width:100%;height:100%"></image>
+          </view>
+          <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">首页</text></view>
+        </navigator>
+    </block>
+    <block wx:else>
+        <view class="tabbar_item {{item.clas}}"  style="color:#f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+            <view style="width:30%;height:57rpx;margin-left:35%;">
+                <image src="{{tabBar.url}}/miniapp/images/bar/index_on.png"  class="img" style="width:100%;height:100%"></image>
+            </view>
+            <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">首页</text></view>
+        </view>
+     </block>
+
+
+    <!-- 2 -->
+    <block wx:if="{{tabBar.active!='/pages/goods/categoryList/categoryList'}}">
+    <navigator  url="/pages/goods/categoryList/categoryList" class="tabbar_item {{tabBar.clas}}" open-type="redirect" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+      <view style="width:30%;height:57rpx;margin-left:35%;">
+          <image src="{{tabBar.url}}/miniapp/images/bar/fl.png"  class="img" style="width:100%;height:100%"></image>
+      </view>
+      <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" wx:if="分类" style="font-size:0.6rem">分类</text></view>
+    </navigator>
+    </block>
+    <block wx:else>
+        <view  class="tabbar_item {{tabBar.clas}}" style="color:#f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+            <view style="width:30%;height:57rpx;margin-left:35%;">
+                 <image src="{{tabBar.url}}/miniapp/images/bar/fl_on.png"  class="img" style="width:100%;height:100%"></image>
+            </view>
+            <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" wx:if="分类" style="font-size:0.6rem">分类</text></view>
+        </view>
+    </block>
+
+
+    <!-- 3 -->
+    <block wx:if="{{tabBar.active!='/pages/cart/cart/cart'}}">
+        <navigator url="/pages/cart/cart/cart" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+          <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: fixed;z-index: 100;left:63%">
+          {{tabBar.cartGoodsNum}}
+          </view><view style="width:30%;height:57rpx;margin-left:35%;">
+              <image src="{{tabBar.url}}/miniapp/images/bar/car.png"  class="img" style="width:100%;height:100%"></image>
+           </view>
+          <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">购物车</text></view>
+        </navigator>
+     </block>
+     <block wx:else>
+          <view class="tabbar_item {{tabBar.clas}}" style="color:  #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+             <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: fixed;z-index: 100;left:63%">
+                    {{tabBar.cartGoodsNum}}
+             </view><view style="width:30%;height:57rpx;margin-left:35%;">
+                    <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png"  class="img" style="width:100%;height:100%"></image>
+            </view>
+            <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">购物车</text></view>
+         </view>
+      </block>
+
+    <!-- 4 -->
+    <block wx:if="{{tabBar.active!='/pages/user/index/index'}}">
+        <navigator url="/pages/user/index/index" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+          <view style="width:30%;height:57rpx;margin-left:35%;">
+               <image src="{{tabBar.url}}/miniapp/images/bar/user.png"  class="img" style="width:100%;height:100%"></image>
+           </view>
+          <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text"  style="font-size:0.6rem">我的</text></view>
+        </navigator>
+    </block>
+    <block wx:else>
+        <view  class="tabbar_item {{tabBar.clas}}" style="color:  #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
+            <view style="width:30%;height:57rpx;margin-left:35%;">
+                 <image src="{{tabBar.url}}/miniapp/images/bar/user_on.png"  class="img" style="width:100%;height:100%"></image>
+            </view>
+            <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text"  style="font-size:0.6rem">我的</text></view>
+        </view>
+    </block>
+
+  </view>
   </template>
diff --git a/pages/tabbar/tabbar.wxss b/pages/tabbar/tabbar.wxss
index 979f504..e69de29 100644
--- a/pages/tabbar/tabbar.wxss
+++ b/pages/tabbar/tabbar.wxss
@@ -1 +0,0 @@
-/* pages/tabbar.wxss */
\ No newline at end of file
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 498853c..c3d2f8f 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -523,7 +523,7 @@ Page({
     if(getCurrentPages()>1)
       wx.navigateBack({delta: 1})
     else
-      wx.switchTab({
+      wx.navigateTo({
         url: "/pages/index/index/index"
       });
   },
diff --git a/pages/template/index.js b/pages/template/index.js
index af3ee7c..28870d2 100644
--- a/pages/template/index.js
+++ b/pages/template/index.js
@@ -51,6 +51,15 @@ Page({
           isTemplate: 1,
           bgcolor_t: temp_data.bkcolor
         });
+
+        //---如果有设定顶部的颜色的时候--
+        if(temp_data.top_color && temp_data.top_color!='null' ){
+          wx.setNavigationBarColor({
+            frontColor: '#ffffff', // 必写项
+            backgroundColor: temp_data.top_color, // 必写项
+          })
+        }
+        
       }
     })
 	
diff --git a/pages/user/binding_info/binding_info.js b/pages/user/binding_info/binding_info.js
index 63d3cb8..7fcf09d 100644
--- a/pages/user/binding_info/binding_info.js
+++ b/pages/user/binding_info/binding_info.js
@@ -139,7 +139,7 @@ Page({
                   "function" == typeof cb && cb(e.globalData.userInfo, e.globalData.wechatUser);  
                    e.showWarning("绑定成功");
                    setTimeout(function(){
-                       wx.switchTab({
+                       wx.navigateTo({
                          url: '/pages/user/index/index',
                        }) 
                     },1000);
diff --git a/pages/user/collect_list/collect_list.js b/pages/user/collect_list/collect_list.js
index 7bf50cf..396deba 100644
--- a/pages/user/collect_list/collect_list.js
+++ b/pages/user/collect_list/collect_list.js
@@ -129,7 +129,7 @@ Page({
 
 
   goto: function(ee) {
-    wx.switchTab({
+    wx.navigateTo({
       url: '/pages/index/index/index',
     })
   },
diff --git a/pages/user/comment/comment.js b/pages/user/comment/comment.js
index 87eadde..051d8fa 100644
--- a/pages/user/comment/comment.js
+++ b/pages/user/comment/comment.js
@@ -150,7 +150,7 @@ Page({
   },
   //跳到首页
   goto: function(ee) {
-    wx.switchTab({
+    wx.navigateTo({
       url: '/pages/index/index/index',
     })
   },
diff --git a/pages/user/coupon/coupon.wxml b/pages/user/coupon/coupon.wxml
index 1691ae7..b60831a 100644
--- a/pages/user/coupon/coupon.wxml
+++ b/pages/user/coupon/coupon.wxml
@@ -16,7 +16,7 @@
             </view>
             <view class="coupon-body">
                 <view class="line">{{storeName}}</view>
-                <navigator class="use-btn {{typeId!=0?'btn-disable':''}}" openType="switchTab" url="{{typeId==0?'/pages/index/index/index':''}}">{{typeId==1?'已使用':typeId==2?'已过期':'立即使用'}}</navigator>
+                <navigator class="use-btn {{typeId!=0?'btn-disable':''}}"  url="{{typeId==0?'/pages/index/index/index':''}}">{{typeId==1?'已使用':typeId==2?'已过期':'立即使用'}}</navigator>
             </view>
             <view class="use-end">限{{item.deadTimeFommat}}前使用</view>
         </view>
@@ -24,6 +24,6 @@
     <view class="no-data" wx:if="{{!coupons||coupons.length==0}}">
         <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
         <view class="no-data-title">没有找到相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+        <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
     </view>
 </view>
diff --git a/pages/user/deposit/prepaid/msg/msg.js b/pages/user/deposit/prepaid/msg/msg.js
index bad6229..bc9d3ea 100644
--- a/pages/user/deposit/prepaid/msg/msg.js
+++ b/pages/user/deposit/prepaid/msg/msg.js
@@ -69,7 +69,7 @@ Page({
   }, 
   homepage:function(){
    
-    wx.switchTab({
+    wx.navigateTo({
       url: "../../../../index/index/index",
     })
   },
diff --git a/pages/user/get_user_info/get_user_info.wxml b/pages/user/get_user_info/get_user_info.wxml
index 2a30a3e..ffbf8ab 100644
--- a/pages/user/get_user_info/get_user_info.wxml
+++ b/pages/user/get_user_info/get_user_info.wxml
@@ -2,5 +2,5 @@
     <image class="cart-image"></image>
     <view class="no-data-title">请先登录, 以便操作更多功能</view>
     <button bindgetuserinfo="bindGetUserinfo" class="getuse_info" openType="getUserInfo">获取用户信息</button>
-    <navigator class="similer" openType="switchTab" url="/pages/index/index/index">返回首页</navigator>
+    <navigator class="similer"  url="/pages/index/index/index">返回首页</navigator>
 </view>
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 7a5acb4..ca7b64e 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -41,7 +41,6 @@ Page({
     actImg: "",
     is_assistance: 0, //助力活动
     ad_img:"",
-    isshow_vip:0,
   },
   goto_nav: function(e) {
     var th = this;
@@ -79,19 +78,14 @@ Page({
   onShow: function() {
 
     this.is_assistance();
-    this.getPlusCardType();
-  
-
     var stoid = app_d.setting.stoid;
     var s = this,
       th = s,
       need_money = 0,
       cur_g_num = 0;
-      th.setData({
-        isTabBar:  getApp().globalData.isTabBar,
-      });
       
-      app.editTabBar();    //显示自定义的底部导航
+      //调用底部导航
+      getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
     getApp().get_isbuy(th.setappdata);
     if (getApp().globalData.user_id) getApp().requestCardNum();
     /*------会员登录------*/
@@ -329,7 +323,11 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {},
+  onHide: function() {
+    for(var i = 1; i < 100; i++) {
+      clearInterval(i);
+    }
+  },
   setappdata: function(t) {
     if (t.isout == 1)
       wx.navigateTo({
@@ -361,7 +359,11 @@ Page({
   //------卡片的显示和关闭--------
   show_tc: function() {
     if (!this.data.userInfo) return false;
-    qrcode('qrcode', this.data.userInfo.mobile, 480, 480, this);
+    //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+    var val= this.data.userInfo.mobile+"|"+ut.formatTime();
+    val=ut.base64_encode(val);
+
+    qrcode('qrcode', val, 480, 480, this);
     this.setData({
       tc_hide: false,
     });
@@ -634,23 +636,9 @@ Page({
 
       }
     })
-  },
-
-  //---  获取卡类列表 ---
-  getPlusCardType: function () {
-    var storid = os.stoid;
-    var th = this;
-    var isshow_vip=0;
-    getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-         if(res.data.code==0){
-             for(var i in res.data.data){
-                var item=res.data.data[i];
-                //IsStopBuy 如果是真的话，代表这个卡没有停用
-                if(item.IsStopBuy!=true){ isshow_vip=1;break; }
-             }
-             th.setData({isshow_vip:isshow_vip})
-         }
-    })
   }
 
+
+
+
 })
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index f0225b2..efec660 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -1,4 +1,4 @@
-<view class="xc-page" style="margin-bottom:{{isTabBar == true ? '50px' : '0'}}">
+<view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
   <view class="xc-user">
     <view class="xc-head rel">
       <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
@@ -63,9 +63,6 @@
       </image>
 
     </view>
-
-    <block wx:if="{{isshow_vip}}">
-
     <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2}}">
       <view class="xc-add-member flex-center-around ">
       <view class="flex jc-center ai-center">
@@ -89,7 +86,6 @@
         </view>
       </view>
 	</view>
-    </block>
 
   </view>
   <view class="xc-after-sale rel">
@@ -301,7 +297,5 @@
 </view>
 
 <pop_txt id="pop_txt"></pop_txt>
-<!-- <view wx:if="{{isTabBar == true}}">
   <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
-</view> -->
\ No newline at end of file
+  <template is="tabBar" data="{{tabBar}}" />
\ No newline at end of file
diff --git a/pages/user/integral/msg/msg.js b/pages/user/integral/msg/msg.js
index dc75d89..9b67c67 100644
--- a/pages/user/integral/msg/msg.js
+++ b/pages/user/integral/msg/msg.js
@@ -68,7 +68,7 @@ Page({
   }, 
   homepage:function(){
    
-    wx.switchTab({
+    wx.navigateTo({
       url: "../../index/index",
     })
   },
diff --git a/pages/user/member/bring/msg/msg.js b/pages/user/member/bring/msg/msg.js
index 6dfb272..10bf1bd 100644
--- a/pages/user/member/bring/msg/msg.js
+++ b/pages/user/member/bring/msg/msg.js
@@ -63,7 +63,7 @@ Page({
   }, 
   homepage:function(){
    
-    wx.switchTab({
+    wx.navigateTo({
       url: "../../../index/index",
     })
   },
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 2802f6e..7cdc06b 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -117,7 +117,7 @@ Page({
   //跳到首页
   goto: function(e) {
     var th = this;
-    wx.switchTab({
+    wx.navigateTo({
       url: '/pages/index/index/index',
     })
   },
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index bf1d6dd..ddcd462 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -501,6 +501,7 @@ Page({
                       if (good.goods_price != gg.shop_price) isok = 0;
 
                   }
+                  var is_h=0;
                   if (!isok) {
                       wx.showModal({
                           title: '提示',
@@ -728,7 +729,7 @@ Page({
   },
   //跳到首页
   goto: function(e) {
-    wx.switchTab({
+    wx.navigateTo({
       url: '/pages/index/index/index',
     })
   },
diff --git a/pages/user/return_goods_list/return_goods_list.wxml b/pages/user/return_goods_list/return_goods_list.wxml
index 9de6122..f690a85 100644
--- a/pages/user/return_goods_list/return_goods_list.wxml
+++ b/pages/user/return_goods_list/return_goods_list.wxml
@@ -24,6 +24,6 @@
     <view class="no-data" wx:if="{{!list||list.length==0}}">
         <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
         <view class="no-data-title">没有找到相关的记录</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+        <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator>
     </view>
 </view>
diff --git a/utils/auth.js b/utils/auth.js
index 0a74309..ca87f8b 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -282,7 +282,7 @@ module.exports = {
         }, null, !0);
     },
     goHome: function() {
-        wx.switchTab({
+        wx.navigateTo({
             url: "/pages/index/index/index"
         });
     },
diff --git a/utils/request.js b/utils/request.js
index c7bd5b6..5eec6d7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -69,9 +69,9 @@ module.exports = {
                     var i = getApp();
                     return i.auth.clearAuth(), i.showWarning("正在重新登录", function() {
                         var t = getCurrentPages();
-                        "pages/user/index/index" != t[t.length - 1].route ? wx.switchTab({
+                        "pages/user/index/index" != t[t.length - 1].route ? wx.navigateTo({
                             url: "/pages/user/index/index"
-                        }) : wx.switchTab({
+                        }) : wx.navigateTo({
                             url: "/pages/index/index/index"
                         });
                     }, null, !0), !1;
diff --git a/utils/util.js b/utils/util.js
index d946b24..38900e8 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -371,7 +371,35 @@ function isContained(aa, bb) {
     return true;
 }
 
-
+//---base64位编码---
+function base64_encode (str) { // 编码，配合encodeURIComponent使用
+    var c1, c2, c3;
+    var base64EncodeChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    var i = 0, len = str.length, strin = '';
+    while (i < len) {
+        c1 = str.charCodeAt(i++) & 0xff;
+        if (i == len) {
+            strin += base64EncodeChars.charAt(c1 >> 2);
+            strin += base64EncodeChars.charAt((c1 & 0x3) << 4);
+            strin += "==";
+            break;
+        }
+        c2 = str.charCodeAt(i++);
+        if (i == len) {
+            strin += base64EncodeChars.charAt(c1 >> 2);
+            strin += base64EncodeChars.charAt(((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4));
+            strin += base64EncodeChars.charAt((c2 & 0xF) << 2);
+            strin += "=";
+            break;
+        }
+        c3 = str.charCodeAt(i++);
+        strin += base64EncodeChars.charAt(c1 >> 2);
+        strin += base64EncodeChars.charAt(((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4));
+        strin += base64EncodeChars.charAt(((c2 & 0xF) << 2) | ((c3 & 0xC0) >> 6));
+        strin += base64EncodeChars.charAt(c3 & 0x3F)
+    }
+    return strin
+}
 
 module.exports = {
     formatTime: function(e, r) {
@@ -477,4 +505,5 @@ module.exports = {
 	draw_circle:draw_circle,//绘制圆，
     mergeArray:mergeArray,    //数组合并
     isContained:isContained,  //是否包含
+    base64_encode:base64_encode  //64位加密
 };