Skip to content

X
xoadoPlatform
Commit 1e6dee1e by 吕海涛
Options

优化处理，bug修改

parent 81d55c03
Showing with 90 additions and 50 deletions
.env.development
...@@ -4,17 +4,17 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -4,17 +4,17 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' 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 = 'https://hgxd.99zcx.com'
VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand' VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand'
VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport'
VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate'
VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace'
VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/' VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/'
VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/' VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/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 = 'http://xoado.tpddns.net:10001'
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.net:10001/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
.env.production
...@@ -5,16 +5,16 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com' ...@@ -5,16 +5,16 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com' VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com' 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 = 'https://hgxd.99zcx.com'
VUE_APP_BASE_API5 = 'http://aitransport.xoado.com/brand' VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand'
VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport' VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport'
VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate' VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate'
VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace' VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace'
VUE_APP_BASE_API9 = 'https://account.xoado.com/payment/' VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/'
VUE_APP_BASE_API10 = 'https://account.xoado.com/payment/v1/' VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/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 = 'http://xoado.tpddns.net:10001'
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.net:10001/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc' VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
\ No newline at end of file \ No newline at end of file
src/components/List/List.vue
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
:key="index" :key="index"
> >
{{ element.name }} {{ element.name }}
<div <div
v-if="!element.isShow" v-if="!element.isShow"
class="delect-button el-icon-error el-icon--right" class="delect-button el-icon-error el-icon--right"
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
@click="addData(element, index)" @click="addData(element, index)"
> >
<i class="el-icon-circle-plus"></i> <i class="el-icon-circle-plus"></i>
{{ element.name }} {{ element.name }}
</el-button> </el-button>
</div> </div>
......
src/components/Selects/index.vue
<template> <template>
<div> <div>
<span>{{ selectName }}</span> <span :class="typeMinwidth?'item-title-select-S':''">{{ selectName }}</span>
<el-select <el-select
:size="sizeType" :size="sizeType"
v-model="selectList" v-model="selectList"
...@@ -30,6 +30,10 @@ export default { ...@@ -30,6 +30,10 @@ export default {
type: String, //用于区分当前类型 方便后续调用 type: String, //用于区分当前类型 方便后续调用
required: true required: true
}, },
typeMinwidth:{
type:Boolean,
default:false
},
options: { options: {
type: Array, type: Array,
required: true required: true
...@@ -60,6 +64,7 @@ export default { ...@@ -60,6 +64,7 @@ export default {
methods: { methods: {
init() { init() {
let options = this.options; let options = this.options;
let list = ["999"]; let list = ["999"];
options.forEach(function (item, index) { options.forEach(function (item, index) {
list.push(item.id); list.push(item.id);
...@@ -132,4 +137,9 @@ div { ...@@ -132,4 +137,9 @@ div {
font-size: 14px; font-size: 14px;
} }
} }
.item-title-select-S{
min-width: 100px;
text-align: right;
white-space:nowrap;
}
</style> </style>
src/libs/screen.js
...@@ -160,7 +160,7 @@ const dataSource = { ...@@ -160,7 +160,7 @@ const dataSource = {
}, },
{ {
'id': '4', 'id': '4',
'name': '自营司机（面对面下单）' 'name': '司机APP'
}, },
{ {
'id': '5', 'id': '5',
...@@ -557,7 +557,7 @@ const dataSource = { ...@@ -557,7 +557,7 @@ const dataSource = {
}, },
{ {
'id': '4', 'id': '4',
'name': '司机补单(面对面下单)' 'name': '司机APP'
}, },
{ {
'id': '5', 'id': '5',
......
src/mixins/judgeType.js
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
return '服务中-已到达' return '服务中-已到达'
case 5: case 5:
return '服务中-已到达' return '服务中-已上车'
case 6: case 6:
return '已完成' return '已完成'
...@@ -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);
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/order-select.js
...@@ -48,7 +48,11 @@ export function exportWaybillData(data) { ...@@ -48,7 +48,11 @@ export function exportWaybillData(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/export' const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/export'
return postblob(url, data) return postblob(url, data)
} }
/* 导出运单列表 */
export function newexportWaybillData(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/newexport'
return postblob(url, data)
}
/* 查询投诉列表 */ /* 查询投诉列表 */
export function getcomplaintList(data) { export function getcomplaintList(data) {
const url = process.env.VUE_APP_BASE_API6 + '/complaint/condition' const url = process.env.VUE_APP_BASE_API6 + '/complaint/condition'
...@@ -657,7 +661,11 @@ export function getAllOrderList(data) { ...@@ -657,7 +661,11 @@ export function getAllOrderList(data) {
const url = store.getters.BrandUrl + '/xoado/order/query' const url = store.getters.BrandUrl + '/xoado/order/query'
return post(url, data) return post(url, data)
} }
/* 多条件查询订单列表 */
export function getAllOrderListNew(data) {
const url = store.getters.BrandUrl + '/xoado/order/v2/list'
return post(url, data)
}
/* 多条件导出订单列表 */ /* 多条件导出订单列表 */
export function exportAllOrderList(data) { export function exportAllOrderList(data) {
const url = store.getters.BrandUrl + '/xoado/order/export' const url = store.getters.BrandUrl + '/xoado/order/export'
...@@ -700,7 +708,12 @@ export function updateNewCityCarpool(data) { ...@@ -700,7 +708,12 @@ export function updateNewCityCarpool(data) {
const url = process.env.VUE_APP_BASE_API5 + '/cityWide/updateConfig' const url = process.env.VUE_APP_BASE_API5 + '/cityWide/updateConfig'
return post(url, data) return post(url, data)
} }
/* 运单列表 */
export function getAllWaybillListNew(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/waybill/advancedSearch'
// const url = "http://xoado.tpddns.net:10001/transport/new/waybill/newexport"
return post(url, data)
}
/* 新增车辆 */ /* 新增车辆 */
export function addCarInfo(data) { export function addCarInfo(data) {
......
src/port/set-request.js
...@@ -398,7 +398,11 @@ export function getAllOrderList(data, u, platformId) { ...@@ -398,7 +398,11 @@ export function getAllOrderList(data, u, platformId) {
const url = (u ? u : targetBaseUrl) + '/xoado/order/query' const url = (u ? u : targetBaseUrl) + '/xoado/order/query'
return post(url, data, platformId) return post(url, data, platformId)
} }
/* 多条件查询订单列表 */
export function getAllOrderListNew(data, u, platformId) {
const url = (u ? u : targetBaseUrl) + '/xoado/order/v2/list'
return post(url, data)
}
/* 多条件查询订单列表 */ /* 多条件查询订单列表 */
export function getThisorderInfo(data, u, platformId) { export function getThisorderInfo(data, u, platformId) {
const url = (u ? u : targetBaseUrl) + '/xoado/order/select' const url = (u ? u : targetBaseUrl) + '/xoado/order/select'
...@@ -414,7 +418,11 @@ export function exportAllOrderList(data, u, platformId) { ...@@ -414,7 +418,11 @@ export function exportAllOrderList(data, u, platformId) {
const url = (u ? u : targetBaseUrl) + '/xoado/order/export' const url = (u ? u : targetBaseUrl) + '/xoado/order/export'
return postblob(url, data, platformId) return postblob(url, data, platformId)
} }
/* 多条件导出订单列表 */
export function NewexportAllOrderList(data, u, platformId) {
const url = (u ? u : targetBaseUrl) + '/xoado/order/v2/list/export'
return postblob(url, data, platformId)
}
/* 分成公式新增 */ /* 分成公式新增 */
export function addDividedInto(data) { export function addDividedInto(data) {
const url = targetBaseUrl + '/separate/formula' const url = targetBaseUrl + '/separate/formula'
......
src/store/modules/business.js
...@@ -64,23 +64,23 @@ const actions = { ...@@ -64,23 +64,23 @@ const actions = {
if (res.status === 200) { if (res.status === 200) {
/** 正式环境注释 */ /** 正式环境注释 */
// res.data.forEach(item => { res.data.forEach(item => {
// if (item.brandName.indexOf('玖玖') !== -1) { if (item.brandName.indexOf('玖玖') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brand'; item.brandUrl = 'http://xoado.tpddns.net:10001/brand';
// } }
// if (item.brandName.indexOf('江南') !== -1) { if (item.brandName.indexOf('江南') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn'; item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn';
// } }
// if (item.brandName.indexOf('妥妥') !== -1) { if (item.brandName.indexOf('妥妥') !== -1) {
// item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt'; item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt';
// } }
// }) })
/** 测试环境注释 */ /** 测试环境注释 */
res.data.forEach(item => { // res.data.forEach(item => {
item.brandUrl = item.brandUrl + '/brand'; // item.brandUrl = item.brandUrl + '/brand';
}) // })
// console.log(res.data); // console.log(res.data);
let data = res.data; let data = res.data;
commit('SET_BRANDLIST', JSON.stringify(data)) commit('SET_BRANDLIST', JSON.stringify(data))
......
src/views/business/complaintList/components/item.vue
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!--{{transportName}}--> <!--{{transportName}}-->
<!--</template>--> <!--</template>-->
</el-table-column> </el-table-column>
<el-table-column align="center" label="订单号" width="200" prop="orderId"> <el-table-column align="center" label="订单号" width="150" prop="orderId">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
class="overText" class="overText"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工单号" width="200" prop="waybillId"> <el-table-column align="center" label="工单号" width="100" prop="waybillId">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
class="overText" class="overText"
......
src/views/business/complaintList/index.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</el-radio-group> </el-radio-group>
</el-row> </el-row>
<el-tabs <el-tabs
style="padding-left: 20px" style="padding-left: 20px;padding-top: 20px;"
v-model="form.runType" v-model="form.runType"
type="card" type="card"
@tab-click="handleClick" @tab-click="handleClick"
...@@ -111,6 +111,9 @@ ...@@ -111,6 +111,9 @@
<el-button style="padding: 8px 20px" type="primary" @click="exportB" <el-button style="padding: 8px 20px" type="primary" @click="exportB"
>批量导出excel</el-button >批量导出excel</el-button
> >
<!-- <el-button style="width: 100px;margin-left: 10px;height: 32px" type="primary" size="small"
@click.stop="customList">自定义列表
</el-button> -->
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -171,6 +174,7 @@ export default { ...@@ -171,6 +174,7 @@ export default {
data() { data() {
return { return {
form: { form: {
dialogVisible: false,
orderInfo: "", orderInfo: "",
dateTime: [], dateTime: [],
platformId: "", platformId: "",
...@@ -201,6 +205,9 @@ export default { ...@@ -201,6 +205,9 @@ export default {
} }
}, },
methods: { methods: {
customList() {
this.dialogVisible = true;
},
getPlatformInfo() { getPlatformInfo() {
this.dataSource.localOrgId = this.brandLists; this.dataSource.localOrgId = this.brandLists;
this.form.platformId = this.form.platformId =
......
src/views/platform/setting.vue
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
{{ scope.row.baseInfo.domain.length > 0 ? scope.row.baseInfo.domain[0] : '' }} {{ scope.row.baseInfo.domain.length > 0 ? scope.row.baseInfo.domain[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开通业务渠道" align="center" prop="allowRunType"> <el-table-column label="开通业务类型" align="center" prop="allowRunType">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="text-left-div"> <div class="text-left-div">
<p v-for="(item, index) in scope.row.allowRunType" :key="'allowRunType' + index"> <p v-for="(item, index) in scope.row.allowRunType" :key="'allowRunType' + index">
......
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