Skip to content

X
xoadoPlatform
Commit 68590815 by 吕海涛
Options

环境切换

parent 9610bb01
Showing with 80 additions and 29 deletions
.env.development
...@@ -6,15 +6,15 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com' ...@@ -6,15 +6,15 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'http://aitransport.xoado.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.cn:10001/transport'
VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.cn:10001/operate'
VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.cn:10001/trace'
VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart' VUE_APP_BASE_API15 = 'http://xoado.tpddns.cn:10001/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
.env.production
...@@ -7,14 +7,14 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com' ...@@ -7,14 +7,14 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'http://aitransport.xoado.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.cn:10001/transport'
VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.cn:10001/operate'
VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.cn:10001/trace'
VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart' VUE_APP_BASE_API15 = 'http://xoado.tpddns.cn:10001/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
\ No newline at end of file
.vscode/launch.json 0 → 100644
{
// 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
\ No newline at end of file
ip.js
...@@ -43,14 +43,14 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com' ...@@ -43,14 +43,14 @@ VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com' VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'http://aitransport.xoado.com' VUE_APP_BASE_API4 = 'http://aitransport.xoado.com'
VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand' VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.cn:10001/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.cn:10001/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.cn:10001/trace'
VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/' VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/'
VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/' VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/' VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com' VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice' VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message' VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart' VUE_APP_BASE_API15 = 'http://xoado.tpddns.cn:10001/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
\ No newline at end of file
src/mixins/judgeType.js
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
}, },
carTypeText(status) { carTypeText(status) {
status = Number(status) status = Number(status)
console.log(dataSource); // console.log(dataSource);
let result = '/'; let result = '/';
for (let i = 0; i < dataSource.CarType.length; i++) { for (let i = 0; i < dataSource.CarType.length; i++) {
if (status == dataSource.CarType[i].id) { if (status == dataSource.CarType[i].id) {
......
src/port/maintenance/index.js
...@@ -54,3 +54,13 @@ export function supplementData(u, data) { ...@@ -54,3 +54,13 @@ export function supplementData(u, data) {
const url = u + `/xoado/order/supplementData/${data}`; const url = u + `/xoado/order/supplementData/${data}`;
return get(url, {}) return get(url, {})
} }
/* 运单取消 */
export function cancelWaybills(data) {
const url = process.env.VUE_APP_BASE_API6 + `/dispatchCenter/cancelWaybill`;
return post(url, data);
}
/* 运单取消 */
export function waybillCancel(id) {
const url = process.env.VUE_APP_BASE_API6 + `/new/waybill/waybillCancel/${id}`;
return get(url, {});
}
\ No newline at end of file
src/store/modules/business.js
...@@ -65,22 +65,22 @@ const actions = { ...@@ -65,22 +65,22 @@ const actions = {
console.log(res.data); console.log(res.data);
/** 正式环境注释 */ /** 正式环境注释 */
// res.data.forEach(item => {
// if (item.brandName.indexOf('玖玖') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brand';
// }
// if (item.brandName.indexOf('江南') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn';
// }
// if (item.brandName.indexOf('妥妥') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt';
// }
// })
debugger
/** 测试环境注释 */
res.data.forEach(item => { res.data.forEach(item => {
item.brandUrl = item.brandUrl + '/brand'; if (item.brandName.indexOf('玖玖') !== -1) {
item.brandUrl = 'http://xoado.tpddns.cn:10001/brand';
}
if (item.brandName.indexOf('江南') !== -1) {
item.brandUrl = 'http://xoado.tpddns.cn:10001/brandjn';
}
if (item.brandName.indexOf('妥妥') !== -1) {
item.brandUrl = 'http://xoado.tpddns.cn:10001/brandtt';
}
}) })
/** 测试环境注释 */
// res.data.forEach(item => {
// item.brandUrl = item.brandUrl + '/brand';
// })
console.log(res.data); console.log(res.data);
let data = res.data; let data = res.data;
......
src/views/business/waybillManagement/waybillDetail.vue
...@@ -44,7 +44,18 @@ ...@@ -44,7 +44,18 @@
v-for="(item, index) in dataSource.orderInfoList" v-for="(item, index) in dataSource.orderInfoList"
:key="index" :key="index"
> >
<h5>乘车信息-{{ index + 1 }}</h5> <h5>乘车信息-{{ index + 1 }}
<el-button
size="mini"
type="warning"
plain
v-if="
!!item.detail.otherInfo &&
item.detail.otherInfo.routePlanningType * 1 == 34
"
>高速优先
</el-button>
</h5>
<li> <li>
<div <div
class="overText" class="overText"
...@@ -306,7 +317,18 @@ ...@@ -306,7 +317,18 @@
v-for="(item, index) in dataSource.orderInfoList" v-for="(item, index) in dataSource.orderInfoList"
:key="index" :key="index"
> >
<h5>乘车信息-{{ index + 1 }}</h5> <h5>乘车信息-{{ index + 1 }}
<el-button
size="mini"
type="warning"
plain
v-if="
!!item.detail.otherInfo &&
item.detail.otherInfo.routePlanningType * 1 == 34
"
>高速优先
</el-button>
</h5>
<li> <li>
<div <div
class="overText" class="overText"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment