Compare commits

..

No commits in common. '483d92cee7e84b760bfa2483e9ed718b68737b54' and 'b454801f9d41df3bfcba5c743612393b16da0a0a' have entirely different histories.

12
.gitignore vendored

@ -1,12 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
unpackage/
.idea
.hbuilderx

@ -2,10 +2,7 @@ import request from '@/request';
// 获取汇总 // 获取汇总
export const getAIResponse = (data) => request({ export const getEnamellingSummaryData = () => request({
method : 'POST', url: '/mes/mesEnamellingWorkorder/getEnamellingSummaryData',
url: '/chat',
data
}); });

@ -5,7 +5,11 @@ if (process.env.NODE_ENV === 'production') {
baseUrl = 'http://106.227.91.181:9081/api'; baseUrl = 'http://106.227.91.181:9081/api';
} else { } else {
// 非生产环境代码 // 非生产环境代码
baseUrl = 'http://192.168.1.18:9020/api'; // baseUrl = 'http://192.168.9.237:8182';
// baseUrl = 'http://192.168.50.200:8080';
// baseUrl = 'http://huaerda-api.24yt.com';
// baseUrl = 'http://192.168.20.80:8080';
baseUrl = 'http://106.227.91.181:9081/api';
} }
const config = { const config = {
baseUrl baseUrl

File diff suppressed because it is too large Load Diff

@ -1,67 +1,70 @@
import config from "@/config"; import config from '@/config'
import errorCode from "@/utils/errorCode"; import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from "@/utils/common"; import {
toast,
showConfirm,
tansParams
} from '@/utils/common'
let timeout = 120000; let timeout = 120000
const baseUrl = config.baseUrl; const baseUrl = config.baseUrl
const request = (config) => { const request = config => {
// 是否需要设置 token // 是否需要设置 token
// const isToken = (config.headers || {}).isToken === false // const isToken = (config.headers || {}).isToken === false
config.header = config.header || {}; config.header = config.header || {}
// if (getToken() && !isToken) { // if (getToken() && !isToken) {
// config.header['Authorization'] = 'Bearer ' + getToken() // config.header['Authorization'] = 'Bearer ' + getToken()
// } // }
// get请求映射params参数 // get请求映射params参数
if (config.params) { if (config.params) {
let url = config.url + "?" + tansParams(config.params); let url = config.url + '?' + tansParams(config.params)
url = url.slice(0, -1); url = url.slice(0, -1)
config.url = url; config.url = url
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni uni.request({
.request({ method: config.method || 'get',
method: config.method || "get", timeout: config.timeout || timeout,
timeout: config.timeout || timeout, url: config.baseUrl || baseUrl + config.url,
url: config.baseUrl || baseUrl + config.url, data: config.data,
data: config.data, header: {
header: { ...config.header,
...config.header, "x-tenant-id": '0'
}, },
dataType: "json", dataType: 'json'
}) }).then(response => {
.then((response) => { let res = response
let res = response.data.result; const code = res.data.code || 200
// const code = res.data.code || 200 const msg = errorCode[code] || res.data.msg || errorCode['default']
// if (code === 500) { if (code === 500) {
// reject('500') // toast(msg)
// } else if (code !== 200) { reject('500')
// reject(code) } else if (code !== 200) {
// } // console.log(2);
if (res.success) { // toast(msg)
resolve(res.data); reject(code)
} else { }
resolve(res.error); resolve(res.data)
} })
}) .catch(error => {
.catch((error) => { let {
let { message } = error; message
} = error
if (message === "Network Error") { if (message === 'Network Error') {
message = "网络不稳定,请检查网络 "; message = '网络不稳定,请检查网络 '
} else if (error.errMsg === "request:fail") { }else if(error.errMsg === 'request:fail' ) {
message = "后端接口连接异常"; message = '后端接口连接异常'
} else if (error.errMsg === "request:fail timeout") { }else if ( error.errMsg === 'request:fail timeout') {
message = "系统接口请求超时"; message = '系统接口请求超时'
} else if (message.includes("Request failed with status code")) { } else if (message.includes('Request failed with status code')) {
message = "系统接口" + message.substr(message.length - 3) + "异常"; message = '系统接口' + message.substr(message.length - 3) + '异常'
} else { }
message = `抱歉,出了点问题: ${error.errMsg || error.message}`; // toast(message)
} reject(error)
// toast(message) })
reject(error); })
}); }
});
};
export default request; export default request

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save