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

请

Browse Source
This commit is contained in:
邓皓元 2019-04-10 16:03:25 +08:00
parent dd8b115cc3
commit 64dc5870c3
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,6 +227,13 @@ class OrderService extends Service
$attributes['order_status'] = (isset($attributes['selected']) && count($attributes['selected']) === $node->counts) ? 5 : ($attributes['order_status'] ?? 0);
$attributes['transaction_status'] = isset($attributes['selected']) ? 1 : ($attributes['transaction_status'] ?? 1);
if ($attributes['order_status'] === 1) {
$count = $this->orderCardPartitionRepository->where('type', $node['type'])->where('order_id', $node['id'])->count();
if ($count) {
throw new ExistedException('订单已排单，不能取消');
}
}
$this->orderRepository->setModel($node)->update($attributes);
if (isset($attributes['unit_price'])) {

4
frontend/src/views/virtual/orders/js/edit.js
View File

@ -126,6 +126,10 @@ export default {
return this.$Message.info("请选择订单时间");
}
if (this.params.unit_price === null) {
return this.$Message.info("请输入价格");
}
this.params.order_at = this.moment(this.params.order_at).format(
"YYYY-MM-DD hh:mm:ss"
);

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

@ -479,7 +479,7 @@ export default {
return h('div', html);
}
if (this.haveJurisdiction('update')) {
if (this.haveJurisdiction('update') && row.order_status !== 1) {
html.push(h('Button', {
props: {
type: 'primary',
@ -496,7 +496,7 @@ export default {
}, '编辑'));
}
if (this.haveJurisdiction('update')) {
if (this.haveJurisdiction('update') && row.order_status !== 1) {
// 排单
if (row.shipments !== row.counts) {
html.push(h('Tooltip', {

1
public/js/app.648d0dbe.js Normal file
View File

File diff suppressed because one or more lines are too long

14
public/js/chunk-8b87cca2.e5cfab85.js Normal file
View File

File diff suppressed because one or more lines are too long

2
resources/views/index.blade.php
View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-8b87cca2.960e50e2.css rel=prefetch><link href=/css/chunk-996b1e80.5cadf3d0.css rel=prefetch><link href=/js/chunk-00ae0766.d130b440.js rel=prefetch><link href=/js/chunk-07a274ec.55e1b3b0.js rel=prefetch><link href=/js/chunk-8b87cca2.d99e3edc.js rel=prefetch><link href=/js/chunk-996b1e80.92847c4e.js rel=prefetch><link href=/css/app.3b594715.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.416c3bfc.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.3b594715.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.416c3bfc.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-8b87cca2.960e50e2.css rel=prefetch><link href=/css/chunk-996b1e80.5cadf3d0.css rel=prefetch><link href=/js/chunk-00ae0766.d130b440.js rel=prefetch><link href=/js/chunk-07a274ec.55e1b3b0.js rel=prefetch><link href=/js/chunk-8b87cca2.e5cfab85.js rel=prefetch><link href=/js/chunk-996b1e80.92847c4e.js rel=prefetch><link href=/css/app.3b594715.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.648d0dbe.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.3b594715.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.648d0dbe.js></script></body></html>