diff --git a/.env.development b/.env.development index 1993492..0eda409 100644 --- a/.env.development +++ b/.env.development @@ -3,5 +3,8 @@ VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=http://60.209.125.238:25805 VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api + //VUE_APP_API_BASE_URL=http://127.0.0.1:5000 //VUE_APP_SOCKET_BASE_URL=http://127.0.0.1:5000 diff --git a/.env.preview b/.env.preview index c9d8f7c..029fbe5 100644 --- a/.env.preview +++ b/.env.preview @@ -1,4 +1,7 @@ NODE_ENV=production VUE_APP_PREVIEW=true VUE_APP_API_BASE_URL=http://60.209.125.238:25805 -VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 \ No newline at end of file +VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805 + +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api \ No newline at end of file diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..a04adf7 Binary files /dev/null and b/dist.zip differ diff --git a/src/api/modular/main/BookingLedger.js b/src/api/modular/main/BookingLedger.js index 38123a3..12e7b22 100644 --- a/src/api/modular/main/BookingLedger.js +++ b/src/api/modular/main/BookingLedger.js @@ -802,6 +802,6 @@ export function ExcuteShippingOrderCompareBatch(parameter) { return axios({ url: '/TaskShippingOrderCompare/ExcuteShippingOrderCompareBatch', method: 'post', - params: parameter + data: parameter }) } diff --git a/src/utils/request.js b/src/utils/request.js index 664c73f..5854ff4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,7 +9,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' const service = axios.create({ // baseURL: '/api', // api base_url baseURL: process.env.VUE_APP_API_BASE_URL, // 不用代理就用这个 - timeout: 12000 // 请求超时时间 + timeout: 18000 // 请求超时时间 }) const err = error => {