up

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) {

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;
     }

src/views/reports/productOrder.vue

@@ -33,7 +33,7 @@
     data() {
       return {
         select: {
-          start_date:'',
+          start_date:'2000-01-01',
           end_date:""
         },
         today:'',

src/views/reports/returnOrder.vue

@@ -39,7 +39,7 @@
     data() {
       return {
         select: {
-          start_date:"",
+          start_date:"2000-01-01",
           end_date:""
         },
         dateRange:[],

src/views/reports/typeOrder.vue

@@ -40,7 +40,7 @@
     data() {
       return {
         select: {
-          start_date: "",
+          start_date: "2000-01-01",
           end_date: "",
           product_type_list: []
         },

src/views/reports/userOrder.vue

@@ -132,6 +132,12 @@
                 } </span>)
               }
           },
+          {
+            prop: 'order_finish',
+            label: '核销数',
+            width: 180,
+            align:"center"
+          },
           {
             prop: 'order_sum',
             label: '累计下单金额',
@@ -144,10 +150,33 @@
             }
           },
           {
-            prop: 'order_finish',
+            prop: 'order',
-            label: '核销数',
+            label: '下单详情',
-            width: 180,
+            width: 480,
-            align:"center"
+            align:"left",
+            customFn:(row)=>{
+              if(row.order.length>0){
+                return row.order.map((k,index)=> {
+                    return (<div style={{'cursor':'pointer','padding':'1px'}}
+                    on = {
+                      {
+                        ['click']: (e) => {
+                          this.$router.push({
+                              path:  `/order/orderList?order_item_id=${k.items.id}`,
+                          })
+                        }
+                      }
+                    }>
+                      <div>
+                        <span style={{'color':k.state=='finished'?'red':'#000'}}>{index+1}、{k.state_name}</span>-
+                        <span>{k.created_at}</span>-
+                        <span>{ k.order_name}</span>
+                      </div>
+                    </div>)
+                })
+              }
+
+            }
           },
           {
             prop: 'due_date',