diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php
index a47557ad..5e1daad9 100644
--- a/beike/Admin/Http/Controllers/OrderController.php
+++ b/beike/Admin/Http/Controllers/OrderController.php
@@ -50,7 +50,6 @@ class OrderController extends Controller
'order' => $order,
'statuses' => StateMachineService::getInstance($order)->nextBackendStatuses()
];
-dd($data);
return view('admin::pages.orders.form', $data);
}
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 2ee417c6..c52e13cd 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -22,10 +22,6 @@
总计: |
{{ $order->total }} |
-
- | 状态: |
- {{ $order->status }} |
-
@@ -57,15 +53,15 @@
- 待支付
+ {{ __('admin/order.' . $order->status) }}
+ :key="item.status"
+ :label="item.name"
+ :value="item.status">
@@ -157,7 +153,8 @@
el: '#app',
data: {
- statuses: [{"value":"pending","label":"待处理"},{"value":"rejected","label":"已拒绝"},{"value":"approved","label":"已批准(待顾客寄回商品)"},{"value":"shipped","label":"已发货(寄回商品)"},{"value":"completed","label":"已完成"}],
+ // statuses: [{"value":"pending","label":"待处理"},{"value":"rejected","label":"已拒绝"},{"value":"approved","label":"已批准(待顾客寄回商品)"},{"value":"shipped","label":"已发货(寄回商品)"},{"value":"completed","label":"已完成"}],
+ statuses: @json($statuses ?? []),
form: {
status: "",
notify: false,
@@ -169,15 +166,15 @@
}
},
- beforeMount() {
- // let statuses = @json($statuses ?? []);
- // this.statuses = Object.keys(statuses).map(key => {
- // return {
- // value: key,
- // label: statuses[key]
- // }
- // });
- },
+ // beforeMount() {
+ // let statuses = @json($statuses ?? []);
+ // this.statuses = Object.keys(statuses).map(key => {
+ // return {
+ // value: key,
+ // label: statuses[name]
+ // }
+ // });
+ // },
methods: {
submitForm(form) {
@@ -188,8 +185,8 @@
}
$http.put(`/orders/{{ $order->id }}/status`,this.form).then((res) => {
- console.log(res)
layer.msg(res.message);
+ window.location.reload();
})
});
}