浏览代码

接单接口增加stationId字段

daxu0403 7 年之前
父节点
当前提交
90b99eec1f
共有 2 个文件被更改,包括 32 次插入28 次删除
  1. 30 27
      lib/pages/order_taking_page.dart
  2. 2 1
      lib/util/api.dart

+ 30 - 27
lib/pages/order_taking_page.dart

@@ -32,31 +32,34 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
   @override
   void initState() {
     super.initState();
-    getLine().then((childValue) {
-      getKey('lineIdStr').then((value) {
-        if (value != null) {
-          getOrderList(value, page).then((resp) {
-            if (isNotError(context, resp)) {
-              setState(() {
-                orderList = OrderListObj.fromJson(resp.data).data.items;
-                hasNextPage = OrderListObj.fromJson(resp.data).data.hasNextPage;
-              });
-              lineIdStr = value;
-            }
-          });
-        } else {
-          getOrderList(lineIdStr, page).then((resp) {
-            if (isNotError(context, resp)) {
-              setState(() {
-                orderList = OrderListObj.fromJson(resp.data).data.items;
-                hasNextPage = OrderListObj.fromJson(resp.data).data.hasNextPage;
-              });
-            }
-          });
-        }
+    getKey('stationId').then((value) {
+      stationId = value;
+      getLine().then((childValue) {
+        getKey('lineIdStr').then((value) {
+          if (value != null) {
+            getOrderList(stationId,value, page).then((resp) {
+              if (isNotError(context, resp)) {
+                setState(() {
+                  orderList = OrderListObj.fromJson(resp.data).data.items;
+                  hasNextPage = OrderListObj.fromJson(resp.data).data.hasNextPage;
+                });
+                lineIdStr = value;
+              }
+            });
+          } else {
+            getOrderList(stationId,lineIdStr, page).then((resp) {
+              if (isNotError(context, resp)) {
+                setState(() {
+                  orderList = OrderListObj.fromJson(resp.data).data.items;
+                  hasNextPage = OrderListObj.fromJson(resp.data).data.hasNextPage;
+                });
+              }
+            });
+          }
+        });
       });
-
     });
+
     _scrollController.addListener(() {
       if (!showLineStatus) {
         setState(() {
@@ -68,7 +71,7 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
         if (hasNextPage && loadMoreOrder) {
           loadMoreOrder = false;
           page = ++page;
-          getOrderList(lineIdStr, page).then((resp) {
+          getOrderList(stationId,lineIdStr, page).then((resp) {
             if (isNotError(context, resp)) {
               OrderListObj tempObj = OrderListObj.fromJson(resp.data);
               setState(() {
@@ -298,7 +301,7 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
   Future _onRefresh() async {
     page = 1;
     print(lineIdStr);
-    await getOrderList(lineIdStr, page).then((resp) {
+    await getOrderList(stationId,lineIdStr, page).then((resp) {
       if (isNotError(context, resp)) {
         setState(() {
           orderList = OrderListObj.fromJson(resp.data).data.items;
@@ -315,7 +318,7 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
           setState(() {
             page = ++page;
           });
-          getOrderList(lineIdStr, page).then((resp) {
+          getOrderList(stationId,lineIdStr, page).then((resp) {
             if (resp.success && resp.code == 1) {
               setState(() {
                 orderList.addAll(resp.data.items);
@@ -351,7 +354,7 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
       orderList = [];
       hasNextPage = true;
     });
-    getOrderList(lineIdStr, page).then((resp) {
+    getOrderList(stationId,lineIdStr, page).then((resp) {
       if (isNotError(context, resp)) {
         OrderListObj tempObj = OrderListObj.fromJson(resp.data);
         setState(() {

+ 2 - 1
lib/util/api.dart

@@ -17,8 +17,9 @@ Future checkToken(String token) async{
 }
 
 //获取接单列表
-Future getOrderList(String lineId, int page) async {
+Future getOrderList(String stationId,String lineId, int page) async {
   var response = await Http().post('app/order/wait_order_list_pages', data: {
+    'stationId':stationId,
     'lineId': lineId,
     'limit': limit,
     'page': page