diff --git a/src/views/order/index/config/content.ts b/src/views/order/index/config/content.ts index 7751154..801afa2 100644 --- a/src/views/order/index/config/content.ts +++ b/src/views/order/index/config/content.ts @@ -23,8 +23,7 @@ const contentConfig: IContentConfig = { } return OrderApi.getList(params); }, - indexActionData: { - }, + indexActionData: {}, // deleteAction: OrderApi.delete, // modifyAction: function (data) { // // return OrderApi.edit(data); @@ -46,28 +45,30 @@ const contentConfig: IContentConfig = { label: "订单号信息", align: "center", prop: "orderNo", + templet: "custom", + slotName: "orderNo", }, { label: "商品信息", align: "center", - templet: 'custom', - prop: 'goods', - slotName: 'goods', + templet: "custom", + prop: "goods", + slotName: "goods", width: 240, }, { label: "台桌信息", align: "center", - templet: 'custom', - slotName: 'table', + templet: "custom", + slotName: "table", width: 150, }, { label: "订单原金额 不含折扣价格", align: "center", prop: "originAmount", - templet: 'custom', - slotName: 'originAmount', + templet: "custom", + slotName: "originAmount", width: 120, hidden: true, }, @@ -117,7 +118,7 @@ const contentConfig: IContentConfig = { fixed: "right", width: 150, templet: "custom", - slotName: 'operate' + slotName: "operate", }, ], }; diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue index 2913dbb..a5ad6d6 100644 --- a/src/views/order/index/index.vue +++ b/src/views/order/index/index.vue @@ -5,9 +5,9 @@ {{ returnOriginAmount(scope.row) }} + + + - + @@ -317,7 +331,9 @@ function showdetail(row: OrderInfoVo) { .goods_info { .row { display: flex; - + flex-direction: column; + justify-content: center; + align-items: center; &:not(:first-child) { margin-top: 10px; } @@ -331,8 +347,7 @@ function showdetail(row: OrderInfoVo) { flex: 1; display: flex; flex-direction: column; - padding-left: 10px; - + margin-top: 2px; .sku { color: #999; } diff --git a/src/views/product/category.vue b/src/views/product/category.vue index 0508e84..6546862 100644 --- a/src/views/product/category.vue +++ b/src/views/product/category.vue @@ -7,39 +7,73 @@ @reset-click="handleResetClick" /> --> - + + + - + - +