@@ -296,7 +296,9 @@ | |||
showLoading: true, | |||
}; | |||
request(addressQuery, options).then((res) => { | |||
console.log(res.bizContent); | |||
const data = stringToJson(res.bizContent); | |||
console.log(data); | |||
state.addressArray = data.data??[]; | |||
}); | |||
} |
@@ -511,8 +511,6 @@ | |||
success: function (res) { | |||
pathToBase64(res.tempFilePaths[0]) | |||
.then((path) => { | |||
console.log(path); | |||
console.log("哈哈哈"); | |||
var data = { | |||
source: "1", | |||
agencyId: "52010106004", |
@@ -2,5 +2,5 @@ import { envs } from '@/utils/network/api.js' | |||
// export const fileURL = 'http://47.94.96.52/' | |||
// export const fileURL = 'http://222.85.144.89:19002/default-bucket/' | |||
export const downloadFileURL = 'http://'+ envs[process.env.NODE_ENV].baseUrl +':8087/user-export-excel/' | |||
export const fileURL = 'http://'+ envs[process.env.NODE_ENV].baseUrl +':8087/default-bucket/' | |||
export const downloadFileURL = 'http://'+ envs[process.env.NODE_ENV].baseUrl +'/user-export-excel/' | |||
export const fileURL = 'http://'+ envs[process.env.NODE_ENV].baseUrl +'/default-bucket/' |
@@ -203,7 +203,10 @@ const reqLogin = (code:string, data:object) => { | |||
}; | |||
request(code, options).then((res) => { | |||
const result = stringToJson(res.bizContent); | |||
fetchToken(stringToJson(result).code).then((data:any) => { | |||
console.log(result); | |||
console.log(typeof(result)); | |||
fetchToken(result.code).then((data:any) => { | |||
console.log(data); | |||
msg("登录成功!"); | |||
uni.$emit("refreshOrder"); | |||
uni.navigateBack(); |
@@ -59,7 +59,7 @@ | |||
const bgOrange = `url(${fileURL}image/service/bg-orange.png) center center no-repeat`; | |||
const bgBlue = `url(${fileURL}image/service/bg-blue.png) center center no-repeat`; | |||
const activeTab = ref("业务服务"); | |||
const tableSelectIndex = ref(4); | |||
const tableSelectIndex = ref(0); | |||
// 切换 | |||
function tabHandle(val, index) { | |||
activeTab.value = val; |
@@ -6,12 +6,12 @@ export const URL = "192.168.100.63"; | |||
export const envs = { | |||
//开发环境配置 | |||
development: { | |||
baseUrl: "192.168.100.63", | |||
// baseUrl: "222.85.144.89", | |||
baseUrl: "192.168.100.63:8087", | |||
// baseUrl: "222.85.144.89:19002", | |||
}, | |||
//生产环境配置 | |||
production: { | |||
baseUrl: "222.85.144.89", | |||
baseUrl: "222.85.144.89:19002", | |||
} | |||
} | |||
@@ -28,7 +28,7 @@ export function request(code, options = {}) { | |||
loginSource: "69af303ba2eb4608a099163f0d2a5dbd" | |||
} | |||
//Url 地址 | |||
options.url = 'http://'+ envs[process.env.NODE_ENV].baseUrl +':8087/ifzt/api/interfaceMidGroundIn' | |||
options.url = 'http://'+ envs[process.env.NODE_ENV].baseUrl +'/ifzt/api/interfaceMidGroundIn' | |||
//判断baseUri是否为空 | |||
if (options.baseUrl) { | |||
options.url = options.baseUrl | |||
@@ -69,7 +69,21 @@ export function request(code, options = {}) { | |||
if (res.data.statusCode !== 0 && res.data.statusCode !== 200) { | |||
if (res.data.statusCode == 600) { | |||
resolve(res.data) | |||
} else { | |||
} else if(res.data.statusCode == 401){ | |||
wx.showModal({ | |||
title: '提示', | |||
content: res.data.errorMsg, | |||
confirmText:'去登录', | |||
showCancel: false, | |||
success: function(res) { | |||
if (res.confirm) { | |||
uni.navigateTo({ | |||
url: '/login/login', | |||
}) | |||
} | |||
} | |||
}); | |||
}else { | |||
wx.showModal({ | |||
title: '提示', | |||
content: res.data.errorMsg, |