Skip to content

X
xoadoPlatform
Commit 9b1b1270 by weix
Options

修改bug

parent 808c9981
Showing with 75 additions and 43 deletions
.env.production
......@@ -16,4 +16,4 @@ VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'http://xoado.tpddns.net:10001'
VUE_APP_BASE_API13 = 'http://xoado.tpddns.net:10001/anc'
VUE_APP_BASE_API14 = 'http://xoado.tpddns.cn:10001/xoadotravel'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/brand'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart'
src/components/UserDropdown/index.vue
......@@ -29,6 +29,7 @@
methods: {
loginout() {
this.$store.dispatch('user/loginOut');
this.$store.commit('business/DEL_BRANDLIST')
}
},
computed: {
......
src/store/modules/business.js
......@@ -39,6 +39,10 @@ const mutations = {
state.brandList = payload
sessionStorage.setItem('brandList', payload)
},
DEL_BRANDLIST(state) {
state.brandList = '';
sessionStorage.removeItem('brandList');
}
}
const actions = {
......@@ -50,17 +54,16 @@ const actions = {
/** 正式环境注释 */
res.data.forEach(item => {
if(item.brandName.indexOf('玖玖') !== -1) {
item.brandUrl = 'http://192.168.0.251:8181/brand';
item.brandUrl = 'http://xoado.tpddns.net:10001/brand';
}
if(item.brandName.indexOf('江南') !== -1) {
item.brandUrl = 'http://192.168.0.251:9191/brand';
item.brandUrl = 'http://xoado.tpddns.net:10001/brandjn';
}
if(item.brandName.indexOf('妥妥') !== -1) {
item.brandUrl = 'http://192.168.0.251:9292/brand';
item.brandUrl = 'http://xoado.tpddns.net:10001/brandtt';
}
})
/** 测试环境注释 */
// res.data.forEach(item => {
// item.brandUrl = item.brandUrl+'/brand';
......
src/views/operation/orderDetail.vue
......@@ -11,12 +11,12 @@
<span style="white-space: nowrap; margin-right: 10px"
>品牌方:</span
>
<el-select v-model="optionse" placeholder="请选择">
<el-select v-model="platformInfo" placeholder="请选择" style="width: 200px;">
<el-option
v-for="item in optionsx"
v-for="item in brandLists"
:key="item.value"
:label="item.label"
:value="item.value"
:label="item.brandName"
:value="JSON.stringify(item)"
>
</el-option>
</el-select>
......@@ -29,7 +29,8 @@
style="margin: 0 10px"
size="small"
@click="Inquire"
>查询</el-button
>查询
</el-button
>
</div>
</div>
......@@ -121,7 +122,8 @@
text-align: right;
"
>订单来源：</span
>{{ orderSources(payData.orderSource)
>{{
orderSources(payData.orderSource)
}}{{ payData.channelNumber }}
</div>
<div>车牌号：{{ payData.tplateNumber }}</div>
......@@ -193,7 +195,8 @@
:underline="false"
style="padding-left: 10px"
@click="getpayInfoFun"
>获取</el-link
>获取
</el-link
>
</div>
</div>
......@@ -201,7 +204,8 @@
<div slot="footer" class="dialog-footer">
<el-button @click="paystatus = false">取 消</el-button>
<el-button type="primary" @click="setpaystatusBtn"
>确定更改</el-button
>确定更改
</el-button
>
</div>
</el-dialog>
......@@ -344,7 +348,8 @@
<div slot="footer" class="dialog-footer">
<el-button @click="finishStatus = false">取 消</el-button>
<el-button type="primary" @click="updataBatch"
>强制完单</el-button
>强制完单
</el-button
>
</div>
</el-dialog>
......@@ -360,14 +365,16 @@
size="mini"
@click="cancelOrder()"
v-if="dataSource.status * 1 < 3"
>取消订单</el-button
>取消订单
</el-button
>
<el-button
type="primary"
size="mini"
@click="driverInfo()"
v-if="dataSource.status * 1 == 2"
>同步司机信息</el-button
>同步司机信息
</el-button
>
<el-button
type="warning"
......@@ -376,7 +383,8 @@
dataSource.status * 1 < 6 && dataSource.status * 1 >= 1
"
@click="finishOrder()"
>强制完单</el-button
>强制完单
</el-button
>
<el-button
......@@ -389,7 +397,8 @@
dataSource.orderSource * 1 == 4 ||
dataSource.orderSource * 1 == 7)
"
>更改支付状态</el-button
>更改支付状态
</el-button
>
<!-- orderSource=6 4 7 -->
......@@ -408,11 +417,12 @@
<li>
<div>
<span>订单编号:{{ dataSource.orderId }}</span>
<CopyIcon :msg="dataSource.orderId" />
<CopyIcon :msg="dataSource.orderId"/>
</div>
<div>
<span
>订单来源：{{ orderSources(dataSource.orderSource)
>订单来源：{{
orderSources(dataSource.orderSource)
}}{{ dataSource.channelNumber }}</span
>
<CopyIcon
......@@ -453,10 +463,11 @@
</div>
<div>
<span v-if="dataSource.passengerMobile"
>下单人：{{ dataSource.originatorName
>下单人：{{
dataSource.originatorName
}}{{ dataSource.originatorMobile }}</span
>
<CopyIcon :msg="dataSource.originatorMobile" />
<CopyIcon :msg="dataSource.originatorMobile"/>
</div>
</li>
<li>
......@@ -522,7 +533,7 @@
<li v-if="dataSource.waybillId">
<div>
<span>运单编号：{{ dataSource.waybillId }}</span>
<CopyIcon :msg="dataSource.waybillId" />
<CopyIcon :msg="dataSource.waybillId"/>
</div>
</li>
</ul>
......@@ -683,7 +694,7 @@
>
<el-row>
<audio ref="audio" controls style="outline: none; width: 100%">
<source :src="orderrecord" type="audio/mpeg" />
<source :src="orderrecord" type="audio/mpeg"/>
<!--<source src="../../assets/test.mp3" type="audio/mpeg" />-->
Your browser does not support the audio element
</audio>
......@@ -728,7 +739,7 @@
<script>
import JudgeType from "@/mixins/judgeType";
import { formatDate } from "@/utils/formatDate";
import {formatDate} from "@/utils/formatDate";
import {
getThisorderInfo,
userLog,
......@@ -736,7 +747,7 @@ import {
OrderDetailsSelect,
soundRecording,
} from "@/port/set-request";
import { platformInfosList } from "@/port/platfrom/setting";
import {platformInfosList} from "@/port/platfrom/setting";
import {
CancelOrder,
updateBatchOrder,
......@@ -746,7 +757,7 @@ import {
} from "@/port/orderOperation";
import maps from "./maps";
import CopyIcon from "./components/CopyIcon";
import { mapGetters } from "vuex";
import {mapGetters} from "vuex";
export default {
name: "OrderDetails",
......@@ -767,9 +778,22 @@ export default {
transportId: "user/transportId",
userInfo: "user/userInfo",
}),
brandLists() {
let brandList = this.$store.getters.brandList;
if(brandList.length === 0) {
return new Promise(() =>{
this.$store.dispatch('business/getBrandList')
})
brandList = this.$store.getters.brandList;
}
this.platformInfo = brandList.length > 0 ? JSON.stringify(brandList[0]) : '';
return brandList;
}
},
data() {
return {
platformInfo: '',
optionsx: [
{
brandUrl: "https://hgxd.99zcx.com",
......@@ -840,7 +864,8 @@ export default {
// optionsx
}
})
.catch(() => {});
.catch(() => {
});
},
methods: {
......@@ -850,16 +875,16 @@ export default {
let platformId = this.optionse;
let json = {
orderId: this.orderid,
brandUrl: "",
platformId: "",
brandUrl: JSON.parse(this.platformInfo).brandUrl,
platformId: JSON.parse(this.platformInfo).platformId,
};
let arr = this.optionsx;
arr.map(function (item) {
if (item.value == platformId) {
json.brandUrl = item.brandUrl;
json.platformId = item.value;
}
});
// let arr = this.optionsx;
// arr.map(function (item) {
// if (item.value == platformId) {
// json.brandUrl = item.brandUrl;
// json.platformId = item.value;
// }
// });
this.getOrderInfo(json);
this.seeLeftLog(json);
},
......@@ -868,7 +893,7 @@ export default {
this.finishStatus = true;
},
updataBatch() {
let json = [{ orderid: this.finishdata.orderId, status: 6 }];
let json = [{orderid: this.finishdata.orderId, status: 6}];
updateBatchOrder(json).then((res) => {
if (res.status == 200) {
this.finishStatus = false;
......@@ -1198,7 +1223,7 @@ export default {
beforeDestroy() {
this.$store.commit(
"business/SET_ORDERDETAIL",
JSON.stringify({ brandUrl: "", platformId: "" })
JSON.stringify({brandUrl: "", platformId: ""})
);
},
};
......@@ -1206,10 +1231,10 @@ export default {
<style scoped lang="scss">
html
body
.vue-admin-beautiful-wrapper
.app-main-container
> [class*="-container"] {
body
.vue-admin-beautiful-wrapper
.app-main-container
> [class*="-container"] {
padding: 0;
background: #f5f5f5;
}
......@@ -1492,14 +1517,17 @@ html
.orangeColor {
color: #ff9901;
}
.orderpaydialog {
display: flex;
align-items: center;
justify-content: center;
}
.orderpaydialog > div {
flex: 1;
}
.orderpaydialogContent {
margin: 10px 0;
display: flex;
......
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