|
@@ -84,7 +84,7 @@ export default defineComponent({
|
|
|
|
|
|
async getList() {
|
|
|
//避免重复请求
|
|
|
- console.log(this.loading , this.finished)
|
|
|
+ console.log(this.loading, this.finished)
|
|
|
if (this.loading && this.finished) {
|
|
|
return
|
|
|
}
|
|
@@ -130,7 +130,7 @@ export default defineComponent({
|
|
|
let res = await request.get('/api-mall-portal/order/list', {
|
|
|
params: {
|
|
|
...this.params,
|
|
|
- status: '1,2'
|
|
|
+ status: '1,2,3'
|
|
|
}
|
|
|
})
|
|
|
return res
|
|
@@ -285,9 +285,7 @@ export default defineComponent({
|
|
|
default: () => (
|
|
|
<div class={styles.btnList}>
|
|
|
{this.active === '0' &&
|
|
|
- (item.status !== 0 ||
|
|
|
- item.status !== 6) &&
|
|
|
- n.returnStatus < 0 ? (
|
|
|
+ n.returnStatus < 0 && (item.status == 3 ? (item.afterSale == 0) : true) ? (
|
|
|
<Button
|
|
|
size="small"
|
|
|
round
|