- 添加订单取消

- 优化订单列表
- 添加订单备注

admin-web/src/models/order/orderDelivery.js

@@ -0,0 +1,25 @@
+// import { cancelOrder } from '../../services/order';
+//
+// export default {
+//   namespace: 'orderDelivery',
+//
+//   state: {
+//     orderId: 0,
+//     visible: false,
+//   },
+//
+//   effects: {
+//     *getLogistics({ payload }, { call, put }) {},
+//   },
+//
+//   reducers: {
+//     changeVisible(state, { payload }) {
+//       const { orderId, visible } = payload;
+//       return {
+//         ...state,
+//         orderId,
+//         visible,
+//       };
+//     },
+//   },
+// };

admin-web/src/models/order/orderList.js

@@ -1,5 +1,11 @@
 import { message } from 'antd';
-import { orderPage, updateOrderItem, updateOrderItemPayAmount } from '../../services/order';
+import {
+  orderPage,
+  updateOrderItem,
+  updateOrderItemPayAmount,
+  updateRemark,
+  cancelOrder,
+} from '../../services/order';
 
 export default {
   namespace: 'orderList',
@@ -18,6 +24,12 @@ export default {
     orderId: 0,
     orderItemId: 0,
     searchParams: {},
+
+    remarkVisible: false,
+    remark: '',
+
+    orderCancelVisible: false,
+    orderCancelShowOther: false,
   },
 
   effects: {
@@ -70,6 +82,40 @@ export default {
         },
       });
 
+      yield put({
+        type: 'queryPage',
+        payload: {
+          ...searchParams,
+        },
+      });
+    },
+    *updateRemake({ payload }, { call, put }) {
+      const { searchParams, params } = payload;
+      yield call(updateRemark, params);
+      yield put({
+        type: 'changeRemakeVisible',
+        payload: {
+          remarkVisible: false,
+        },
+      });
+
+      yield put({
+        type: 'queryPage',
+        payload: {
+          ...searchParams,
+        },
+      });
+    },
+    *cancelOrder({ payload }, { call, put }) {
+      const { searchParams, params } = payload;
+      yield call(cancelOrder, params);
+      yield put({
+        type: 'changeOrderCancelVisible',
+        payload: {
+          orderCancelVisible: false,
+        },
+      });
+
       yield put({
         type: 'queryPage',
         payload: {
@@ -99,5 +145,23 @@ export default {
         ...payload,
       };
     },
+    changeRemakeVisible(state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      };
+    },
+    changeOrderCancelVisible(state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      };
+    },
+    changeOrderCancelShowOther(state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      };
+    },
   },
 };