1. 底部导航的优化，以及显示购物车圆圈数量

2. 分类点击跳转返回 3. 组件点击返回不加载更多的动画效果

1. 底部导航的优化，以及显示购物车圆圈数量
2. 分类点击跳转返回 3. 组件点击返回不加载更多的动画效果
yvan.ni
1 parent 44a03623
Showing 17 changed files with 334 additions and 175 deletions
app.js
app.json
components/diy_goodsGroup/diy_goodsGroup.js
components/goods_list/goods_list.js
custom-tab-bar/index.js
custom-tab-bar/index.json
custom-tab-bar/index.wxml
custom-tab-bar/index.wxss
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsInfo/goodsInfo.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/user/index/index.js
pages/user/index/index.wxml
@@ -5,131 +5,34 @@ var api = require(&quot;./api/api.js&quot;)
 //公共方法和变量
 App({
-  editTabBar: function (taht,stoid,url) {
-    var that=this;
-    var th = taht
-    //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
-    var custum_data=this.globalData.custum_data;
-    var isIpx=this.globalData.isIpx;
-    var is_read=this.globalData.is_read;
-    //var curPageArr = getCurrentPages(); //获取加载的页面
-    //var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
-    var curPage=th;
-    var pagePath = curPage.route; //当前页面url
-    if (pagePath.indexOf('/') != 0) {
-          pagePath = '/' + pagePath;
-    }
-    if(is_read){
-         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 => {
-                    this.globalData.is_read=true;
-                    var e = res;
-                    if(e.data.code != -1){
-                        that.globalData.custum_data=e.data.data;
-
-                        var itemList = that.globalData.custum_data.data;
-                        itemList = JSON.parse(itemList)
-
-                        if(!itemList[0].weappurl){
-                            that.globalData.custum_data=null;
-                            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{
-                            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
-                        })
-                    }
-
-                })
-            },
-        })
-    }
-
-
-  },
-  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
-      })
-  },
+  def_list:[
+			{
+			  "weappurl": "pages/index/index/index",
+			  "nav_name": "首页",
+			  "src": t.imghost+"/miniapp/images/bar/index.png",
+			  "src_sele": t.imghost+"/miniapp/images/bar/index_on.png",
+			},
+			{
+			  "weappurl": "pages/goods/categoryList/categoryList",
+			  "nav_name": "分类",
+			  "src": t.imghost+"/miniapp/images/bar/fl.png",
+			  "src_sele": t.imghost+"/miniapp/images/bar/fl_on.png"
+			},
+			{
+			  "weappurl": "pages/cart/cart/cart",
+			  "nav_name": "购物车",
+			  "src": t.imghost+"/miniapp/images/bar/car.png",
+			  "src_sele": t.imghost+"/miniapp/images/bar/car_on.png"
+			},
+			{
+			  "weappurl": "pages/user/index/index",
+			  "nav_name": "我的",
+			  "src": t.imghost+"/miniapp/images/bar/user.png",
+			  "src_sele": t.imghost+"/miniapp/images/bar/user_on.png"
+			}
+		],		
+	
   globalData: {
      cartGoodsNum:0,       //购物车总数量
       isTabBar :false,
@@ -142,7 +45,7 @@ App({
       config2: null,  //门店配置
       code: null,
       heigth:0,
-      user_id:null,// 3674923,// 4379287,//  null,// 5682068,
+      user_id:6519826,// 3674923,// 4379287,//  null,// 5682068,
       buy_now:null,
       picklist:null,    //门店列表
       wuliuprice: null, //物流价格表
@@ -168,6 +71,7 @@ App({
     auth: o,
     request: a,
     onLaunch: function() {
+		wx.hideTabBar(); 
         this.initExt();
         var t = this.globalData.setting;
         //console.log(t)
@@ -208,7 +112,6 @@ App({
         console.log(t);
         t.appName ? (o.appName = t.appName, o.stoid = t.stoid) : tt=1;
-
     },
     //首页的第一次登录
@@ -433,13 +336,9 @@ App({
                        "/pages/cart/cart/cart","/pages/user/index/index"];
         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;
-            if (getCurrentPages().length > 9) {
-                wx.redirectTo({url: url,})  //跳到tabbar页
-            }else{
-                wx.navigateTo({url: url,})  //跳到tabbar页
-            }
-
+             if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;        
+             wx.switchTab({url: url,})  //跳到tabbar页
+            
         }else{
             if (getCurrentPages().length > 9) {
                 wx.redirectTo({url: url,})  //跳到非tabbar页
@@ -527,6 +426,7 @@ App({
     requestCardNum: function(th) {
         if(!this.globalData.user_id) return false;
         this.request.get("/api/weshop/cart/page", {
+			isShoeLoading:false,
             data: {
                 store_id: this.globalData.setting.stoid,
                 user_id: this.globalData.user_id,
@@ -540,14 +440,13 @@ App({
                         num += e.data.data.pageData[i].goods_num;
                     }
                 }
-
-
+                getApp().globalData.cartGoodsNum=num;
                 /*---
                 wx.setTabBarBadge({ //tabbar右上角添加文本
                     index: 2, ////tabbar下标
                     text: '' + num //显示的内容
                 });--*/
-                th.setData({['tabBar.cartGoodsNum']:num});
+                th.getTabBar().setData({cartGoodsNum:num});
             }
         });
     },
@@ -606,7 +505,39 @@ App({
                 str = str.replace(reg, '');
             }
             return str;
-    }
+    },
+	
+	getPageIndex:function(curPage){
+	
+		var pagePath = curPage.route; //当前页面url
+		if (pagePath.indexOf('/') != 0) {
+		      pagePath = '/' + pagePath;
+		}
+		
+		var index=0;
+		
+		if(this.globalData.custum_data){
+			var itemList = this.globalData.custum_data.data;
+			itemList = JSON.parse(itemList);
+			for(var i in itemList){
+				var item=itemList[i]
+				if(pagePath.indexOf(item.weappurl)!=-1){
+					index=i;break;
+				}
+			}		
+			
+		}else{
+			var itemList=this.def_list;
+			for(var i in itemList){
+				var item=itemList[i]
+				if(pagePath.indexOf(item.weappurl)!=-1){
+					index=i;break;
+				}
+			}		
+		}		
+		return index;
+			
+	}
 });
@@ -107,7 +107,6 @@
       ]
   }],
- 
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
@@ -121,6 +120,48 @@
     "backgroundColor": "#ffffff",
     "enablePullDownRefresh": true
   },
+  
+  "tabBar": {
+	  "custom":true,
+      "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"
+  "sitemapLocation": "sitemap.json",
+  "usingComponents": {
+	  "customtabbar":"custom-tab-bar/index"
+  }
+  
+  
+
+ 
 }
 \ No newline at end of file
@@ -319,6 +319,7 @@ Component({
 	card_init: function() {
 	  var th = this,os=getApp().globalData.setting;
 	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+		isShowLoading:false,  
 	    success: function(e) {
 	      getApp().globalData.userInfo = e.data.data;
 	      getApp().getConfig2(function(e) {
@@ -34,6 +34,7 @@ Component({
     init: function () {
       var th = this;
       getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+		isShowLoading:false,  
         success: function (e) {
           getApp().globalData.userInfo = e.data.data;
           getApp().getConfig2(function (e) {
@@ -93,6 +94,7 @@ Component({
     if (that.data.is_no_more == 0) return false;
     var curPage = that.data.curPage;
     getApp().request.get('/api/weshop/goods/page?page', {
+	isShowLoading:false,	
     data: {
     is_mainshow: 1,
     isonsale: 1,
+var app = getApp(), os = app.globalData.setting;
+
+Component({
+	data:{		
+		fontcolor:'#6e6d6b',
+		fontcolor_sele:'#f23030',
+		backgroundColor:'#ffffff',	
+		active:-1,	
+		list:app.def_list,		
+		cartGoodsNum:0,
+	},
+	
+
+	lifetimes: {
+	  attached: function() {	
+		  	  
+	       //购物车显示商品金额
+		   this.setData({cartGoodsNum:getApp().globalData.cartGoodsNum}); 	  
+		   var th=this;
+		   		 	 	  
+		   var is_read=getApp().globalData.is_read;
+		   var custum_data=getApp().globalData.custum_data;		   
+		   if(is_read){
+			    if(custum_data){
+					 this.set_list(custum_data);
+				}								
+		   }else{
+			 var stoid=os.stoid
+			 getApp().request.promiseGet("/api/weshop/storeFooter/get/"+stoid, {
+			 }).then(res => {
+			     getApp().globalData.is_read=true;
+			     var e = res;
+			     if(e.data.code != -1){			       			         
+					 var itemList = e.data.data.data;
+			         itemList = JSON.parse(itemList)			 
+			         //如果是有定义自定义导航的小程序链接
+			         if(itemList[0].weappurl && itemList[0].weappurl!=""){						 
+						 getApp().globalData.custum_data=e.data.data;
+						 var custum_data=e.data.data;	
+						 th.set_list(custum_data);									             
+			         }
+					
+			     }			 
+			    
+			 })  
+		   }		  
+	  },
+  }, 
+  
+
+  methods: {
+		//设置自定义页面的列表
+		set_list:function(data){			
+			var itemList = data.data;
+			itemList = JSON.parse(itemList);			
+			this.setData({
+				list:itemList,
+				backgroundColor: data.bkcolor,
+				fontcolor_sele: data.fontcolor_sele,
+				fontcolor:data.fontcolor,
+			})
+						
+		},
+		
+		nav_goto:function(e){
+			var url=e.currentTarget.dataset.url;
+			if(!url) return false;
+			if(url[0]!='/') url='/'+url;
+			 wx.switchTab({url:url,})					
+		}
+		
+  }
+  
+	
+})
 \ No newline at end of file
+{
+  "component": true
+}
 \ No newline at end of file
+<!-- 如果是自定义的话 -->
+<view  class="main_bar" style=" background: {{backgroundColor}}; font-size: 30rpx;">
+       <block wx:for="{{list}}" wx:for-index="idx">    
+            <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}" 
+			   style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};">
+               <view wx:if="{{item.nav_name=='购物车'}}"  class="cart_num" >{{cartGoodsNum}} </view>
+               <view class="tab_img" style="margin-top: 10rpx;">
+                   <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
+               </view>
+               <view style="height:20px;line-height:15px; margin-top: 10rpx;">
+				  {{item.nav_name}}
+			   </view>
+            </view>
+      </block>
+</view >	
+
+
+
+
+
+
+   
 \ No newline at end of file
+.main_bar{
+	width:100%; border-top: 1rpx solid #ebebeb; position: fixed; bottom: 0; left: 0; z-index: 10000;
+}
+.tabbar_item{
+	position:relative;height:100%;float:left;text-align:center;padding:5px 0;
+}
+.tab_img{display: flex; justify-content: center;align-items: center}
+.nav_imgage{
+	height: 56rpx; width: 56rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%;
+}
+.cart_num{
+	top:0;background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;line-height:40rpx;height: 40rpx;position: absolute;z-index: 100;right:30rpx;
+}
 \ No newline at end of file
@@ -54,14 +54,21 @@ Page({
   },
   onShow: function() {
+	  
+	if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+		 var index=getApp().getPageIndex(this);			 
+	     this.getTabBar().setData({
+	       active: index //数字是当前页面在tabbar的索引
+	     })
+		 
+		 getApp().requestCardNum(this);
+	}  
+	  
     var th = this;
     //调用底部导航
-    t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
+    //t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
     this.getCardList();
-    //--强行等待，让购物车的数量能够正确的线上
-    setTimeout(function () {
-      if(getApp().globalData.user_id)  getApp().requestCardNum(th);
-    },500)
+  
     //--获取是否又秒杀活动--
     getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
@@ -1300,7 +1307,13 @@ Page({
      var prom_id=e.currentTarget.dataset.prom_id;
      var url="/pages/goods/goodsList/goodsList?prom_type=3&prom_id="+prom_id;
      getApp().goto(url);
-  }
-
-
+  },
+  
+   //导航跳转
+   nav_goto:function(e){
+		  var url=e.currentTarget.dataset.url;
+		  if(!url || url=='') return; 
+		  if(url[0]!='/') url='/'+url;
+		  getApp().goto(url);
+    }
 });
 \ No newline at end of file
-<import src="../../tabbar/tabbar.wxml" />
+<!-- <import src="../../tabbar/tabbar.wxml" />
 <template is="tabBar" data="{{tabBar}}" />
-
+ -->
 <!-- 广告图片 -->
 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
   <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
@@ -66,6 +66,8 @@ Page({
     is_show_class:false,//是否添加新样式
     status_show:0,
     currentTab: 0, //预设当前项的值
+	
+	load:0,
   },
@@ -171,15 +173,26 @@ Page({
         }
       });
     },
-
     onShow:function(){
+		
+		 if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+			  var index=getApp().getPageIndex(this);			 
+		      this.getTabBar().setData({
+		        active: index //数字是当前页面在tabbar的索引
+		      });
+			  getApp().requestCardNum(this);
+         }
+		
+			
       var that=this;
       //调用底部导航
-      t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
+      //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
       //this.requestFirstCategoris();
         setTimeout(function () {
-            if (getApp().globalData.user_id) getApp().requestCardNum(that);
+            //if (getApp().globalData.user_id) getApp().requestCardNum(that);
         },500)
+		
+		if(this.data.load) return false;
         getApp().getConfig2(function (e) {
@@ -256,6 +269,8 @@ Page({
         }else if(that.data.is_show_pp && that.data.select_classify_on == 220){
           that.setData({ status_show: 2 });
         }
+		
+		that.data.load=1;
       })
     },
@@ -531,8 +546,11 @@ Page({
                   arr.push(item);
               }
           }
-          //进行排序
-          arr.sort(compare("zm"));
+          //进行排序，只有是默认排序的时候，才按首字母排序
+		  if(parseInt(s.data.is_used_share)==0){
+			    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 == ""){
@@ -981,6 +999,14 @@ Page({
       var ob = { "card_list": new_arr, "name_map": card_name_map };
       func(ob);
     })
-  }
+  },
+  
+  //导航跳转
+  nav_goto:function(e){
+  		  var url=e.currentTarget.dataset.url;
+  		  if(!url || url=='') return; 
+  		  if(url[0]!='/') url='/'+url;
+  		  getApp().goto(url);
+   }
 });
 \ No newline at end of file
-<import src="../../tabbar/tabbar.wxml" />
-<template is="tabBar" data="{{tabBar}}" />
+<!-- <import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" /> -->
 <!-- 风格1 -->
 <block wx:if="{{is_used_share==0}}">
@@ -101,7 +101,7 @@
 <block wx:elif="{{is_used_share == 1}}">
     <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
           <!-- 新版分类头部 -->
-          <view class="xc-search-box flex-center white_b" style="position:fixed;top:0;z-index:99999">
+          <view class="xc-search-box flex-center white_b" style="position:fixed;top:0;z-index:99">
                 <view class="share-height t-c" bindtap="getScancode" >
                 <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
                 <view class="fs24">
@@ -120,7 +120,7 @@
           <!-- 分类项目内容  22 -->
           <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx"  id="two_type">
                <!-- 分类项目的类型 -->
-           <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;">
+           <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;">
            <view class="project_type-frame" style="margin-bottom:120rpx;">
            <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
            <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
@@ -273,7 +273,7 @@
 <block wx:elif="{{is_used_share == 2}}">
     <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
       <!-- 头部 -->
-      <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99999">
+      <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
             <view class="share-height t-c" bindtap="getScancode" >
               <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
               <view class="fs24">
@@ -291,7 +291,7 @@
           <!-- 分类项目内容 -->
           <view class="flex project_height" style="margin-left:-10rpx;">
             <!-- 分类项目的类型 -->
-            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;" id="thress_type3">
+            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;" id="thress_type3">
               <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
                   <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}"  data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
@@ -825,7 +825,7 @@
       <view>收藏</view>
     </view>
     <view class="shopping-cart cart-ico new_split">
-      <navigator  url="/pages/cart/cart/cart">
+      <navigator open-type="switchTab" 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>
@@ -94,8 +94,8 @@ Page({
     })
     //调用底部导航
-    getApp().globalData.url=th.data.url
-    t.editTabBar(th,o.stoid,th.data.url);
+    //getApp().globalData.url=th.data.url
+    //t.editTabBar(th,o.stoid,th.data.url);
     await this.init_load();
     //显示的时候要开启计时器
@@ -171,6 +171,15 @@ Page({
   },
   async onShow() {
+	if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+		 var index=getApp().getPageIndex(this);			 
+	     this.getTabBar().setData({
+	       active: index //数字是当前页面在tabbar的索引
+	     })
+	 
+		 getApp().requestCardNum(this);
+	}  
+	  
     var th = this
   },
   //当隐藏的时候就关闭计时器
@@ -832,6 +841,16 @@ Page({
 	  if(!url || url=='') return; 
 	  if(url[0]!='/') url='/'+url;
 	  getApp().goto(url);
-  }
+  },
+  
+  //导航跳转
+  nav_goto:function(e){
+  		  var url=e.currentTarget.dataset.url;
+  		  if(!url || url=='') return; 
+  		  if(url[0]!='/') url='/'+url;
+  		  getApp().goto(url);
+   }
+  
+
 });
 \ No newline at end of file
-<import src="../../tabbar/tabbar.wxml" />
-<template is="tabBar" data="{{tabBar}}"/>
-
+<!-- <import src="../../tabbar/tabbar.wxml" /> -->
+<!-- <template is="tabBar" data="{{tabBar}}"/> -->
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="container rel" wx:if="{{ishow}}">
@@ -76,6 +76,16 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+	  
+	  
+	if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+				  var index=getApp().getPageIndex(this);			 
+	     this.getTabBar().setData({
+	       active: index //数字是当前页面在tabbar的索引
+	     });
+		 
+		 getApp().requestCardNum(this);
+	}  
     this.is_assistance();
     var stoid = app_d.setting.stoid;
@@ -85,7 +95,6 @@ Page({
       cur_g_num = 0;
     //调用底部导航
-    getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
     getApp().get_isbuy(th.setappdata);
     setTimeout(function () {
         if (getApp().globalData.user_id) getApp().requestCardNum(th);
@@ -638,9 +647,14 @@ Page({
       }
     })
-  }
-
-
-
+  },
+  
+  //导航跳转
+  nav_goto:function(e){
+  		  var url=e.currentTarget.dataset.url;
+  		  if(!url || url=='') return; 
+  		  if(url[0]!='/') url='/'+url;
+  		  getApp().goto(url);
+   }
 })
-<import src="../../tabbar/tabbar.wxml" />
-<template is="tabBar" data="{{tabBar}}" />
+<!-- <import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" /> -->
 <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
   <view class="xc-user">