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
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
253 additions
and
240 deletions
+253
-240
.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
+6
-5
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
+9
-8
configure.js
src/port/configure.js
+46
-46
index.js
src/port/orderOperation/index.js
+7
-6
http.js
src/request/http.js
+0
-0
business.js
src/store/modules/business.js
+4
-4
user.js
src/store/modules/user.js
+116
-115
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
+28
-19
No files found.
.env.development
View file @
30a06f86
...
...
@@ -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_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'http
s://hgxd.99zcx
.com'
VUE_APP_BASE_API5 = 'http://
192.168.0.251:8181
/brand'
VUE_APP_BASE_API6 = 'http
://192.168.0.251:8182
/transport'
VUE_APP_BASE_API7 = 'http
://192.168.0.251:8185
/operate'
VUE_APP_BASE_API8 = 'http
://192.168.0.251:8183
/trace'
VUE_APP_BASE_API9 = 'http
://192.168.0.251:8195
/payment/'
VUE_APP_BASE_API10 = 'http
://192.168.0.251:8195
/payment/v1/'
VUE_APP_BASE_API4 = 'http
://aitransport.xoado
.com'
VUE_APP_BASE_API5 = 'http://
aitransport.xoado.com
/brand'
VUE_APP_BASE_API6 = 'http
s://projects.xoado.com
/transport'
VUE_APP_BASE_API7 = 'http
s://projects.xoado.com
/operate'
VUE_APP_BASE_API8 = 'http
s://projects.xoado.com
/trace'
VUE_APP_BASE_API9 = 'http
s://account.xoado.com
/payment/'
VUE_APP_BASE_API10 = 'http
s://account.xoado.com
/payment/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_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'
.env.production
View file @
30a06f86
...
...
@@ -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_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'http
s://hgxd.99zcx
.com'
VUE_APP_BASE_API5 = 'http://
192.168.0.251:8181
/brand'
VUE_APP_BASE_API6 = 'http
://192.168.0.251:8182
/transport'
VUE_APP_BASE_API7 = 'http
://192.168.0.251:8185
/operate'
VUE_APP_BASE_API8 = 'http
://192.168.0.251:8183
/trace'
VUE_APP_BASE_API9 = 'http
://192.168.0.251:8195
/payment/'
VUE_APP_BASE_API10 = 'http
://192.168.0.251:8195
/payment/v1/'
VUE_APP_BASE_API4 = 'http
://aitransport.xoado
.com'
VUE_APP_BASE_API5 = 'http://
aitransport.xoado.com
/brand'
VUE_APP_BASE_API6 = 'http
s://projects.xoado.com
/transport'
VUE_APP_BASE_API7 = 'http
s://projects.xoado.com
/operate'
VUE_APP_BASE_API8 = 'http
s://projects.xoado.com
/trace'
VUE_APP_BASE_API9 = 'http
s://account.xoado.com
/payment/'
VUE_APP_BASE_API10 = 'http
s://account.xoado.com
/payment/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_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'
\ No newline at end of file
src/App.vue
View file @
30a06f86
...
...
@@ -29,8 +29,8 @@ export default {
await
this
.
mustFun
();
},
mounted
()
{
console
.
log
(
process
.
env
.
VUE_APP_BASE_API5
)
console
.
log
(
process
.
env
.
VUE_APP_BASE_API6
)
//
console.log(process.env.VUE_APP_BASE_API5)
//
console.log(process.env.VUE_APP_BASE_API6)
this
.
GetPlatformCode
()
this
.
keepLifeToken
()
},
...
...
src/assets/js/common.js
View file @
30a06f86
...
...
@@ -5,13 +5,13 @@ export default {
for
(
let
i
=
0
;
i
<
36
;
i
++
)
{
s
[
i
]
=
hexDigits
.
substr
(
Math
.
floor
(
Math
.
random
()
*
0x10
),
1
);
}
s
[
14
]
=
"4"
;
// bits 12-15 of the time_hi_and_version field to 0010
s
[
19
]
=
hexDigits
.
substr
((
s
[
19
]
&
0x3
)
|
0x8
,
1
);
// bits 6-7 of the clock_seq_hi_and_reserved to 01
s
[
14
]
=
"4"
;
// bits 12-15 of the time_hi_and_version field to 0010
s
[
19
]
=
hexDigits
.
substr
((
s
[
19
]
&
0x3
)
|
0x8
,
1
);
// bits 6-7 of the clock_seq_hi_and_reserved to 01
s
[
8
]
=
s
[
13
]
=
s
[
18
]
=
s
[
23
]
=
""
;
let
uuid
=
s
.
join
(
""
);
console
.
log
(
uuid
)
return
uuid
//
console.log(uuid)
return
uuid
}
}
}
\ No newline at end of file
src/components/BreadCrumb/index.vue
View file @
30a06f86
...
...
@@ -34,7 +34,7 @@ export default {
if
(
allList
[
0
].
path
!==
'/'
&&
allList
[
0
].
path
!==
'/dashbord'
)
{
allList
.
unshift
({
path
:
'/'
,
meta
:
{
title
:
'首页'
}})
}
console
.
log
(
allList
)
//
console.log(allList)
this
.
breadList
=
allList
},
immediate
:
true
...
...
src/components/List/List.vue
View file @
30a06f86
...
...
@@ -67,7 +67,7 @@ export default {
}
},
created
()
{
console
.
info
(
this
.
listData
);
//
console.info(this.listData);
},
methods
:
{
/**
...
...
src/components/Maps/maps.vue
View file @
30a06f86
...
...
@@ -35,9 +35,9 @@ export default {
},
watch
:
{
polylines
(
newValue
)
{
console
.
log
(
newValue
);
//
console.log(newValue);
if
(
newValue
.
length
>
0
)
{
console
.
log
(
"我的值变化了"
);
//
console.log("我的值变化了");
this
.
reload
(
newValue
);
}
},
...
...
@@ -56,7 +56,7 @@ export default {
o
.
clearMap
();
// 清除覆盖物
o
.
setMapStyle
(
"amap://styles/macaron"
);
// 自定义的高德地图的样式,我选的是马卡龙
if
(
that
.
type
.
includes
(
"driving"
))
{
console
.
log
(
that
.
startLng
,
that
.
startLat
);
//
console.log(that.startLng, that.startLat);
// 点图标
let
marker
=
new
AMap
.
Marker
({
position
:
[
that
.
startLng
,
that
.
startLat
]
...
...
@@ -64,13 +64,13 @@ export default {
o
.
setZoomAndCenter
(
16
,
[
that
.
startLng
,
that
.
startLat
]);
marker
.
setMap
(
o
);
o
.
setFitView
();
console
.
log
(
1111111111
);
//
console.log(1111111111);
o
.
plugin
([
"AMap.Driving"
],
function
()
{
var
driving
=
new
AMap
.
Driving
({
map
:
o
,
policy
:
"REAL_TRAFFIC"
});
console
.
log
(
22222222
);
//
console.log(22222222);
driving
.
search
(
new
AMap
.
LngLat
(
that
.
startLng
,
that
.
startLat
),
new
AMap
.
LngLat
(
that
.
endLng
,
that
.
endLat
),
...
...
@@ -80,13 +80,13 @@ export default {
},
function
(
status
,
result
)
{
if
(
status
===
"complete"
)
{
console
.
log
(
"绘制成功"
);
//
console.log("绘制成功");
}
else
{
console
.
log
(
"绘制失败"
,
result
);
//
console.log("绘制失败", result);
}
}
);
console
.
log
(
33333333
);
//
console.log(33333333);
o
.
addControl
(
driving
);
// driving.search(
// new AMap.LngLat(that.startLng, that.startLat),
...
...
@@ -108,7 +108,7 @@ export default {
}
},
click
:
e
=>
{
console
.
info
(
e
);
//
console.info(e);
},
mouseover
:
e
=>
{
// e.target.setOptions({
...
...
src/components/Selects/index.vue
View file @
30a06f86
...
...
@@ -89,7 +89,7 @@ export default {
Select
=
val
;
}
}
else
if
(
!
val
.
includes
(
"999"
))
{
console
.
log
(
"------取消全选----"
);
//
console.log("------取消全选----");
if
(
val
.
length
===
dataSource
.
length
)
{
if
(
oldVal
.
length
===
dataSource
.
length
-
1
)
{
Select
=
[
"999"
].
concat
(
allValues
);
...
...
src/mixins/judgeType.js
View file @
30a06f86
...
...
@@ -674,7 +674,7 @@ export default {
}
},
platformText
(
name
)
{
console
.
log
(
'这里是name'
)
//
console.log('这里是name')
switch
(
name
)
{
case
'61fdff1d455c4ab8a2efc564c245b905'
:
return
'安化玖玖'
...
...
src/plugins/paho-mqtt.js
View file @
30a06f86
...
...
@@ -319,7 +319,7 @@ Paho.MQTT = (function(global) {
remLength
+=
UTF8Length
(
this
.
password
)
+
2
;
break
;
// Subscribe, Unsubscribe can both contain topic strings
// Subscribe, Unsubscribe can both contain topic strings
case
MESSAGE_TYPE
.
SUBSCRIBE
:
first
|=
0x02
;
// Qos = 1;
for
(
var
i
=
0
;
i
<
this
.
topics
.
length
;
i
++
)
{
...
...
@@ -434,10 +434,10 @@ Paho.MQTT = (function(global) {
break
;
// case MESSAGE_TYPE.PUBREC:
// case MESSAGE_TYPE.PUBREL:
// case MESSAGE_TYPE.PUBCOMP:
// break;
// case MESSAGE_TYPE.PUBREC:
// case MESSAGE_TYPE.PUBREL:
// case MESSAGE_TYPE.PUBCOMP:
// break;
case
MESSAGE_TYPE
.
SUBSCRIBE
:
// SUBSCRIBE has a list of topic strings and request QoS
...
...
@@ -454,7 +454,7 @@ Paho.MQTT = (function(global) {
break
;
default
:
// Do nothing.
// Do nothing.
}
return
buffer
;
...
...
@@ -2169,7 +2169,7 @@ Paho.MQTT = (function(global) {
* @throws {InvalidState} if the client is not connected.
*/
this
.
publish
=
function
(
topic
,
payload
,
qos
,
retained
)
{
console
.
log
(
"Publising message to: "
,
topic
);
//
console.log("Publising message to: ", topic);
var
message
;
if
(
arguments
.
length
===
0
)
{
...
...
@@ -2412,4 +2412,4 @@ Paho.MQTT = (function(global) {
export
default
Paho
;
// return PahoMQTT;
// });
// });
\ No newline at end of file
src/port/configure.js
View file @
30a06f86
...
...
@@ -5,31 +5,31 @@
* @time: 2020/4/13 11:52 AM
*
*/
import
{
get
,
post
,
put
}
from
'@/request/http'
import
{
get
,
post
,
put
}
from
'@/request/http'
/*
*获取车辆类型
*/
*获取车辆类型
*/
export
function
getCarType
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType'
;
return
get
(
url
)
}
/**
* 修改车辆类型
*
*/
export
function
putcartype
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType/'
+
typeId
;
return
put
(
url
,
data
)
}
/**
* 添加车辆类型
*
*/
export
function
addputcartype
(
data
)
{
}
/**
* 修改车辆类型
*
*/
export
function
putcartype
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/carType/'
+
typeId
;
return
put
(
url
,
data
)
}
/**
* 添加车辆类型
*
*/
export
function
addputcartype
(
data
)
{
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() {
export
function
getMarkup
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount'
;
return
get
(
url
)
}
export
function
addMarkup
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount/'
+
typeId
;
return
put
(
url
,
data
)
}
export
function
updateMarkup
(
data
)
{
}
export
function
addMarkup
(
typeId
,
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/addAmount/'
+
typeId
;
return
put
(
url
,
data
)
}
export
function
updateMarkup
(
data
)
{
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() {
export
function
getselectAll
()
{
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/penset/selectAll'
;
return
get
(
url
)
}
export
function
addselectAll
(
data
)
{
console
.
log
(
JSON
.
stringify
(
data
))
}
export
function
addselectAll
(
data
)
{
//
console.log(JSON.stringify(data))
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/fence/addfence'
;
return
post
(
url
,
data
)
}
export
function
updateselectAll
(
data
)
{
return
post
(
url
,
data
)
}
export
function
updateselectAll
(
data
)
{
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
*
*/
export
function
cityConfig
(
page
,
rows
,
keyword
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig?seachStr='
+
keyword
+
'&&page='
+
page
+
"&&rows="
+
rows
;
return
get
(
url
)
export
function
cityConfig
(
page
,
rows
,
keyword
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig?seachStr='
+
keyword
+
'&&page='
+
page
+
"&&rows="
+
rows
;
return
get
(
url
)
}
export
function
getcity
(
parentid
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/citycode/child/'
+
parentid
;
return
get
(
url
)
const
url
=
process
.
env
.
VUE_APP_BASE_API3
+
'/location/citycode/child/'
+
parentid
;
return
get
(
url
)
}
export
function
addcityConfig
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig'
;
return
post
(
url
,
data
)
}
const
url
=
process
.
env
.
VUE_APP_BASE_API4
+
'/hgcxconfig/platformConfig/cityConfig'
;
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";
/*
*取消订单
*/
export
function
CancelOrder
(
id
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/cancelNew/
${
id
}
`
;
export
function
CancelOrder
(
u
,
id
)
{
const
url
=
u
+
`/xoado/order/cancelNew/
${
id
}
`
;
return
get
(
url
,
{})
}
/*
*强制完单
*/
export
function
updateBatchOrder
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/update/batch`
;
export
function
updateBatchOrder
(
u
,
data
)
{
const
url
=
u
+
`/xoado/order/update/batch`
;
return
post
(
url
,
data
)
}
...
...
@@ -35,7 +35,7 @@ export function getpayInfo(data) {
/*
*更改支付状态
*/
export
function
paymentchannel
(
data
)
{
const
url
=
process
.
env
.
VUE_APP_BASE_API5
+
`/xoado/order/channel/payment`
;
export
function
paymentchannel
(
u
,
data
)
{
const
url
=
u
+
`/xoado/order/channel/payment`
;
return
post
(
url
,
data
)
}
\ No newline at end of file
src/request/http.js
View file @
30a06f86
This diff is collapsed.
Click to expand it.
src/store/modules/business.js
View file @
30a06f86
...
...
@@ -37,7 +37,7 @@ const mutations = {
sessionStorage
.
setItem
(
'productJJInfo'
,
payload
)
},
SET_BRANDLIST
(
state
,
payload
)
{
console
.
log
(
payload
)
//
console.log(payload)
state
.
brandList
=
payload
sessionStorage
.
setItem
(
'brandList'
,
payload
)
...
...
@@ -72,9 +72,9 @@ const actions = {
/** 测试环境注释 */
res
.
data
.
forEach
(
item
=>
{
item
.
brandUrl
=
item
.
brandUrl
+
'/brand'
;
})
console
.
log
(
res
.
data
);
item
.
brandUrl
=
item
.
brandUrl
+
'/brand'
;
})
//
console.log(res.data);
let
data
=
res
.
data
;
commit
(
'SET_BRANDLIST'
,
JSON
.
stringify
(
data
))
...
...
src/store/modules/user.js
View file @
30a06f86
import
router
,
{
resetRouter
}
from
'@/router/index'
import
{
getAppCode
,
keepTokenTime
}
from
'@/port/account'
import
router
,
{
resetRouter
}
from
'@/router/index'
import
{
getAppCode
,
keepTokenTime
}
from
'@/port/account'
import
axios
from
'axios'
const
state
=
{
code
:
sessionStorage
.
getItem
(
'code'
)
?
sessionStorage
.
getItem
(
'code'
)
:
''
,
// 平台code
token
:
sessionStorage
.
getItem
(
'token'
)
?
sessionStorage
.
getItem
(
'token'
)
:
''
,
// 认证凭证
platformId
:
sessionStorage
.
getItem
(
'platformId'
)
?
sessionStorage
.
getItem
(
'platformId'
)
:
''
,
// 认证凭证
accountPlatformId
:
sessionStorage
.
getItem
(
'accountPlatformId'
)
?
sessionStorage
.
getItem
(
'accountPlatformId'
)
:
''
,
// 账户凭证
transportId
:
sessionStorage
.
getItem
(
'transportId'
)
?
sessionStorage
.
getItem
(
'transportId'
)
:
''
,
// 认证凭证
userInfo
:
sessionStorage
.
getItem
(
'userInfo'
)
||
{},
// 用户信息
roles
:
[],
roleType
:
sessionStorage
.
getItem
(
'roleType'
)
?
sessionStorage
.
getItem
(
'roleType'
)
:
''
,
roleValue
:
sessionStorage
.
getItem
(
'roleValue'
)
?
sessionStorage
.
getItem
(
'roleValue'
)
:
''
,
code
:
sessionStorage
.
getItem
(
'code'
)
?
sessionStorage
.
getItem
(
'code'
)
:
''
,
// 平台code
token
:
sessionStorage
.
getItem
(
'token'
)
?
sessionStorage
.
getItem
(
'token'
)
:
''
,
// 认证凭证
platformId
:
sessionStorage
.
getItem
(
'platformId'
)
?
sessionStorage
.
getItem
(
'platformId'
)
:
''
,
// 认证凭证
accountPlatformId
:
sessionStorage
.
getItem
(
'accountPlatformId'
)
?
sessionStorage
.
getItem
(
'accountPlatformId'
)
:
''
,
// 账户凭证
transportId
:
sessionStorage
.
getItem
(
'transportId'
)
?
sessionStorage
.
getItem
(
'transportId'
)
:
''
,
// 认证凭证
userInfo
:
sessionStorage
.
getItem
(
'userInfo'
)
||
{},
// 用户信息
roles
:
[],
roleType
:
sessionStorage
.
getItem
(
'roleType'
)
?
sessionStorage
.
getItem
(
'roleType'
)
:
''
,
roleValue
:
sessionStorage
.
getItem
(
'roleValue'
)
?
sessionStorage
.
getItem
(
'roleValue'
)
:
''
,
}
const
mutations
=
{
ROLE_VALUE
(
state
,
val
)
{
state
.
roleValue
=
val
sessionStorage
.
setItem
(
'roleValue'
,
val
)
},
ROLE_TYPE
(
state
,
val
)
{
state
.
roleType
=
val
sessionStorage
.
setItem
(
'roleType'
,
val
)
},
SET_CODE
(
state
,
val
)
{
state
.
code
=
val
sessionStorage
.
setItem
(
'code'
,
val
)
},
SET_PLATFORMID
(
state
,
val
)
{
state
.
platformId
=
val
sessionStorage
.
setItem
(
'platformId'
,
val
)
},
SET_TRANSPORTID
(
state
,
val
)
{
state
.
transportId
=
val
sessionStorage
.
setItem
(
'transportId'
,
val
)
},
SET_TOKEN
(
state
,
val
)
{
state
.
token
=
val
sessionStorage
.
setItem
(
'token'
,
val
)
},
DEL_TOKEN
(
state
)
{
state
.
token
=
''
state
.
roles
=
''
sessionStorage
.
removeItem
(
'token'
)
},
SET_ROLES
(
state
,
payload
)
{
state
.
roles
=
payload
},
SET_USERINFO
(
state
,
val
)
{
sessionStorage
.
setItem
(
'userInfo'
,
val
)
state
.
userInfo
=
val
},
SET_ACCOUNTPLATFORMID
(
state
,
val
)
{
state
.
accountPlatformId
=
val
sessionStorage
.
setItem
(
'accountPlatformId'
,
val
)
},
CLEAR_LOGIN
(
state
)
{
sessionStorage
.
removeItem
(
'user'
)
sessionStorage
.
removeItem
(
'userInfo'
)
sessionStorage
.
removeItem
(
'token'
)
state
.
roles
=
[]
},
ROLE_VALUE
(
state
,
val
)
{
state
.
roleValue
=
val
sessionStorage
.
setItem
(
'roleValue'
,
val
)
},
ROLE_TYPE
(
state
,
val
)
{
state
.
roleType
=
val
sessionStorage
.
setItem
(
'roleType'
,
val
)
},
SET_CODE
(
state
,
val
)
{
state
.
code
=
val
sessionStorage
.
setItem
(
'code'
,
val
)
},
SET_PLATFORMID
(
state
,
val
)
{
state
.
platformId
=
val
sessionStorage
.
setItem
(
'platformId'
,
val
)
},
SET_TRANSPORTID
(
state
,
val
)
{
state
.
transportId
=
val
sessionStorage
.
setItem
(
'transportId'
,
val
)
},
SET_TOKEN
(
state
,
val
)
{
state
.
token
=
val
sessionStorage
.
setItem
(
'token'
,
val
)
},
DEL_TOKEN
(
state
)
{
state
.
token
=
''
state
.
roles
=
''
sessionStorage
.
removeItem
(
'token'
)
},
SET_ROLES
(
state
,
payload
)
{
state
.
roles
=
payload
},
SET_USERINFO
(
state
,
val
)
{
sessionStorage
.
setItem
(
'userInfo'
,
val
)
state
.
userInfo
=
val
},
SET_ACCOUNTPLATFORMID
(
state
,
val
)
{
state
.
accountPlatformId
=
val
sessionStorage
.
setItem
(
'accountPlatformId'
,
val
)
},
CLEAR_LOGIN
(
state
)
{
sessionStorage
.
removeItem
(
'user'
)
sessionStorage
.
removeItem
(
'userInfo'
)
sessionStorage
.
removeItem
(
'token'
)
state
.
roles
=
[]
},
}
const
actions
=
{
loginOut
({
commit
})
{
console
.
log
(
'2222'
)
commit
(
'DEL_TOKEN'
)
state
.
roleType
=
''
state
.
roleValue
=
''
resetRouter
()
router
.
push
({
path
:
'/login'
,
query
:
{
redirect
:
'/'
}
})
},
PlatformCode
({
commit
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getAppCode
().
then
(
res
=>
{
axios
.
defaults
.
headers
.
XOADOAPPACCESSCODE
=
res
;
commit
(
'SET_CODE'
,
res
)
resolve
(
res
)
}).
catch
(
err
=>
{
reject
(
err
)
})
})
},
_keepTokenTime
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
let
_token
=
rootGetters
.
token
;
keepTokenTime
({
tokenId
:
_token
}).
then
(
res
=>
{
if
(
res
.
status
==
200
)
{
commit
(
'SET_TOKEN'
,
res
.
data
)
}
resolve
(
res
)
}).
catch
(
err
=>
{
reject
(
err
)
})
})
},
getRoutes
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
setTimeout
(()
=>
{
console
.
log
(
'获取用户对应权限路由成功'
)
var
datas
=
{}
var
userInfo
=
rootGetters
.
nameInfo
;
datas
=
{
'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'
],
}
const
{
roles
}
=
datas
;
commit
(
'SET_ROLES'
,
roles
)
resolve
(
datas
)
},
200
)
})
}
loginOut
({
commit
})
{
//
console.log('2222')
commit
(
'DEL_TOKEN'
)
state
.
roleType
=
''
state
.
roleValue
=
''
resetRouter
()
router
.
push
({
path
:
'/login'
,
query
:
{
redirect
:
'/'
}
})
},
PlatformCode
({
commit
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getAppCode
().
then
(
res
=>
{
axios
.
defaults
.
headers
.
XOADOAPPACCESSCODE
=
res
;
commit
(
'SET_CODE'
,
res
)
resolve
(
res
)
}).
catch
(
err
=>
{
reject
(
err
)
})
})
},
_keepTokenTime
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
let
_token
=
rootGetters
.
token
;
keepTokenTime
({
tokenId
:
_token
}).
then
(
res
=>
{
if
(
res
.
status
==
200
)
{
commit
(
'SET_TOKEN'
,
res
.
data
)
}
resolve
(
res
)
}).
catch
(
err
=>
{
reject
(
err
)
})
})
},
getRoutes
({
commit
,
rootGetters
})
{
return
new
Promise
((
resolve
,
reject
)
=>
{
setTimeout
(()
=>
{
//
console.log('获取用户对应权限路由成功')
var
datas
=
{}
var
userInfo
=
rootGetters
.
nameInfo
;
datas
=
{
'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'
],
}
const
{
roles
}
=
datas
;
commit
(
'SET_ROLES'
,
roles
)
resolve
(
datas
)
},
200
)
})
}
}
export
default
{
namespaced
:
true
,
state
,
mutations
,
actions
}
namespaced
:
true
,
state
,
mutations
,
actions
}
\ No newline at end of file
src/views/accountManagement/bankCard.vue
View file @
30a06f86
...
...
@@ -727,8 +727,8 @@
// result += val.substring(val.length - 4, val.length);
// return result;
const
addSpace
=
(
v
)
=>
{
console
.
log
(
v
)
console
.
log
(
v
.
length
)
//
console.log(v)
//
console.log(v.length)
if
(
v
.
length
>
4
)
{
res
+=
'**** '
;
console
.
log
(
'r============================================'
+
res
)
...
...
src/views/business/orderManagement/index.vue
View file @
30a06f86
...
...
@@ -513,7 +513,7 @@ export default {
let
that
=
this
setTimeout
(
function
()
{
// 打印screenWidth变化的值
console
.
log
(
that
.
TableHeight
)
//
console.log(that.TableHeight)
that
.
timer
=
false
},
500
)
}
...
...
src/views/notice/allNoticeList.vue
View file @
30a06f86
...
...
@@ -276,7 +276,6 @@ export default {
};
this
.
tableLoading
=
true
;
this
.
data
=
[];
this
.
total
=
0
;
listFindManage
(
params
)
.
then
((
res
)
=>
{
if
(
res
.
status
===
200
)
{
...
...
src/views/operation/orderDetail.vue
View file @
30a06f86
...
...
@@ -367,8 +367,11 @@
>
取消订单
</el-button>
<!-- v-if="dataSource.status * 1
<
3
"
--
>
<el-button
type=
"primary"
size=
"mini"
@
click=
"driverInfo()"
v-if=
"
!!dataSource.driverId"
<el-button
type=
"primary"
size=
"mini"
@
click=
"driverInfo()"
v-if=
"!!dataSource.driverId"
>
同步司机信息
</el-button>
<!-- v-if="
...
...
@@ -841,8 +844,9 @@ export default {
this
.
finishStatus
=
true
;
},
updataBatch
()
{
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
let
json
=
[{
orderid
:
this
.
finishdata
.
orderId
,
status
:
6
}];
updateBatchOrder
(
json
).
then
((
res
)
=>
{
updateBatchOrder
(
brandUrl
,
json
).
then
((
res
)
=>
{
if
(
res
.
status
==
200
)
{
this
.
finishStatus
=
false
;
this
.
$message
({
...
...
@@ -889,7 +893,9 @@ export default {
?
data
.
trealMoney
:
data
.
estimateMoney
,
};
paymentchannel
(
json
).
then
((
res
)
=>
{
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
paymentchannel
(
brandUrl
,
json
).
then
((
res
)
=>
{
debugger
;
if
(
res
.
status
==
200
)
{
this
.
paystatus
=
false
;
this
.
$message
({
...
...
@@ -906,12 +912,12 @@ export default {
});
},
pushDrive
()
{
let
u
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
let
u
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
let
json
=
{
platformId
:
this
.
driverdata
.
platformId
,
orderId
:
this
.
driverdata
.
orderId
,
};
pushDriver
(
u
,
json
).
then
((
res
)
=>
{
pushDriver
(
u
,
json
).
then
((
res
)
=>
{
if
(
res
.
status
==
200
)
{
this
.
driverStatus
=
false
;
this
.
$message
({
...
...
@@ -935,20 +941,23 @@ export default {
})
.
then
(()
=>
{
// 取消订单
CancelOrder
(
this
.
orderid
).
then
((
res
)
=>
{
if
(
res
.
status
==
200
)
{
this
.
$message
({
type
:
"success"
,
message
:
"操作成功!"
,
});
this
.
Inquire
();
}
else
{
this
.
$message
({
type
:
"error"
,
message
:
res
.
msg
,
});
let
brandUrl
=
JSON
.
parse
(
this
.
platformInfo
).
brandUrl
;
CancelOrder
(
brandUrl
,
this
.
orderid
).
then
(
(
res
)
=>
{
if
(
res
.
status
==
200
)
{
this
.
$message
({
type
:
"success"
,
message
:
"操作成功!"
,
});
this
.
Inquire
();
}
else
{
this
.
$message
({
type
:
"error"
,
message
:
res
.
msg
,
});
}
}
}
);
);
})
.
catch
(()
=>
{
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