Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xoadoPlatform
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaohui
xoadoPlatform
Commits
30a06f86
Commit
30a06f86
authored
May 19, 2022
by
吕海涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单运维bug
parent
63287d2d
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
133 additions
and
123 deletions
+133
-123
.env.development
.env.development
+9
-9
.env.production
.env.production
+10
-9
App.vue
src/App.vue
+2
-2
common.js
src/assets/js/common.js
+1
-1
index.vue
src/components/BreadCrumb/index.vue
+1
-1
List.vue
src/components/List/List.vue
+1
-1
maps.vue
src/components/Maps/maps.vue
+9
-9
index.vue
src/components/Selects/index.vue
+1
-1
judgeType.js
src/mixins/judgeType.js
+1
-1
paho-mqtt.js
src/plugins/paho-mqtt.js
+1
-1
configure.js
src/port/configure.js
+36
-36
index.js
src/port/orderOperation/index.js
+7
-6
http.js
src/request/http.js
+20
-20
business.js
src/store/modules/business.js
+2
-2
user.js
src/store/modules/user.js
+12
-12
bankCard.vue
src/views/accountManagement/bankCard.vue
+2
-2
index.vue
src/views/business/orderManagement/index.vue
+1
-1
allNoticeList.vue
src/views/notice/allNoticeList.vue
+0
-1
orderDetail.vue
src/views/operation/orderDetail.vue
+17
-8
No files found.
.env.development
View file @
30a06f86
...
@@ -6,16 +6,16 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
...
@@ -6,16 +6,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
s://hgxd.99zcx
.com'
VUE_APP_BASE_API4 = 'http
://aitransport.xoado
.com'
VUE_APP_BASE_API5 = 'http://
192.168.0.251:8181
/brand'
VUE_APP_BASE_API5 = 'http://
aitransport.xoado.com
/brand'
VUE_APP_BASE_API6 = 'http
://192.168.0.251:8182
/transport'
VUE_APP_BASE_API6 = 'http
s://projects.xoado.com
/transport'
VUE_APP_BASE_API7 = 'http
://192.168.0.251:8185
/operate'
VUE_APP_BASE_API7 = 'http
s://projects.xoado.com
/operate'
VUE_APP_BASE_API8 = 'http
://192.168.0.251:8183
/trace'
VUE_APP_BASE_API8 = 'http
s://projects.xoado.com
/trace'
VUE_APP_BASE_API9 = 'http
://192.168.0.251:8195
/payment/'
VUE_APP_BASE_API9 = 'http
s://account.xoado.com
/payment/'
VUE_APP_BASE_API10 = 'http
://192.168.0.251:8195
/payment/v1/'
VUE_APP_BASE_API10 = 'http
s://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 = 'http
://192.168.0.251:8195
'
VUE_APP_BASE_API12 = 'http
s://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
://192.168.0.251:8199
/smart'
VUE_APP_BASE_API15 = 'http
s://aitransport.xoado.com
/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
.env.production
View file @
30a06f86
...
@@ -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
s://hgxd.99zcx
.com'
VUE_APP_BASE_API4 = 'http
://aitransport.xoado
.com'
VUE_APP_BASE_API5 = 'http://
192.168.0.251:8181
/brand'
VUE_APP_BASE_API5 = 'http://
aitransport.xoado.com
/brand'
VUE_APP_BASE_API6 = 'http
://192.168.0.251:8182
/transport'
VUE_APP_BASE_API6 = 'http
s://projects.xoado.com
/transport'
VUE_APP_BASE_API7 = 'http
://192.168.0.251:8185
/operate'
VUE_APP_BASE_API7 = 'http
s://projects.xoado.com
/operate'
VUE_APP_BASE_API8 = 'http
://192.168.0.251:8183
/trace'
VUE_APP_BASE_API8 = 'http
s://projects.xoado.com
/trace'
VUE_APP_BASE_API9 = 'http
://192.168.0.251:8195
/payment/'
VUE_APP_BASE_API9 = 'http
s://account.xoado.com
/payment/'
VUE_APP_BASE_API10 = 'http
://192.168.0.251:8195
/payment/v1/'
VUE_APP_BASE_API10 = 'http
s://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 = 'http
://192.168.0.251:8195
'
VUE_APP_BASE_API12 = 'http
s://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
://192.168.0.251:8199
/smart'
VUE_APP_BASE_API15 = 'http
s://aitransport.xoado.com
/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
\ No newline at end of file
src/App.vue
View file @
30a06f86
...
@@ -29,8 +29,8 @@ export default {
...
@@ -29,8 +29,8 @@ export default {
await
this
.
mustFun
();
await
this
.
mustFun
();
},
},
mounted
()
{
mounted
()
{
console
.
log
(
process
.
env
.
VUE_APP_BASE_API5
)
//
console.log(process.env.VUE_APP_BASE_API5)
console
.
log
(
process
.
env
.
VUE_APP_BASE_API6
)
//
console.log(process.env.VUE_APP_BASE_API6)
this
.
GetPlatformCode
()
this
.
GetPlatformCode
()
this
.
keepLifeToken
()
this
.
keepLifeToken
()
},
},
...
...
src/assets/js/common.js
View file @
30a06f86
...
@@ -10,7 +10,7 @@ export default {
...
@@ -10,7 +10,7 @@ export default {
s
[
8
]
=
s
[
13
]
=
s
[
18
]
=
s
[
23
]
=
""
;
s
[
8
]
=
s
[
13
]
=
s
[
18
]
=
s
[
23
]
=
""
;
let
uuid
=
s
.
join
(
""
);
let
uuid
=
s
.
join
(
""
);
console
.
log
(
uuid
)
//
console.log(uuid)
return
uuid
return
uuid
}
}
...
...
src/components/BreadCrumb/index.vue
View file @
30a06f86
...
@@ -34,7 +34,7 @@ export default {
...
@@ -34,7 +34,7 @@ export default {
if
(
allList
[
0
].
path
!==
'/'
&&
allList
[
0
].
path
!==
'/dashbord'
)
{
if
(
allList
[
0
].
path
!==
'/'
&&
allList
[
0
].
path
!==
'/dashbord'
)
{
allList
.
unshift
({
path
:
'/'
,
meta
:
{
title
:
'首页'
}})
allList
.
unshift
({
path
:
'/'
,
meta
:
{
title
:
'首页'
}})
}
}
console
.
log
(
allList
)
//
console.log(allList)
this
.
breadList
=
allList
this
.
breadList
=
allList
},
},
immediate
:
true
immediate
:
true
...
...
src/components/List/List.vue
View file @
30a06f86
...
@@ -67,7 +67,7 @@ export default {
...
@@ -67,7 +67,7 @@ export default {
}
}
},
},
created
()
{
created
()
{
console
.
info
(
this
.
listData
);
//
console.info(this.listData);
},
},
methods
:
{
methods
:
{
/**
/**
...
...
src/components/Maps/maps.vue
View file @
30a06f86
...
@@ -35,9 +35,9 @@ export default {
...
@@ -35,9 +35,9 @@ export default {
},
},
watch
:
{
watch
:
{
polylines
(
newValue
)
{
polylines
(
newValue
)
{
console
.
log
(
newValue
);
//
console.log(newValue);
if
(
newValue
.
length
>
0
)
{
if
(
newValue
.
length
>
0
)
{
console
.
log
(
"我的值变化了"
);
//
console.log("我的值变化了");
this
.
reload
(
newValue
);
this
.
reload
(
newValue
);
}
}
},
},
...
@@ -56,7 +56,7 @@ export default {
...
@@ -56,7 +56,7 @@ export default {
o
.
clearMap
();
// 清除覆盖物
o
.
clearMap
();
// 清除覆盖物
o
.
setMapStyle
(
"amap://styles/macaron"
);
// 自定义的高德地图的样式,我选的是马卡龙
o
.
setMapStyle
(
"amap://styles/macaron"
);
// 自定义的高德地图的样式,我选的是马卡龙
if
(
that
.
type
.
includes
(
"driving"
))
{
if
(
that
.
type
.
includes
(
"driving"
))
{
console
.
log
(
that
.
startLng
,
that
.
startLat
);
//
console.log(that.startLng, that.startLat);
// 点图标
// 点图标
let
marker
=
new
AMap
.
Marker
({
let
marker
=
new
AMap
.
Marker
({
position
:
[
that
.
startLng
,
that
.
startLat
]
position
:
[
that
.
startLng
,
that
.
startLat
]
...
@@ -64,13 +64,13 @@ export default {
...
@@ -64,13 +64,13 @@ export default {
o
.
setZoomAndCenter
(
16
,
[
that
.
startLng
,
that
.
startLat
]);
o
.
setZoomAndCenter
(
16
,
[
that
.
startLng
,
that
.
startLat
]);
marker
.
setMap
(
o
);
marker
.
setMap
(
o
);
o
.
setFitView
();
o
.
setFitView
();
console
.
log
(
1111111111
);
//
console.log(1111111111);
o
.
plugin
([
"AMap.Driving"
],
function
()
{
o
.
plugin
([
"AMap.Driving"
],
function
()
{
var
driving
=
new
AMap
.
Driving
({
var
driving
=
new
AMap
.
Driving
({
map
:
o
,
map
:
o
,
policy
:
"REAL_TRAFFIC"
policy
:
"REAL_TRAFFIC"
});
});
console
.
log
(
22222222
);
//
console.log(22222222);
driving
.
search
(
driving
.
search
(
new
AMap
.
LngLat
(
that
.
startLng
,
that
.
startLat
),
new
AMap
.
LngLat
(
that
.
startLng
,
that
.
startLat
),
new
AMap
.
LngLat
(
that
.
endLng
,
that
.
endLat
),
new
AMap
.
LngLat
(
that
.
endLng
,
that
.
endLat
),
...
@@ -80,13 +80,13 @@ export default {
...
@@ -80,13 +80,13 @@ export default {
},
},
function
(
status
,
result
)
{
function
(
status
,
result
)
{
if
(
status
===
"complete"
)
{
if
(
status
===
"complete"
)
{
console
.
log
(
"绘制成功"
);
//
console.log("绘制成功");
}
else
{
}
else
{
console
.
log
(
"绘制失败"
,
result
);
//
console.log("绘制失败", result);
}
}
}
}
);
);
console
.
log
(
33333333
);
//
console.log(33333333);
o
.
addControl
(
driving
);
o
.
addControl
(
driving
);
// driving.search(
// driving.search(
// new AMap.LngLat(that.startLng, that.startLat),
// new AMap.LngLat(that.startLng, that.startLat),
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
}
}
},
},
click
:
e
=>
{
click
:
e
=>
{
console
.
info
(
e
);
//
console.info(e);
},
},
mouseover
:
e
=>
{
mouseover
:
e
=>
{
// e.target.setOptions({
// e.target.setOptions({
...
...
src/components/Selects/index.vue
View file @
30a06f86
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
Select
=
val
;
Select
=
val
;
}
}
}
else
if
(
!
val
.
includes
(
"999"
))
{
}
else
if
(
!
val
.
includes
(
"999"
))
{
console
.
log
(
"------取消全选----"
);
//
console.log("------取消全选----");
if
(
val
.
length
===
dataSource
.
length
)
{
if
(
val
.
length
===
dataSource
.
length
)
{
if
(
oldVal
.
length
===
dataSource
.
length
-
1
)
{
if
(
oldVal
.
length
===
dataSource
.
length
-
1
)
{
Select
=
[
"999"
].
concat
(
allValues
);
Select
=
[
"999"
].
concat
(
allValues
);
...
...
src/mixins/judgeType.js
View file @
30a06f86
...
@@ -674,7 +674,7 @@ export default {
...
@@ -674,7 +674,7 @@ export default {
}
}
},
},
platformText
(
name
)
{
platformText
(
name
)
{
console
.
log
(
'这里是name'
)
//
console.log('这里是name')
switch
(
name
)
{
switch
(
name
)
{
case
'61fdff1d455c4ab8a2efc564c245b905'
:
case
'61fdff1d455c4ab8a2efc564c245b905'
:
return
'安化玖玖'
return
'安化玖玖'
...
...
src/plugins/paho-mqtt.js
View file @
30a06f86
...
@@ -2169,7 +2169,7 @@ Paho.MQTT = (function(global) {
...
@@ -2169,7 +2169,7 @@ Paho.MQTT = (function(global) {
* @throws {InvalidState} if the client is not connected.
* @throws {InvalidState} if the client is not connected.
*/
*/
this
.
publish
=
function
(
topic
,
payload
,
qos
,
retained
)
{
this
.
publish
=
function
(
topic
,
payload
,
qos
,
retained
)
{
console
.
log
(
"Publising message to: "
,
topic
);
//
console.log("Publising message to: ", topic);
var
message
;
var
message
;
if
(
arguments
.
length
===
0
)
{
if
(
arguments
.
length
===
0
)
{
...
...
src/port/configure.js
View file @
30a06f86
...
@@ -5,31 +5,31 @@
...
@@ -5,31 +5,31 @@
* @time: 2020/4/13 11:52 AM
* @time: 2020/4/13 11:52 AM
*
*
*/
*/
import
{
get
,
post
,
put
}
from
'@/request/http'
import
{
get
,
post
,
put
}
from
'@/request/http'
/*
/*
*获取车辆类型
*获取车辆类型
*/
*/
export
function
getCarType
()
{
export
function
getCarType
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType'
;
return
get
(
url
)
return
get
(
url
)
}
}
/**
/**
* 修改车辆类型
* 修改车辆类型
*
*
*/
*/
export
function
putcartype
(
typeId
,
data
)
{
export
function
putcartype
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType/'
+
typeId
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType/'
+
typeId
;
return
put
(
url
,
data
)
return
put
(
url
,
data
)
}
}
/**
/**
* 添加车辆类型
* 添加车辆类型
*
*
*/
*/
export
function
addputcartype
(
data
)
{
export
function
addputcartype
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType'
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
...
@@ -41,15 +41,15 @@ export function getCarType() {
...
@@ -41,15 +41,15 @@ export function getCarType() {
export
function
getMarkup
()
{
export
function
getMarkup
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount'
;
return
get
(
url
)
return
get
(
url
)
}
}
export
function
addMarkup
(
typeId
,
data
)
{
export
function
addMarkup
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount/'
+
typeId
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount/'
+
typeId
;
return
put
(
url
,
data
)
return
put
(
url
,
data
)
}
}
export
function
updateMarkup
(
data
)
{
export
function
updateMarkup
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount'
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
/**
/**
* 查询围栏
* 查询围栏
...
@@ -59,34 +59,33 @@ export function getMarkup() {
...
@@ -59,34 +59,33 @@ export function getMarkup() {
export
function
getselectAll
()
{
export
function
getselectAll
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/penset/selectAll'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/penset/selectAll'
;
return
get
(
url
)
return
get
(
url
)
}
}
export
function
addselectAll
(
data
)
{
export
function
addselectAll
(
data
)
{
console
.
log
(
JSON
.
stringify
(
data
))
//
console.log(JSON.stringify(data))
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/fence/addfence'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/fence/addfence'
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
export
function
updateselectAll
(
data
)
{
export
function
updateselectAll
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/fence/updateFence'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/fence/updateFence'
;
return
put
(
url
,
data
)
return
put
(
url
,
data
)
}
}
// cityConfig
// cityConfig
/**
/**
* 运力城市列表
* 运力城市列表
* https://hgcx.99zcx.com/hgcxconfig/platformConfig/cityConfig?seachStr=&&page=1&&rows=10
* https://hgcx.99zcx.com/hgcxconfig/platformConfig/cityConfig?seachStr=&&page=1&&rows=10
*
*
*/
*/
export
function
cityConfig
(
page
,
rows
,
keyword
)
{
export
function
cityConfig
(
page
,
rows
,
keyword
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig?seachStr='
+
keyword
+
'&&page='
+
page
+
"&&rows="
+
rows
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig?seachStr='
+
keyword
+
'&&page='
+
page
+
"&&rows="
+
rows
;
return
get
(
url
)
return
get
(
url
)
}
}
export
function
getcity
(
parentid
)
{
export
function
getcity
(
parentid
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/citycode/child/'
+
parentid
;
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/citycode/child/'
+
parentid
;
return
get
(
url
)
return
get
(
url
)
}
}
export
function
addcityConfig
(
data
)
{
export
function
addcityConfig
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig'
;
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig'
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
\ No newline at end of file
src/port/orderOperation/index.js
View file @
30a06f86
...
@@ -4,15 +4,15 @@ import { post, get } from "@/request/http";
...
@@ -4,15 +4,15 @@ import { post, get } from "@/request/http";
/*
/*
*取消订单
*取消订单
*/
*/
export
function
CancelOrder
(
id
)
{
export
function
CancelOrder
(
u
,
id
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/cancelNew/
${
id
}
`
;
const
url
=
u
+
`/xoado/order/cancelNew/
${
id
}
`
;
return
get
(
url
,
{})
return
get
(
url
,
{})
}
}
/*
/*
*强制完单
*强制完单
*/
*/
export
function
updateBatchOrder
(
data
)
{
export
function
updateBatchOrder
(
u
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/update/batch`
;
const
url
=
u
+
`/xoado/order/update/batch`
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
...
@@ -35,7 +35,7 @@ export function getpayInfo(data) {
...
@@ -35,7 +35,7 @@ export function getpayInfo(data) {
/*
/*
*更改支付状态
*更改支付状态
*/
*/
export
function
paymentchannel
(
data
)
{
export
function
paymentchannel
(
u
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/channel/payment`
;
const
url
=
u
+
`/xoado/order/channel/payment`
;
return
post
(
url
,
data
)
return
post
(
url
,
data
)
}
}
\ No newline at end of file
src/request/http.js
View file @
30a06f86
...
@@ -7,16 +7,16 @@
...
@@ -7,16 +7,16 @@
*/
*/
import
axios
from
'axios'
import
axios
from
'axios'
import
{
PLATFORMID
,
contentType
,
requestTimeout
}
from
'@/config/index'
import
{
PLATFORMID
,
contentType
,
requestTimeout
}
from
'@/config/index'
import
store
from
'@/store/index'
import
store
from
'@/store/index'
import
router
from
'@/router'
import
router
from
'@/router'
// 设置请求超时时间
// 设置请求超时时间
axios
.
defaults
.
timeout
=
requestTimeout
axios
.
defaults
.
timeout
=
requestTimeout
// post请求头的设置
// post请求头的设置
axios
.
defaults
.
headers
.
post
[
'Content-Type'
]
=
contentType
axios
.
defaults
.
headers
.
post
[
'Content-Type'
]
=
contentType
axios
.
defaults
.
headers
.
common
[
'XOADOPLATFORMID'
]
=
PLATFORMID
axios
.
defaults
.
headers
.
common
[
'XOADOPLATFORMID'
]
=
PLATFORMID
// 请求拦截 可以在请求之前判断用户是否登录等等一些业务需求
// 请求拦截 可以在请求之前判断用户是否登录等等一些业务需求
axios
.
interceptors
.
request
.
use
(
axios
.
interceptors
.
request
.
use
(
config
=>
{
config
=>
{
// 每次请求发送前判断vuex中是否存在token
// 每次请求发送前判断vuex中是否存在token
...
@@ -111,9 +111,9 @@ axios.interceptors.response.use(
...
@@ -111,9 +111,9 @@ axios.interceptors.response.use(
* @param {Object} params [请求时携带的参数]
* @param {Object} params [请求时携带的参数]
*/
*/
export
function
get
(
url
,
params
,
platformId
)
{
export
function
get
(
url
,
params
,
platformId
)
{
if
(
platformId
)
{
if
(
platformId
)
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
}
else
{
}
else
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
@@ -133,20 +133,20 @@ export function get(url, params, platformId) {
...
@@ -133,20 +133,20 @@ export function get(url, params, platformId) {
* @param {Object} params [请求时携带的参数]
* @param {Object} params [请求时携带的参数]
*/
*/
export
function
post
(
url
,
params
,
platformId
)
{
export
function
post
(
url
,
params
,
platformId
)
{
if
(
platformId
)
{
if
(
platformId
)
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
}
else
{
}
else
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
url
,
"11111"
)
//
console.log(url,"11111")
console
.
log
(
params
)
//
console.log(params)
axios
.
post
(
url
,
params
)
axios
.
post
(
url
,
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
resolve
(
res
,
"4444"
)
resolve
(
res
,
"4444"
)
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
reject
(
err
,
"6666"
)
reject
(
err
,
"6666"
)
})
})
})
})
}
}
...
@@ -157,14 +157,14 @@ export function post(url, params, platformId) {
...
@@ -157,14 +157,14 @@ export function post(url, params, platformId) {
* @param {Object} params [请求时携带的参数]
* @param {Object} params [请求时携带的参数]
*/
*/
export
function
put
(
url
,
params
,
platformId
)
{
export
function
put
(
url
,
params
,
platformId
)
{
if
(
platformId
)
{
if
(
platformId
)
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
}
else
{
}
else
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
url
)
//
console.log(url)
console
.
log
(
params
)
//
console.log(params)
axios
.
put
(
url
,
params
)
axios
.
put
(
url
,
params
)
.
then
(
res
=>
{
.
then
(
res
=>
{
resolve
(
res
)
resolve
(
res
)
...
@@ -181,9 +181,9 @@ export function put(url, params, platformId) {
...
@@ -181,9 +181,9 @@ export function put(url, params, platformId) {
* @param {Object} params [请求时携带的参数]
* @param {Object} params [请求时携带的参数]
*/
*/
export
function
deletes
(
url
,
params
,
platformId
)
{
export
function
deletes
(
url
,
params
,
platformId
)
{
if
(
platformId
)
{
if
(
platformId
)
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
}
else
{
}
else
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
@@ -199,13 +199,13 @@ export function deletes(url, params, platformId) {
...
@@ -199,13 +199,13 @@ export function deletes(url, params, platformId) {
}
}
export
function
postblob
(
url
,
params
,
platformId
)
{
export
function
postblob
(
url
,
params
,
platformId
)
{
if
(
platformId
)
{
if
(
platformId
)
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
platformId
}
else
{
}
else
{
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
axios
.
defaults
.
headers
.
XOADOPLATFORMID
=
PLATFORMID
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
axios
.
post
(
url
,
params
,
{
responseType
:
'blob'
,
timeout
:
600000
})
axios
.
post
(
url
,
params
,
{
responseType
:
'blob'
,
timeout
:
600000
})
.
then
(
res
=>
{
.
then
(
res
=>
{
resolve
(
res
)
resolve
(
res
)
})
})
...
...
src/store/modules/business.js
View file @
30a06f86
...
@@ -37,7 +37,7 @@ const mutations = {
...
@@ -37,7 +37,7 @@ const mutations = {
sessionStorage
.
setItem
(
'productJJInfo'
,
payload
)
sessionStorage
.
setItem
(
'productJJInfo'
,
payload
)
},
},
SET_BRANDLIST
(
state
,
payload
)
{
SET_BRANDLIST
(
state
,
payload
)
{
console
.
log
(
payload
)
//
console.log(payload)
state
.
brandList
=
payload
state
.
brandList
=
payload
sessionStorage
.
setItem
(
'brandList'
,
payload
)
sessionStorage
.
setItem
(
'brandList'
,
payload
)
...
@@ -74,7 +74,7 @@ const actions = {
...
@@ -74,7 +74,7 @@ const actions = {
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/store/modules/user.js
View file @
30a06f86
import
router
,
{
resetRouter
}
from
'@/router/index'
import
router
,
{
resetRouter
}
from
'@/router/index'
import
{
getAppCode
,
keepTokenTime
}
from
'@/port/account'
import
{
getAppCode
,
keepTokenTime
}
from
'@/port/account'
import
axios
from
'axios'
import
axios
from
'axios'
const
state
=
{
const
state
=
{
...
@@ -8,7 +8,7 @@ const state = {
...
@@ -8,7 +8,7 @@ const state = {
platformId
:
sessionStorage
.
getItem
(
'platformId'
)
?
sessionStorage
.
getItem
(
'platformId'
)
:
''
,
// 认证凭证
platformId
:
sessionStorage
.
getItem
(
'platformId'
)
?
sessionStorage
.
getItem
(
'platformId'
)
:
''
,
// 认证凭证
accountPlatformId
:
sessionStorage
.
getItem
(
'accountPlatformId'
)
?
sessionStorage
.
getItem
(
'accountPlatformId'
)
:
''
,
// 账户凭证
accountPlatformId
:
sessionStorage
.
getItem
(
'accountPlatformId'
)
?
sessionStorage
.
getItem
(
'accountPlatformId'
)
:
''
,
// 账户凭证
transportId
:
sessionStorage
.
getItem
(
'transportId'
)
?
sessionStorage
.
getItem
(
'transportId'
)
:
''
,
// 认证凭证
transportId
:
sessionStorage
.
getItem
(
'transportId'
)
?
sessionStorage
.
getItem
(
'transportId'
)
:
''
,
// 认证凭证
userInfo
:
sessionStorage
.
getItem
(
'userInfo'
)
||
{},
// 用户信息
userInfo
:
sessionStorage
.
getItem
(
'userInfo'
)
||
{},
// 用户信息
roles
:
[],
roles
:
[],
roleType
:
sessionStorage
.
getItem
(
'roleType'
)
?
sessionStorage
.
getItem
(
'roleType'
)
:
''
,
roleType
:
sessionStorage
.
getItem
(
'roleType'
)
?
sessionStorage
.
getItem
(
'roleType'
)
:
''
,
roleValue
:
sessionStorage
.
getItem
(
'roleValue'
)
?
sessionStorage
.
getItem
(
'roleValue'
)
:
''
,
roleValue
:
sessionStorage
.
getItem
(
'roleValue'
)
?
sessionStorage
.
getItem
(
'roleValue'
)
:
''
,
...
@@ -64,8 +64,8 @@ const mutations = {
...
@@ -64,8 +64,8 @@ const mutations = {
}
}
const
actions
=
{
const
actions
=
{
loginOut
({
commit
})
{
loginOut
({
commit
})
{
console
.
log
(
'2222'
)
//
console.log('2222')
commit
(
'DEL_TOKEN'
)
commit
(
'DEL_TOKEN'
)
state
.
roleType
=
''
state
.
roleType
=
''
state
.
roleValue
=
''
state
.
roleValue
=
''
...
@@ -77,7 +77,7 @@ const actions = {
...
@@ -77,7 +77,7 @@ const actions = {
}
}
})
})
},
},
PlatformCode
({
commit
})
{
PlatformCode
({
commit
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getAppCode
().
then
(
res
=>
{
getAppCode
().
then
(
res
=>
{
axios
.
defaults
.
headers
.
XOADOAPPACCESSCODE
=
res
;
axios
.
defaults
.
headers
.
XOADOAPPACCESSCODE
=
res
;
...
@@ -88,10 +88,10 @@ const actions = {
...
@@ -88,10 +88,10 @@ const actions = {
})
})
})
})
},
},
_keepTokenTime
({
commit
,
rootGetters
})
{
_keepTokenTime
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
let
_token
=
rootGetters
.
token
;
let
_token
=
rootGetters
.
token
;
keepTokenTime
({
tokenId
:
_token
}).
then
(
res
=>
{
keepTokenTime
({
tokenId
:
_token
}).
then
(
res
=>
{
if
(
res
.
status
==
200
)
{
if
(
res
.
status
==
200
)
{
commit
(
'SET_TOKEN'
,
res
.
data
)
commit
(
'SET_TOKEN'
,
res
.
data
)
}
}
...
@@ -101,17 +101,17 @@ const actions = {
...
@@ -101,17 +101,17 @@ const actions = {
})
})
})
})
},
},
getRoutes
({
commit
,
rootGetters
})
{
getRoutes
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
console
.
log
(
'获取用户对应权限路由成功'
)
//
console.log('获取用户对应权限路由成功')
var
datas
=
{}
var
datas
=
{}
var
userInfo
=
rootGetters
.
nameInfo
;
var
userInfo
=
rootGetters
.
nameInfo
;
datas
=
{
datas
=
{
'name'
:
userInfo
.
name
,
'name'
:
userInfo
.
name
,
'roles'
:
[
'Home'
,
'CompanyInformation'
,
'AccountInformation'
,
'DepartmentInformation'
,
'operationSet'
,
'operationSetIndex'
,
'operationSetInfos'
,
'productinfo'
,
'configure'
,
'configureSetIndex'
,
'configurePage'
,
'configureOrderSet'
,
'sendOrderSet'
,
'operationArea'
,
'operationArea-index1'
,
'operationArea-index2'
,
'operationArea-index3'
,
'DispatchService'
,
'OrderManager'
,
'CollectionManager'
,
'CustomerComplaint'
,
'Statistics'
,
'OrderStatistics'
,
'transportStatistics'
,
'RealtimeData'
,
'Permission'
,
'PageUser'
,
'PageAdmin'
,
'Roles'
,
'RoleManager'
],
'roles'
:
[
'Home'
,
'CompanyInformation'
,
'AccountInformation'
,
'DepartmentInformation'
,
'operationSet'
,
'operationSetIndex'
,
'operationSetInfos'
,
'productinfo'
,
'configure'
,
'configureSetIndex'
,
'configurePage'
,
'configureOrderSet'
,
'sendOrderSet'
,
'operationArea'
,
'operationArea-index1'
,
'operationArea-index2'
,
'operationArea-index3'
,
'DispatchService'
,
'OrderManager'
,
'CollectionManager'
,
'CustomerComplaint'
,
'Statistics'
,
'OrderStatistics'
,
'transportStatistics'
,
'RealtimeData'
,
'Permission'
,
'PageUser'
,
'PageAdmin'
,
'Roles'
,
'RoleManager'
],
}
}
const
{
roles
}
=
datas
;
const
{
roles
}
=
datas
;
commit
(
'SET_ROLES'
,
roles
)
commit
(
'SET_ROLES'
,
roles
)
resolve
(
datas
)
resolve
(
datas
)
},
200
)
},
200
)
...
...
src/views/accountManagement/bankCard.vue
View file @
30a06f86
...
@@ -727,8 +727,8 @@
...
@@ -727,8 +727,8 @@
// result += val.substring(val.length - 4, val.length);
// result += val.substring(val.length - 4, val.length);
// return result;
// return result;
const
addSpace
=
(
v
)
=>
{
const
addSpace
=
(
v
)
=>
{
console
.
log
(
v
)
//
console.log(v)
console
.
log
(
v
.
length
)
//
console.log(v.length)
if
(
v
.
length
>
4
)
{
if
(
v
.
length
>
4
)
{
res
+=
'**** '
;
res
+=
'**** '
;
console
.
log
(
'r============================================'
+
res
)
console
.
log
(
'r============================================'
+
res
)
...
...
src/views/business/orderManagement/index.vue
View file @
30a06f86
...
@@ -513,7 +513,7 @@ export default {
...
@@ -513,7 +513,7 @@ export default {
let
that
=
this
let
that
=
this
setTimeout
(
function
()
{
setTimeout
(
function
()
{
// 打印screenWidth变化的值
// 打印screenWidth变化的值
console
.
log
(
that
.
TableHeight
)
//
console.log(that.TableHeight)
that
.
timer
=
false
that
.
timer
=
false
},
500
)
},
500
)
}
}
...
...
src/views/notice/allNoticeList.vue
View file @
30a06f86
...
@@ -276,7 +276,6 @@ export default {
...
@@ -276,7 +276,6 @@ export default {
};
};
this
.
tableLoading
=
true
;
this
.
tableLoading
=
true
;
this
.
data
=
[];
this
.
data
=
[];
this
.
total
=
0
;
listFindManage
(
params
)
listFindManage
(
params
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
status
===
200
)
{
if
(
res
.
status
===
200
)
{
...
...
src/views/operation/orderDetail.vue
View file @
30a06f86
...
@@ -367,8 +367,11 @@
...
@@ -367,8 +367,11 @@
>
取消订单
>
取消订单
</el-button>
</el-button>
<!-- v-if="dataSource.status * 1
<
3
"
--
>
<!-- v-if="dataSource.status * 1
<
3
"
--
>
<el-button
type=
"primary"
size=
"mini"
@
click=
"driverInfo()"
v-if=
"
<el-button
!!dataSource.driverId"
type=
"primary"
size=
"mini"
@
click=
"driverInfo()"
v-if=
"!!dataSource.driverId"
>
同步司机信息
>
同步司机信息
</el-button>
</el-button>
<!-- v-if="
<!-- v-if="
...
@@ -841,8 +844,9 @@ export default {
...
@@ -841,8 +844,9 @@ export default {
this
.
finishStatus
=
true
;
this
.
finishStatus
=
true
;
},
},
updataBatch
()
{
updataBatch
()
{
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
let
json
=
[{
orderid
:
this
.
finishdata
.
orderId
,
status
:
6
}];
let
json
=
[{
orderid
:
this
.
finishdata
.
orderId
,
status
:
6
}];
updateBatchOrder
(
json
).
then
((
res
)
=>
{
updateBatchOrder
(
brandUrl
,
json
).
then
((
res
)
=>
{
if
(
res
.
status
==
200
)
{
if
(
res
.
status
==
200
)
{
this
.
finishStatus
=
false
;
this
.
finishStatus
=
false
;
this
.
$message
({
this
.
$message
({
...
@@ -889,7 +893,9 @@ export default {
...
@@ -889,7 +893,9 @@ export default {
?
data
.
trealMoney
?
data
.
trealMoney
:
data
.
estimateMoney
,
:
data
.
estimateMoney
,
};
};
paymentchannel
(
json
).
then
((
res
)
=>
{
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
paymentchannel
(
brandUrl
,
json
).
then
((
res
)
=>
{
debugger
;
if
(
res
.
status
==
200
)
{
if
(
res
.
status
==
200
)
{
this
.
paystatus
=
false
;
this
.
paystatus
=
false
;
this
.
$message
({
this
.
$message
({
...
@@ -906,12 +912,12 @@ export default {
...
@@ -906,12 +912,12 @@ export default {
});
});
},
},
pushDrive
()
{
pushDrive
()
{
let
u
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
let
u
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
let
json
=
{
let
json
=
{
platformId
:
this
.
driverdata
.
platformId
,
platformId
:
this
.
driverdata
.
platformId
,
orderId
:
this
.
driverdata
.
orderId
,
orderId
:
this
.
driverdata
.
orderId
,
};
};
pushDriver
(
u
,
json
).
then
((
res
)
=>
{
pushDriver
(
u
,
json
).
then
((
res
)
=>
{
if
(
res
.
status
==
200
)
{
if
(
res
.
status
==
200
)
{
this
.
driverStatus
=
false
;
this
.
driverStatus
=
false
;
this
.
$message
({
this
.
$message
({
...
@@ -935,7 +941,9 @@ export default {
...
@@ -935,7 +941,9 @@ export default {
})
})
.
then
(()
=>
{
.
then
(()
=>
{
// 取消订单
// 取消订单
CancelOrder
(
this
.
orderid
).
then
((
res
)
=>
{
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
CancelOrder
(
brandUrl
,
this
.
orderid
).
then
(
(
res
)
=>
{
if
(
res
.
status
==
200
)
{
if
(
res
.
status
==
200
)
{
this
.
$message
({
this
.
$message
({
type
:
"success"
,
type
:
"success"
,
...
@@ -948,7 +956,8 @@ export default {
...
@@ -948,7 +956,8 @@ export default {
message
:
res
.
msg
,
message
:
res
.
msg
,
});
});
}
}
});
}
);
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
$message
({
this
.
$message
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment