update

pages/order/index/index.vue

@@ -8,8 +8,8 @@
     <view style="padding: 10px 0; background: #fff;">
       <u-tabs
         :list="list"
-        :is-scroll="false"
         :current="current"
+		name="Name"
         @change="change"
         :active-color="mainColor"
         bg-color="#FFF"
@@ -221,15 +221,7 @@ export default {
     return {
       pageTitle: "我的订单",
       current: 0,
-      list: [
-        { name: "全部" },
-        { name: "待付款" },
-        { name: "待发货" },
-        { name: "待收货" },
-        { name: "待评价" },
-        // { name: "已完成" },
-        // { name: "已取消" },
-      ],
+      list: [],
       mainColor: "",
       contentHeight: 0,
       page: 1,
@@ -252,6 +244,17 @@ export default {
         padding: "0 30rpx",
       },
       template_message: [],
+	  msg:{
+		  pageIndex:1,
+		  pageSize:15,
+		  OrderId:0,
+		  OrderType:0,
+		  DeliveryMethod:0,
+		  StartTime:'',
+		  EndTime:'',
+		  OrderStatus:0,
+		  OrderNo:'',
+	  },
     };
   },
   created() {
@@ -280,8 +283,30 @@ export default {
     this.current = option.status || -1;
     this.loading = true;
     this.init();
+	this.getOrderStatus();
   },
   methods: {
+	  getOrderStatus() {
+	  		this.request2(
+	  			{
+	  				url: '/api/order/GetOrderStatusEnumList',
+	  				data: {}
+	  			},
+	  			res => {
+	  				uni.hideNavigationBarLoading();
+	  				if(res.resultCode==1){
+	  					this.isloading = false;
+	  					this.list = res.data;
+	  					let obj={
+	  						Name:'全部',
+	  						Id:0,
+	  					}
+	  					this.list.unshift(obj)
+						console.log("this.list",this.list)
+	  				}
+	  			}
+	  		);
+	  	},
     redirectToDetail(id) {
       uni.navigateTo({
         url: "/pages/order/order-detail?id=" + id,
@@ -315,43 +340,61 @@ export default {
       });
     },
     change(index) {
-      this.current = index;
-      this.page = 1;
-      this.g = [];
-      this.loading = true;
-      this.init();
+		this.current = index;
+		this.msg.OrderStatus=this.list[index].Id;
+		this.msg.pageIndex = 1;
+		this.g = [];
+		this.loading = true;
+		this.init();
     },
     init() {
       this.isover = false;
       let h = this.apiheader();
-      this.request(
-        {
-          url: "",
-          header: h,
-          data: {
-            r: "api/order/list",
-            status: this.current,
-            page: this.page,
-          },
-        },
-        (res) => {
-          this.loading = false;
-          this.g = this.g.concat(res.data.list);
-          this.template_message = res.data.template_message;
-          this.page_count = res.data.pagination.page_count;
-          if (this.page_count == 1) {
-            this.isover = true;
-          }
-        }
-      );
+	  this.request2(
+		{
+			url: '/api/AppletOrder/GetAppletGoodsMyOrderPageList',
+			data: this.msg
+		},
+		res => {
+			uni.hideNavigationBarLoading();
+			if(res.resultCode==1){
+				this.loading = false;
+				this.g = this.g.concat(res.data.pageData);
+				this.page_count = res.data.page_count;
+				if (this.page_count == 1) {
+				  this.isover = true;
+				}
+			}
+		}
+	  );
+      // this.request(
+      //   {
+      //     url: "",
+      //     header: h,
+      //     data: {
+      //       r: "api/order/list",
+      //       status: this.current,
+      //       page: this.page,
+      //     },
+      //   },
+      //   (res) => {
+      //     this.loading = false;
+      //     this.g = this.g.concat(res.data.list);
+      //     this.template_message = res.data.template_message;
+      //     this.page_count = res.data.pagination.page_count;
+      //     if (this.page_count == 1) {
+      //       this.isover = true;
+      //     }
+      //   }
+      // );
     },
     lower(e) {
-      if (this.page < this.page_count) {
-        this.page++;
-        this.init();
-      } else {
-        this.isover = true;
-      }
+      if (this.msg.pageIndex < this.page_count) {
+		  this.msg.pageIndex++;
+		  this.init();
+		} else {
+		  this.isover = true;
+		}
     },
     cancel(e, index) {
       this.showModal = true;