hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

不限制状态可以收款

Browse Source
This commit is contained in:
邓皓元 2018-12-21 18:26:49 +08:00
parent 2cc5b11ede
commit 0cb86f4fbc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Domains/Virtual/Services/OrderService.php
View File

@ -143,10 +143,9 @@ class OrderService extends Service
} }
if (!empty($attributes['extends']) && is_array($attributes['extends'])) { if (!empty($attributes['extends']) && is_array($attributes['extends'])) {
$node->extends = array_merge($node->extends ?? [], $attributes['extends']); $attributes['extends'] = array_merge($node->extends ?: [], $attributes['extends']);
} }
$this->orderRepository->setModel($node)->update($attributes); $this->orderRepository->setModel($node)->update($attributes);
} }

2
frontend/src/views/virtual/orders/js/index.js
View File

@ -165,7 +165,7 @@ export default {
if (this.haveJurisdiction('update')) { if (this.haveJurisdiction('update')) {
// 未收款 -> 已收款 // 未收款 -> 已收款
if (row.transaction_status === 0 && row.order_status !== 1) { if (row.transaction_status === 0) {
html.push(h('Button', { html.push(h('Button', {
props: { props: {
type: 'success', type: 'success',