master
parent
05e38b8e05
commit
100c12ed4e
6
main.js
6
main.js
|
|
@ -13,7 +13,6 @@ $http.beforeRequest = function (options) {
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: '数据加载中'
|
title: '数据加载中'
|
||||||
})
|
})
|
||||||
<<<<<<< HEAD
|
|
||||||
if (options.url.indexOf('/my/') !== -1) {
|
if (options.url.indexOf('/my/') !== -1) {
|
||||||
if (options.url.indexOf('/getByUserId') !== -1){
|
if (options.url.indexOf('/getByUserId') !== -1){
|
||||||
options.header = {
|
options.header = {
|
||||||
|
|
@ -35,11 +34,6 @@ $http.beforeRequest = function (options) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (options.url.indexOf('/getLoginInfo') !== -1) {
|
if (options.url.indexOf('/getLoginInfo') !== -1) {
|
||||||
=======
|
|
||||||
|
|
||||||
if (options.url.indexOf('/getLoginInfo') == -1) {
|
|
||||||
console.log('token',uni.getStorageSync('Gs-Token'))
|
|
||||||
>>>>>>> qzc-dev3
|
|
||||||
options.header = {
|
options.header = {
|
||||||
'gs-token': uni.getStorageSync('Gs-Token')
|
'gs-token': uni.getStorageSync('Gs-Token')
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue