Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
a523f235
Commit
a523f235
authored
Sep 01, 2021
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 代码冲突解决
parent
3931a2d2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
index.vue
src/pages/mine/history/index.vue
+4
-2
list.vue
src/pages/mine/order/list.vue
+4
-2
No files found.
src/pages/mine/history/index.vue
View file @
a523f235
...
@@ -104,7 +104,7 @@ export default {
...
@@ -104,7 +104,7 @@ export default {
showCountTime
,
showCountTime
,
})
})
},
},
handleClickButton
(
item
)
{
handleClickButton
(
item
,
type
,
showCountTime
,
auditResults
)
{
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
url
:
'pages/order/complete?orderId='
+
'pages/order/complete?orderId='
+
...
@@ -124,7 +124,9 @@ export default {
...
@@ -124,7 +124,9 @@ export default {
'&brandId='
+
'&brandId='
+
item
.
lianbaoBrandId
+
item
.
lianbaoBrandId
+
'&auditResults='
+
'&auditResults='
+
(
item
.
auditResults
?
Object
.
keys
(
item
.
auditResults
).
join
()
:
''
),
(
auditResults
?
auditResults
.
join
()
:
''
)
+
'&orderNumber='
+
item
.
orderNumber
,
})
})
},
},
},
},
...
...
src/pages/mine/order/list.vue
View file @
a523f235
...
@@ -151,7 +151,7 @@ export default {
...
@@ -151,7 +151,7 @@ export default {
})
})
},
},
handleClickCellButton
(
item
)
{
handleClickCellButton
(
item
,
type
,
showCountTime
,
auditResults
)
{
// 去完工
// 去完工
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
url
:
...
@@ -172,7 +172,9 @@ export default {
...
@@ -172,7 +172,9 @@ export default {
'&brandId='
+
'&brandId='
+
item
.
lianbaoBrandId
+
item
.
lianbaoBrandId
+
'&auditResults='
+
'&auditResults='
+
(
item
.
auditResults
?
Object
.
keys
(
item
.
auditResults
).
join
()
:
''
),
(
auditResults
?
auditResults
.
join
()
:
''
)
+
'&orderNumber='
+
item
.
orderNumber
,
})
})
},
},
handleClick
(
item
,
type
,
showCountTime
)
{
handleClick
(
item
,
type
,
showCountTime
)
{
...
...
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