zhuliu 1 年間 前
コミット
922bde79f2
4 ファイル変更5 行追加26 行削除
  1. 2 5
      utils/downLoad.js
  2. 2 4
      utils/pay.js
  3. 1 9
      utils/request.js
  4. 0 8
      utils/upload.js

+ 2 - 5
utils/downLoad.js

@@ -9,16 +9,13 @@ const config = {
    
   },  
   // 其他全局配置...  
-  tabbar:["pages/index/index","pages/hotProduct/hotProduct","pages/mine/mine"] 
+
 }; 
 function getPages(){
   var obj = {
     type: 'danger'
   }
-  var pages = getCurrentPages()
-  var route = pages[pages.length - 1]?.route
-  console.log(config.tabbar,route)
-  if(route && config.tabbar.indexOf(route)==-1){
+  if(wx.getStorageSync('isComponent')){
     obj.top = wx.getStorageSync('height')
   }
   return obj

+ 2 - 4
utils/pay.js

@@ -1,15 +1,13 @@
 import Notify from '../miniprogram_npm/@vant/weapp/notify/notify';
 const api = require('../api/index')
 const config = {  
-  tabbar:["pages/index/index","pages/hotProduct/hotProduct","pages/mine/mine"]
+  
 };
 function getPages(){
   var obj = {
     type: 'danger'
   }
-  var pages = getCurrentPages()
-  var route = pages[pages.length - 1]?.route
-  if(route && config.tabbar.indexOf(route)==-1){
+  if(wx.getStorageSync('isComponent')){
     obj.top = wx.getStorageSync('height')
   }
   return obj

+ 1 - 9
utils/request.js

@@ -9,9 +9,7 @@ const config = {
   header: {  
     'content-type': 'application/json', // 默认请求头  
     // 其他全局请求头...  
-  },  
-  // 其他全局配置...  
-  tabbar:["pages/index/index","pages/hotProduct/hotProduct","pages/mine/mine"]
+  }, 
 };  
 const apiUrl = {  
   develop: 'https://www.xsip.cn/test', // 开发环境地址  
@@ -25,12 +23,6 @@ function getPages(){
   var obj = {
     type: 'danger'
   }
-  // var pages = getCurrentPages()
-  // var route = pages[pages.length - 1]?.route
-  // console.log(wx.getStorageSync('isComponent'))
-  // if(route && config.tabbar.indexOf(route)==-1){
-  //   obj.top = wx.getStorageSync('height')
-  // }
   if(wx.getStorageSync('isComponent')){
     obj.top = wx.getStorageSync('height')
   }

+ 0 - 8
utils/upload.js

@@ -10,8 +10,6 @@ const config = {
     // 其他全局请求头... 
    
   },  
-  // 其他全局配置...  
-  tabbar:["pages/index/index","pages/hotProduct/hotProduct","pages/mine/mine"] 
 };  
 const apiUrl = {  
   develop: 'http://192.168.2.120:8802', // 开发环境地址  
@@ -25,12 +23,6 @@ function getPages(){
   var obj = {
     type: 'danger'
   }
-  // var pages = getCurrentPages()
-  // var route = pages[pages.length - 1]?.route
-  // console.log(config.tabbar,route)
-  // if(route && config.tabbar.indexOf(route)==-1){
-  //   obj.top = wx.getStorageSync('height')
-  // }
   if(wx.getStorageSync('isComponent')){
     obj.top = wx.getStorageSync('height')
   }