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
07415e22
Commit
07415e22
authored
May 11, 2022
by
吕海涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改公告
parent
426a3415
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
90 deletions
+89
-90
package-lock.json
package-lock.json
+81
-79
business.js
src/store/modules/business.js
+6
-5
orderDetail.vue
src/views/operation/orderDetail.vue
+2
-6
No files found.
package-lock.json
View file @
07415e22
...
@@ -1715,16 +1715,6 @@
...
@@ -1715,16 +1715,6 @@
"integrity"
:
"sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
,
"integrity"
:
"sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
,
"dev"
:
true
"dev"
:
true
},
},
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"cacache"
:
{
"cacache"
:
{
"version"
:
"13.0.1"
,
"version"
:
"13.0.1"
,
"resolved"
:
"https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz"
,
...
@@ -1751,53 +1741,6 @@
...
@@ -1751,53 +1741,6 @@
"unique-filename"
:
"^1.1.1"
"unique-filename"
:
"^1.1.1"
}
}
},
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.2"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"
,
"integrity"
:
"sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"source-map"
:
{
"source-map"
:
{
"version"
:
"0.6.1"
,
"version"
:
"0.6.1"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
,
...
@@ -1814,16 +1757,6 @@
...
@@ -1814,16 +1757,6 @@
"minipass"
:
"^3.1.1"
"minipass"
:
"^3.1.1"
}
}
},
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
},
"terser-webpack-plugin"
:
{
"terser-webpack-plugin"
:
{
"version"
:
"2.3.8"
,
"version"
:
"2.3.8"
,
"resolved"
:
"https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"
,
"resolved"
:
"https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"
,
...
@@ -1840,18 +1773,6 @@
...
@@ -1840,18 +1773,6 @@
"terser"
:
"^4.6.12"
,
"terser"
:
"^4.6.12"
,
"webpack-sources"
:
"^1.4.3"
"webpack-sources"
:
"^1.4.3"
}
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.8.3"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"
,
"integrity"
:
"sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
}
}
}
}
}
},
},
...
@@ -11876,6 +11797,87 @@
...
@@ -11876,6 +11797,87 @@
}
}
}
}
},
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.8.3"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"
,
"integrity"
:
"sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
},
"dependencies"
:
{
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.2"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"
,
"integrity"
:
"sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
}
}
},
"vue-quill-editor"
:
{
"vue-quill-editor"
:
{
"version"
:
"3.0.6"
,
"version"
:
"3.0.6"
,
"resolved"
:
"https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz"
,
"resolved"
:
"https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz"
,
...
...
src/store/modules/business.js
View file @
07415e22
...
@@ -38,6 +38,7 @@ const mutations = {
...
@@ -38,6 +38,7 @@ const mutations = {
SET_BRANDLIST
(
state
,
payload
)
{
SET_BRANDLIST
(
state
,
payload
)
{
state
.
brandList
=
payload
state
.
brandList
=
payload
sessionStorage
.
setItem
(
'brandList'
,
payload
)
sessionStorage
.
setItem
(
'brandList'
,
payload
)
},
},
DEL_BRANDLIST
(
state
)
{
DEL_BRANDLIST
(
state
)
{
state
.
brandList
=
''
;
state
.
brandList
=
''
;
...
@@ -51,19 +52,18 @@ const mutations = {
...
@@ -51,19 +52,18 @@ const mutations = {
const
actions
=
{
const
actions
=
{
async
getBrandList
({
commit
,
dispatch
,
state
,
rootState
})
{
async
getBrandList
({
commit
,
dispatch
,
state
,
rootState
})
{
console
.
log
(
rootState
)
await
getplatformList
()
await
getplatformList
()
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
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';
// }
// }
// })
// })
...
@@ -75,9 +75,10 @@ const actions = {
...
@@ -75,9 +75,10 @@ const actions = {
})
})
let
data
=
res
.
data
;
let
data
=
res
.
data
;
commit
(
'SET_BRANDLIST'
,
JSON
.
stringify
(
data
))
commit
(
'SET_BRANDLIST'
,
JSON
.
stringify
(
data
))
// resove(data)
}
}
})
})
...
...
src/views/operation/orderDetail.vue
View file @
07415e22
...
@@ -330,7 +330,7 @@
...
@@ -330,7 +330,7 @@
>
{{
finishdata
.
tplateNumber
}}
</span
>
{{
finishdata
.
tplateNumber
}}
</span
>
>
</div>
</div>
<div
style=
"margin-bottom: 10px"
>
<div
style=
"margin-bottom: 10px"
>
<span
<span
><span
><span
style=
"
style=
"
...
@@ -778,6 +778,7 @@ export default {
...
@@ -778,6 +778,7 @@ export default {
userInfo
:
"user/userInfo"
,
userInfo
:
"user/userInfo"
,
}),
}),
brandLists
()
{
brandLists
()
{
let
brandList
=
this
.
$store
.
getters
.
brandList
;
let
brandList
=
this
.
$store
.
getters
.
brandList
;
if
(
brandList
.
length
===
0
)
{
if
(
brandList
.
length
===
0
)
{
return
new
Promise
(()
=>
{
return
new
Promise
(()
=>
{
...
@@ -792,7 +793,6 @@ export default {
...
@@ -792,7 +793,6 @@ export default {
data
()
{
data
()
{
return
{
return
{
platformInfo
:
""
,
platformInfo
:
""
,
optionse
:
"61fdff1d455c4ab8a2efc564c245b905"
,
optionse
:
"61fdff1d455c4ab8a2efc564c245b905"
,
// orderid: "JJNTFZ_20220406164108046_4908288",//强制完单
// orderid: "JJNTFZ_20220406164108046_4908288",//强制完单
orderid
:
""
,
//同步司机信息
orderid
:
""
,
//同步司机信息
...
@@ -1015,9 +1015,6 @@ export default {
...
@@ -1015,9 +1015,6 @@ export default {
this
.
$refs
.
audio
.
pause
();
this
.
$refs
.
audio
.
pause
();
},
},
getOrderInfo
(
obj
)
{
getOrderInfo
(
obj
)
{
this
.
dataSource
=
null
;
this
.
dataSource
=
null
;
console
.
log
(
obj
);
console
.
log
(
obj
);
getThisorderInfo
([
obj
.
orderId
],
obj
.
brandUrl
,
obj
.
platformId
).
then
(
getThisorderInfo
([
obj
.
orderId
],
obj
.
brandUrl
,
obj
.
platformId
).
then
(
...
@@ -1176,7 +1173,6 @@ export default {
...
@@ -1176,7 +1173,6 @@ export default {
try
{
try
{
OrderDetailsSelect
(
OrderDetailsSelect
(
{
{
orderId
:
json
.
orderId
,
orderId
:
json
.
orderId
,
platformId
:
json
.
platformId
,
platformId
:
json
.
platformId
,
...
...
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