Commit a523f235 authored by Facius's avatar Facius

fix: 代码冲突解决

parent 3931a2d2
......@@ -104,7 +104,7 @@ export default {
showCountTime,
})
},
handleClickButton(item) {
handleClickButton(item, type, showCountTime, auditResults) {
uni.navigateTo({
url:
'pages/order/complete?orderId=' +
......@@ -124,7 +124,9 @@ export default {
'&brandId=' +
item.lianbaoBrandId +
'&auditResults=' +
(item.auditResults ? Object.keys(item.auditResults).join() : ''),
(auditResults ? auditResults.join() : '') +
'&orderNumber=' +
item.orderNumber,
})
},
},
......
......@@ -151,7 +151,7 @@ export default {
})
},
handleClickCellButton(item) {
handleClickCellButton(item, type, showCountTime, auditResults) {
// 去完工
uni.navigateTo({
url:
......@@ -172,7 +172,9 @@ export default {
'&brandId=' +
item.lianbaoBrandId +
'&auditResults=' +
(item.auditResults ? Object.keys(item.auditResults).join() : ''),
(auditResults ? auditResults.join() : '') +
'&orderNumber=' +
item.orderNumber,
})
},
handleClick(item, type, showCountTime) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment