|
@@ -7,8 +7,8 @@ const request = (opts, hasToken) => {
|
|
// console.log(authorization, 'authorization')
|
|
// console.log(authorization, 'authorization')
|
|
// hasToken是否传入token,为true则不传token
|
|
// hasToken是否传入token,为true则不传token
|
|
const header = {
|
|
const header = {
|
|
- 'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
|
|
|
|
- 'App-Type': 2,
|
|
|
|
|
|
+ // 'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
|
|
|
|
+ // 'App-Type': 2,
|
|
'Version': curVer.version?curVer.version.replace(/\./g,''):''
|
|
'Version': curVer.version?curVer.version.replace(/\./g,''):''
|
|
}
|
|
}
|
|
if(!hasToken){
|
|
if(!hasToken){
|
|
@@ -21,6 +21,7 @@ const request = (opts, hasToken) => {
|
|
method: opts.method,
|
|
method: opts.method,
|
|
header: opts.header ? opts.header : header
|
|
header: opts.header ? opts.header : header
|
|
}
|
|
}
|
|
|
|
+ console.log(DefaultOpts)
|
|
let promise = new Promise(function(resolve, reject) {
|
|
let promise = new Promise(function(resolve, reject) {
|
|
uni.request(DefaultOpts).then(
|
|
uni.request(DefaultOpts).then(
|
|
(res) => {
|
|
(res) => {
|
|
@@ -34,11 +35,13 @@ const request = (opts, hasToken) => {
|
|
})
|
|
})
|
|
}
|
|
}
|
|
let ret = res[1]
|
|
let ret = res[1]
|
|
|
|
+ ret.status = ret.statusCode
|
|
if(res[1].data.status){
|
|
if(res[1].data.status){
|
|
ret = res[1].data
|
|
ret = res[1].data
|
|
}else if(res[1].status){
|
|
}else if(res[1].status){
|
|
ret = res[1]
|
|
ret = res[1]
|
|
}
|
|
}
|
|
|
|
+
|
|
if(ret.status == '200'){
|
|
if(ret.status == '200'){
|
|
resolve(ret)
|
|
resolve(ret)
|
|
}else{
|
|
}else{
|