zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单取消状态改为已关闭、订单货物展示退款数量

master
15386982806 2024-01-05 10:08:37 +08:00
parent 4565297fe6
commit 21ae217369
9 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manager/src/views/member/list/memberDetail.vue
View File

@ -124,7 +124,7 @@
<Option value="DELIVERED">已发货</Option> <Option value="DELIVERED">已发货</Option>
<Option value="COMPLETED">已完成</Option> <Option value="COMPLETED">已完成</Option>
<Option value="TAKE">待核验</Option> <Option value="TAKE">待核验</Option>
<Option value="CANCELLED">已取消</Option> <Option value="CANCELLED">已关闭</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="支付状态" prop="payStatus"> <Form-item label="支付状态" prop="payStatus">
@ -511,7 +511,7 @@
} else if (params.row.orderStatus == "TAKE") { } else if (params.row.orderStatus == "TAKE") {
return h('div', [h('span', {}, '待核验'),]); return h('div', [h('span', {}, '待核验'),]);
} else if (params.row.orderStatus == "CANCELLED") { } else if (params.row.orderStatus == "CANCELLED") {
return h('div', [h('span', {}, '已取消'),]); return h('div', [h('span', {}, '已关闭'),]);
} }
} }
}, },

6
manager/src/views/order/order/fictitiousOrderList.vue
View File

@ -16,7 +16,7 @@
<!-- <Option value="TAKE">待核验</Option>--> <!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="COMPLETE">已完成</Option>--> <!-- <Option value="COMPLETE">已完成</Option>-->
<!-- <Option value="WAIT_PINTUAN">待成团</Option>--> <!-- <Option value="WAIT_PINTUAN">待成团</Option>-->
<!-- <Option value="CANCELLED">已取消</Option>--> <!-- <Option value="CANCELLED">已关闭</Option>-->
<!-- </Select>--> <!-- </Select>-->
<!-- </Form-item>--> <!-- </Form-item>-->
<Form-item label="下单时间"> <Form-item label="下单时间">
@ -127,7 +127,7 @@ export default {
} else if (params.row.orderStatus == "TAKE") { } else if (params.row.orderStatus == "TAKE") {
return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]); return h("div", [h("tag", { props: { color: "volcano" } }, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") { } 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: 'PAID'},
{title: '待核验', value: 'TAKE'}, {title: '待核验', value: 'TAKE'},
{title: '已完成', value: 'COMPLETED'}, {title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'}, {title: '已关闭', value: 'CANCELLED'},
], ],
currentStatus: '' currentStatus: ''
}; };

5
manager/src/views/order/order/orderDetail.vue
View File

@ -596,6 +596,11 @@ export default {
key: "num", key: "num",
minWidth: 80, minWidth: 80,
}, },
{
title: "退款数量",
key: "returnGoodsNumber",
minWidth: 80,
},
{ {
title: "小计", title: "小计",
key: "subTotal", key: "subTotal",

6
manager/src/views/order/order/orderList.vue
View File

@ -66,7 +66,7 @@
<!-- <Option value="DELIVERED">已发货</Option>--> <!-- <Option value="DELIVERED">已发货</Option>-->
<!-- <Option value="COMPLETED">已完成</Option>--> <!-- <Option value="COMPLETED">已完成</Option>-->
<!-- <Option value="TAKE">待核验</Option>--> <!-- <Option value="TAKE">待核验</Option>-->
<!-- <Option value="CANCELLED">已取消</Option>--> <!-- <Option value="CANCELLED">已关闭</Option>-->
<!-- <Option value="STAY_PICKED_UP">待自提</Option>--> <!-- <Option value="STAY_PICKED_UP">待自提</Option>-->
<!-- </Select>--> <!-- </Select>-->
<!-- </Form-item>--> <!-- </Form-item>-->
@ -289,7 +289,7 @@ export default {
]); ]);
} else if (params.row.orderStatus == "CANCELLED") { } else if (params.row.orderStatus == "CANCELLED") {
return h("div", [ return h("div", [
h("tag", { props: { color: "red" } }, "已取消"), h("tag", { props: { color: "red" } }, "已关闭"),
]); ]);
} }
}, },
@ -332,7 +332,7 @@ export default {
{title: '待核验', value: 'TAKE'}, {title: '待核验', value: 'TAKE'},
{title: '待自提', value: 'STAY_PICKED_UP'}, {title: '待自提', value: 'STAY_PICKED_UP'},
{title: '已完成', value: 'COMPLETED'}, {title: '已完成', value: 'COMPLETED'},
{title: '已取消', value: 'CANCELLED'}, {title: '已关闭', value: 'CANCELLED'},
], ],
currentStatus: '' currentStatus: ''

4
manager/src/views/seller/shop/shopDetail.vue
View File

@ -241,7 +241,7 @@
<Option value="DELIVERED">已发货</Option> <Option value="DELIVERED">已发货</Option>
<Option value="COMPLETED">已完成</Option> <Option value="COMPLETED">已完成</Option>
<Option value="TAKE">待核验</Option> <Option value="TAKE">待核验</Option>
<Option value="CANCELLED">已取消</Option> <Option value="CANCELLED">已关闭</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="支付状态" prop="payStatus"> <Form-item label="支付状态" prop="payStatus">
@ -660,7 +660,7 @@
} else if (params.row.orderStatus == "TAKE") { } else if (params.row.orderStatus == "TAKE") {
return h('div', [h('span', {}, '待核验'),]); return h('div', [h('span', {}, '待核验'),]);
} else if (params.row.orderStatus == "CANCELLED") { } else if (params.row.orderStatus == "CANCELLED") {
return h('div', [h('span', {}, '已取消'),]); return h('div', [h('span', {}, '已关闭'),]);
} }
} }
}, },

2
manager/src/views/statistics/order.vue
View File

@ -217,7 +217,7 @@ export default {
UNPAID: "未付款", UNPAID: "未付款",
PAID: "已付款", PAID: "已付款",
DELIVERED: "已发货", DELIVERED: "已发货",
CANCELLED: "已取消", CANCELLED: "已关闭",
COMPLETED: "已完成", COMPLETED: "已完成",
TAKE: "已完成", TAKE: "已完成",
}, },

2
manager/src/views/statistics/order/orderDetail.vue
View File

@ -93,7 +93,7 @@ export default {
UNPAID: "未付款", UNPAID: "未付款",
PAID: "已付款", PAID: "已付款",
DELIVERED: "已发货", DELIVERED: "已发货",
CANCELLED: "已取消", CANCELLED: "已关闭",
COMPLETED: "已完成", COMPLETED: "已完成",
TAKE: "已完成", TAKE: "已完成",
}, },

2
manager/src/views/statistics/order/refundOrder.vue
View File

@ -81,7 +81,7 @@ export default {
UNPAID: "未付款", UNPAID: "未付款",
PAID: "已付款", PAID: "已付款",
DELIVERED: "已发货", DELIVERED: "已发货",
CANCELLED: "已取消", CANCELLED: "已关闭",
COMPLETED: "已完成", COMPLETED: "已完成",
TAKE: "已完成", TAKE: "已完成",
}, },

16
seller/src/views/shop/ossManage.vue Normal file
View File

@ -0,0 +1,16 @@
<template>
<div>
OSS资源
ossManage
</div>
</template>
<script>
export default {
name: "ossManage"
}
</script>
<style scoped>
</style>