From 6da2f40e6adbf4bb3220354e944ce71503586be4 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 29 Jun 2020 17:24:16 +0800
Subject: [PATCH] app的图片修改

---
 app.js | 71 +++++++++++++++++++++++++++++++++--------------------------------------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/app.js b/app.js
index 4437718..17fcaf6 100644
--- a/app.js
+++ b/app.js
@@ -72,6 +72,8 @@ App({
             },
         })
     }
+
+
   },
   set_custom_nav(data,isIpx,pagePath,url,curPage){
       //缓存住，下次就不调用接口了
@@ -135,6 +137,7 @@ App({
       guide_id:null,      //分享导购ID
 
       windowWidth:0,  //整个窗体的宽度
+
   },
     auth: o,
     request: a,
@@ -168,32 +171,6 @@ App({
             }
           },
         })
-        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(){}
-      })
-        
 
     },
 
@@ -346,7 +323,7 @@ App({
             title: t,
             mask: e,
             duration: a,
-            image:"/images/gt.png",
+            image:"/packageA/images/gt.png",
             complete: function() {
                 "function" == typeof o && setTimeout(o, a);
             }
@@ -421,7 +398,10 @@ App({
 
     //----智能跳转，判断 非tabBar,tabBar页面的跳转----
     goto:function (url) {
-
+       var arr=getCurrentPages();
+       if(arr.length>8){
+           arr.splice(0, 2);
+       }
         var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList",
                        "/pages/goods/categoryList/categoryList?type=2",
                        "/pages/goods/categoryList/categoryList?type=1",
@@ -429,10 +409,18 @@ 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.navigateTo({ url: url, })  //跳到tabbar页
+            if (getCurrentPages().length > 9) {
+                wx.redirectTo({url: url,})  //跳到tabbar页
+            }else{
+                wx.navigateTo({url: url,})  //跳到tabbar页
+            }
 
         }else{
-            wx.navigateTo({ url: url, })  //跳到非tabbar页
+            if (getCurrentPages().length > 9) {
+                wx.redirectTo({url: url,})  //跳到非tabbar页
+            }else{
+                wx.navigateTo({url: url,})  //跳到tabbar页
+            }
         }
         //wx.navigateTo({ url: url, })  //跳到非tabbar页
     },
@@ -511,24 +499,30 @@ App({
     },
 
     //-------获取购物车数量----------
-    requestCardNum: function() {
-        var th = this;
-        th.request.get("/api/weshop/cart/page", {
+    requestCardNum: function(th) {
+        if(!this.globalData.user_id) return false;
+        this.request.get("/api/weshop/cart/page", {
             data: {
-                store_id: th.globalData.setting.stoid,
-                user_id: th.globalData.user_id,
+                store_id: this.globalData.setting.stoid,
+                user_id: this.globalData.user_id,
                 state:0,
                 is_gift:0
             },
             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;
+                if(e.data.data &&  e.data.data.pageData) {
+                    for (var i = 0; i < e.data.data.pageData.length; i++) {
+                        num += e.data.data.pageData[i].goods_num;
+                    }
                 }
+
+
+                /*---
                 wx.setTabBarBadge({ //tabbar右上角添加文本
                     index: 2, ////tabbar下标
                     text: '' + num //显示的内容
-                });
+                });--*/
+                th.setData({['tabBar.cartGoodsNum']:num});
             }
         });
     },
@@ -571,6 +565,7 @@ App({
         this.globalData.is_test=0;
         this.globalData.guide_id=null;                 //导购清空
         this.globalData.first_leader=null;             //分享的会员清空
+        th.globalData.wuliu=null;                      //关闭要把物流清空
     }
 	
 
--
libgit2 0.21.4