Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
Project
Project
Details
Activity
Releases
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
和慭琛
take_order
Commits
b19f341d
Commit
b19f341d
authored
Jan 19, 2021
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
a04a5a02
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
pages.json
take-order/pages.json
+4
-0
detail.vue
take-order/pages/take/detail.vue
+16
-3
rob.vue
take-order/pages/take/rob.vue
+2
-1
No files found.
take-order/pages.json
View file @
b19f341d
...
@@ -31,6 +31,10 @@
...
@@ -31,6 +31,10 @@
{
{
"path"
:
"pages/take/detail"
,
"path"
:
"pages/take/detail"
,
"style"
:
{
"style"
:
{
...
...
take-order/pages/take/detail.vue
View file @
b19f341d
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
TimeID
:
-
1
,
TimeID
:
-
1
,
userType
:
''
,
userType
:
''
,
isContentShow
:
true
,
isContentShow
:
true
,
fromWhere
:
''
,
//退单弹窗相关
//退单弹窗相关
isCancelShow
:
false
,
isCancelShow
:
false
,
result
:{
result
:{
...
@@ -205,6 +205,11 @@
...
@@ -205,6 +205,11 @@
this
.
isBottomShow
=
e
.
isBottomShow
this
.
isBottomShow
=
e
.
isBottomShow
}
}
if
(
e
&&
e
.
fromWhere
){
this
.
fromWhere
=
e
.
fromWhere
}
this
.
datetime
=
this
.
getTime
()
this
.
datetime
=
this
.
getTime
()
//console.log('当前时间:'+this.datetime)
//console.log('当前时间:'+this.datetime)
...
@@ -570,7 +575,7 @@
...
@@ -570,7 +575,7 @@
},
},
//退单点击
cancelClick
:
function
()
{
cancelClick
:
function
()
{
clearTimeout
(
this
.
TimeID
);
clearTimeout
(
this
.
TimeID
);
...
@@ -606,6 +611,8 @@
...
@@ -606,6 +611,8 @@
//退单请求
//退单请求
cancelPost
:
function
(
rejectReason
)
{
cancelPost
:
function
(
rejectReason
)
{
let
that
=
this
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'请稍候'
title
:
'请稍候'
})
})
...
@@ -633,8 +640,14 @@
...
@@ -633,8 +640,14 @@
title
:
'退单成功'
,
title
:
'退单成功'
,
})
})
var
delta
=
1
if
(
that
.
fromWhere
==
'抢单页'
){
delta
=
2
}
setTimeout
(
function
()
{
setTimeout
(
function
()
{
uni
.
navigateBack
({})
uni
.
navigateBack
({
delta
:
delta
})
},
1000
);
},
1000
);
}
else
{
}
else
{
...
...
take-order/pages/take/rob.vue
View file @
b19f341d
...
@@ -521,7 +521,8 @@
...
@@ -521,7 +521,8 @@
setTimeout
(
function
()
{
setTimeout
(
function
()
{
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'/pages/take/detail'
url
:
'/pages/take/detail'
+
'?orderId='
+
that
.
orderId
,
+
'?orderId='
+
that
.
orderId
+
'&fromWhere=抢单页'
,
})
})
},
1000
);
},
1000
);
...
...
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