Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
cauchy-ui
Commits
262baa76
Commit
262baa76
authored
Jul 16, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 问题修复
parent
edbe4cd3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
46 deletions
+9
-46
App.vue
src/App.vue
+1
-41
httpDecorator.js
src/service/httpDecorator.js
+1
-1
List.vue
src/views/orderList/components/List.vue
+1
-1
index.vue
src/views/orderList/index.vue
+6
-3
No files found.
src/App.vue
View file @
262baa76
...
...
@@ -2,9 +2,7 @@
<div
id=
"app"
>
<cr-nav-bar
v-if=
"header"
:title=
"title"
left-text=
""
@
click-left=
"backFun"
/>
<div
class=
"app"
>
<transition
:name=
"transitionName"
>
<router-view
/>
</transition>
<router-view
/>
</div>
<div
v-if=
"loading"
class=
"loading-container"
>
<cr-loading
class=
"loading"
size=
"24px"
>
加载中...
</cr-loading>
...
...
@@ -44,15 +42,6 @@ export default {
},
$route
(
to
,
from
)
{
routerStorage
(
to
.
path
,
from
.
path
);
const
firstPath
=
[
'
/home
'
,
'
/orderDetail
'
,
'
/payWaiting
'
];
if
(
[
to
.
path
,
from
.
path
].
every
(
v
=>
firstPath
.
includes
(
v
))
||
[
to
.
path
,
from
.
path
].
includes
(
'
/
'
)
)
{
this
.
transitionName
=
''
;
return
;
}
this
.
transitionName
=
this
.
$router
.
isBack
?
'
slide-right
'
:
'
slide-left
'
;
this
.
$router
.
isBack
=
false
;
}
},
...
...
@@ -113,33 +102,4 @@ export default {
.b-t:after {
top: 0;
}
.slide-right-enter-active,
.slide-right-leave-active,
.slide-left-enter-active,
.slide-left-leave-active {
will-change: transform;
transition: all 500ms;
position: absolute;
}
.slide-right-enter {
opacity: 0;
transform: translate3d(-100%, 0, 0);
}
.slide-right-leave-active {
opacity: 0;
transform: translate3d(100%, 0, 0);
}
.slide-left-enter {
opacity: 0;
transform: translate3d(100%, 0, 0);
}
.slide-left-leave-active {
opacity: 0;
transform: translate3d(-100%, 0, 0);
}
</
style
>
src/service/httpDecorator.js
View file @
262baa76
...
...
@@ -8,7 +8,7 @@ const http = new HttpRequest(
{
headers
:
{
'
x-user-terminal
'
:
'
H5
'
,
version
:
appVersion
?.[
1
]
||
'
7.9.0
'
version
:
appVersion
||
'
7.9.0
'
}
},
function
(
msg
)
{
...
...
src/views/orderList/components/List.vue
View file @
262baa76
...
...
@@ -55,7 +55,7 @@
提醒发货
</cr-button>
<cr-button
v-if=
"item.orderStatus ==
3
1"
v-if=
"item.orderStatus ==
4
1"
size=
"small"
plain
type=
"primary"
...
...
src/views/orderList/index.vue
View file @
262baa76
<
template
>
<div
class=
"page page__nopad"
>
<cr-tabs
v-model=
"currentTab"
sticky
:offset-top=
"
isApp ? 0 : 48
"
@
change=
"handleTabChange"
>
<cr-tabs
v-model=
"currentTab"
sticky
:offset-top=
"
tabOffset
"
@
change=
"handleTabChange"
>
<cr-tab
v-for=
"(item, index) in navList"
:key=
"index"
:title=
"item.title"
:name=
"index"
>
<list
:list=
"item.list"
...
...
@@ -17,6 +17,7 @@
import
orderApi
from
'
@/api/order.api
'
;
import
List
from
'
./components/List
'
;
import
{
isApp
}
from
'
@/service/validation.service
'
;
import
Cookie
from
'
@/service/cookieStorage.service
'
;
const
commonParams
=
{
loading
:
false
,
finished
:
false
,
...
...
@@ -31,7 +32,7 @@ export default {
},
data
()
{
return
{
isApp
,
tabOffset
:
isApp
||
Cookie
.
get
(
'
h
'
)
==
'
0
'
?
0
:
48
,
currentTab
:
0
,
navList
:
[
{
...
...
@@ -99,7 +100,9 @@ export default {
this
.
$router
.
push
({
path
:
'
/pay
'
,
query
:
{
orderNo
:
this
.
currentOrder
.
orderNo
}
});
},
toGoods
()
{
this
.
$router
.
push
({
path
:
'
/goods
'
});
this
.
$router
.
push
({
path
:
this
.
isKeyChange
?
'
/vipLife
'
:
'
/home
'
});
},
orderNotify
()
{
this
.
$toast
.
success
(
'
已通知卖家
'
);
...
...
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