修改

pages/order/index.vue

@@ -135,27 +135,19 @@
   import { getEmptyPaginateObj, getMoreListData } from '@/core/app'
   import * as OrderApi from '@/api/order'
   import { wxPayment } from '@/core/app'
+import { list } from '../../api/goods'
 
   // 每页记录数量
   const pageSize = 15
 
   // tab栏数据
-  const tabs = [{
+  const tabs = [
-    name: `全部`,
+	  {name: `全部`,value: 'all'}, 
-    value: 'all'
+	  {name: `待付款`,value: 'payment'}, 
-  }, {
+	  {name: `待交付`,value: 'delivery'},
-    name: `待付款`,
+	  {name: `已中止`,value: 'hasabort'}, 
-    value: 'payment'
+	  {name: `已关闭`,value: 'hasclosed'},
-  }, {
+	]
-    name: `待交付`,
-    value: 'delivery'
-  }, {
-    name: `已中止`,
-    value: 'hasabort'
-  }, {
-    name: `已关闭`,
-    value: 'hasclosed'
-  }]
 
   export default {
     components: {
@@ -233,11 +225,12 @@
 
       // 初始化当前选中的标签
       initCurTab(options) {
-        const app = this
+		  console.log("tlist",this.list)
-        if (options.dataType) {
+        // const app = this
-          const index = app.tabs.findIndex(item => item.value == options.dataType)
+        // if (options.dataType) {
-          app.curTab = index > -1 ? index : 0
+        //   const index = app.tabs.findIndex(item => item.value == options.dataType)
-        }
+        //   app.curTab = index > -1 ? index : 0
+        // }
       },
 
       /**
@@ -250,6 +243,7 @@
         // 设置列表数据
         app.getOrderList(page.num)
           .then(list => {
+			  console.log("od list",list)
             const curPageLen = list.data.length
             const totalSize = list.data.total
             app.mescroll.endBySize(curPageLen, totalSize)
@@ -261,12 +255,14 @@
       getOrderList(pageNo = 1) {
         const app = this
         return new Promise((resolve, reject) => {
-			let data = {page:pageNo,limit:pageSize}
+			let data = {pagination:true,sidePagination:"server",queryParamsType:"limit",pageNumber:pageNo,pageSize:pageSize}
 			OrderApi.ordquery(data)
           //OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
             .then(result => {
+				console.log("quod",result)
+				let nlist = {data:result.data}
               // 合并新数据
-              const newList = app.initList(result.data.list)
+              const newList = app.initList(nlist)
               app.list.data = getMoreListData(newList, app.list, pageNo)
               resolve(newList)
             })
@@ -301,6 +297,7 @@
       // 刷新订单列表
       onRefreshList() {
         this.list = getEmptyPaginateObj()
+		
         setTimeout(() => {
           this.mescroll.resetUpScroll()
         }, 120)