diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index b45f1c07..fceedc20 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -124,7 +124,7 @@
                   <Option value="DELIVERED">已发货</Option>
                   <Option value="COMPLETED">已完成</Option>
                   <Option value="TAKE">待核验</Option>
-                  <Option value="CANCELLED">已取消</Option>
+                  <Option value="CANCELLED">已关闭</Option>
                 </Select>
               </Form-item>
               <Form-item label="支付状态" prop="payStatus">
@@ -511,7 +511,7 @@
               } else if (params.row.orderStatus == "TAKE") {
                 return h('div', [h('span', {}, '待核验'),]);
               } else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', {}, '已取消'),]);
+                return h('div', [h('span', {}, '已关闭'),]);
               }
             }
           },
diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue
index 24159e1d..2f72f17a 100644
--- a/manager/src/views/order/order/fictitiousOrderList.vue
+++ b/manager/src/views/order/order/fictitiousOrderList.vue
@@ -16,7 +16,7 @@
 <!--              <Option value="TAKE">待核验</Option>-->
 <!--              <Option value="COMPLETE">已完成</Option>-->
 <!--              <Option value="WAIT_PINTUAN">待成团</Option>-->
-<!--              <Option value="CANCELLED">已取消</Option>-->
+<!--              <Option value="CANCELLED">已关闭</Option>-->
 <!--            </Select>-->
 <!--          </Form-item>-->
           <Form-item label="下单时间">
@@ -127,7 +127,7 @@ export default {
             } else if (params.row.orderStatus == "TAKE") {
               return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
             } else if (params.row.orderStatus == "CANCELLED") {
-              return h("div", [h("tag", { props: { color: "red" } }, "已取消")]);
+              return h("div", [h("tag", { props: { color: "red" } }, "已关闭")]);
             }
           }
         },
@@ -191,7 +191,7 @@ export default {
         {title: '已付款', value: 'PAID'},
         {title: '待核验', value: 'TAKE'},
         {title: '已完成', value: 'COMPLETED'},
-        {title: '已取消', value: 'CANCELLED'},
+        {title: '已关闭', value: 'CANCELLED'},
       ],
       currentStatus: ''
     };
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 48910410..89b94643 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -596,6 +596,11 @@ export default {
           key: "num",
           minWidth: 80,
         },
+        {
+          title: "退款数量",
+          key: "returnGoodsNumber",
+          minWidth: 80,
+        },
         {
           title: "小计",
           key: "subTotal",
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index e19727c7..21cbc505 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -66,7 +66,7 @@
 <!--            <Option value="DELIVERED">已发货</Option>-->
 <!--            <Option value="COMPLETED">已完成</Option>-->
 <!--            <Option value="TAKE">待核验</Option>-->
-<!--            <Option value="CANCELLED">已取消</Option>-->
+<!--            <Option value="CANCELLED">已关闭</Option>-->
 <!--            <Option value="STAY_PICKED_UP">待自提</Option>-->
 <!--          </Select>-->
 <!--        </Form-item>-->
@@ -289,7 +289,7 @@ export default {
               ]);
             } else if (params.row.orderStatus == "CANCELLED") {
               return h("div", [
-                h("tag", { props: { color: "red" } }, "已取消"),
+                h("tag", { props: { color: "red" } }, "已关闭"),
               ]);
             }
           },
@@ -332,7 +332,7 @@ export default {
         {title: '待核验', value: 'TAKE'},
         {title: '待自提', value: 'STAY_PICKED_UP'},
         {title: '已完成', value: 'COMPLETED'},
-        {title: '已取消', value: 'CANCELLED'},
+        {title: '已关闭', value: 'CANCELLED'},
 
       ],
       currentStatus: ''
diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
index 42b55ac2..c6bccdb5 100644
--- a/manager/src/views/seller/shop/shopDetail.vue
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -241,7 +241,7 @@
                   <Option value="DELIVERED">已发货</Option>
                   <Option value="COMPLETED">已完成</Option>
                   <Option value="TAKE">待核验</Option>
-                  <Option value="CANCELLED">已取消</Option>
+                  <Option value="CANCELLED">已关闭</Option>
                 </Select>
               </Form-item>
               <Form-item label="支付状态" prop="payStatus">
@@ -660,7 +660,7 @@
               } else if (params.row.orderStatus == "TAKE") {
                 return h('div', [h('span', {}, '待核验'),]);
               } else if (params.row.orderStatus == "CANCELLED") {
-                return h('div', [h('span', {}, '已取消'),]);
+                return h('div', [h('span', {}, '已关闭'),]);
               }
             }
           },
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index a65d2185..9e1c7375 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -217,7 +217,7 @@ export default {
         UNPAID: "未付款",
         PAID: "已付款",
         DELIVERED: "已发货",
-        CANCELLED: "已取消",
+        CANCELLED: "已关闭",
         COMPLETED: "已完成",
         TAKE: "已完成",
       },
diff --git a/manager/src/views/statistics/order/orderDetail.vue b/manager/src/views/statistics/order/orderDetail.vue
index ac2330bd..36ea24cc 100644
--- a/manager/src/views/statistics/order/orderDetail.vue
+++ b/manager/src/views/statistics/order/orderDetail.vue
@@ -93,7 +93,7 @@ export default {
         UNPAID: "未付款",
         PAID: "已付款",
         DELIVERED: "已发货",
-        CANCELLED: "已取消",
+        CANCELLED: "已关闭",
         COMPLETED: "已完成",
         TAKE: "已完成",
       },
diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue
index d08c085d..c8181fb7 100644
--- a/manager/src/views/statistics/order/refundOrder.vue
+++ b/manager/src/views/statistics/order/refundOrder.vue
@@ -81,7 +81,7 @@ export default {
         UNPAID: "未付款",
         PAID: "已付款",
         DELIVERED: "已发货",
-        CANCELLED: "已取消",
+        CANCELLED: "已关闭",
         COMPLETED: "已完成",
         TAKE: "已完成",
       },
diff --git a/seller/src/views/shop/ossManage.vue b/seller/src/views/shop/ossManage.vue
new file mode 100644
index 00000000..b0c12ac6
--- /dev/null
+++ b/seller/src/views/shop/ossManage.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    OSS资源
+    ossManage
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "ossManage"
+  }
+</script>
+
+<style scoped>
+
+</style>