diff --git a/src/views/activity/activityList.vue b/src/views/activity/activityList.vue index bf7d80e..57d992b 100644 --- a/src/views/activity/activityList.vue +++ b/src/views/activity/activityList.vue @@ -272,7 +272,7 @@ export default { methods: { async getActivities(){ const res = await index({ - rows:this.select.pageSize, + page_size:this.select.pageSize, page:this.select.pageIndex, keyword:this.select.keyword }) @@ -282,6 +282,7 @@ export default { pageChange(e){ this.select.pageIndex = e + this.getActivities() }, updateSort(e, id, row) { if (e.keyCode === 13) { diff --git a/src/views/activity/component/showActiveOrder.vue b/src/views/activity/component/showActiveOrder.vue index d91e329..ba2febb 100644 --- a/src/views/activity/component/showActiveOrder.vue +++ b/src/views/activity/component/showActiveOrder.vue @@ -172,6 +172,9 @@ .ivu-modal-close { top: 7px } + /deep/ .ivu-modal-body .el-table{ + height: 50vh !important; + } /deep/ .ivu-modal-fullscreen .el-table{ height: 80vh !important; } diff --git a/src/views/reports/productOrder.vue b/src/views/reports/productOrder.vue index bd24908..901e4fe 100644 --- a/src/views/reports/productOrder.vue +++ b/src/views/reports/productOrder.vue @@ -33,7 +33,7 @@ data() { return { select: { - start_date:'', + start_date:'2000-01-01', end_date:"" }, today:'', diff --git a/src/views/reports/returnOrder.vue b/src/views/reports/returnOrder.vue index a4ddb28..59ab0a7 100644 --- a/src/views/reports/returnOrder.vue +++ b/src/views/reports/returnOrder.vue @@ -39,7 +39,7 @@ data() { return { select: { - start_date:"", + start_date:"2000-01-01", end_date:"" }, dateRange:[], diff --git a/src/views/reports/typeOrder.vue b/src/views/reports/typeOrder.vue index c7f36f8..dad64b0 100644 --- a/src/views/reports/typeOrder.vue +++ b/src/views/reports/typeOrder.vue @@ -40,7 +40,7 @@ data() { return { select: { - start_date: "", + start_date: "2000-01-01", end_date: "", product_type_list: [] }, diff --git a/src/views/reports/userOrder.vue b/src/views/reports/userOrder.vue index dc9e3e6..20f5b6b 100644 --- a/src/views/reports/userOrder.vue +++ b/src/views/reports/userOrder.vue @@ -132,6 +132,12 @@ } ) } }, + { + prop: 'order_finish', + label: '核销数', + width: 180, + align:"center" + }, { prop: 'order_sum', label: '累计下单金额', @@ -144,10 +150,33 @@ } }, { - prop: 'order_finish', - label: '核销数', - width: 180, - align:"center" + prop: 'order', + label: '下单详情', + width: 480, + align:"left", + customFn:(row)=>{ + if(row.order.length>0){ + return row.order.map((k,index)=> { + return (