From c2877e03172d68af0a0eacd56ac0f5d4c67c6f26 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期一, 02 十一月 2020 15:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
index e30ec6d..0d7d271 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabMainFragment.kt
@@ -35,7 +35,7 @@
         if (!data.data.isNullOrEmpty()) {
             if ((data.data[0].state == 2 || data.data[0].state == 3 || data.data[0].state == 4 || data.data[0].state == 5 || data.data[0].state == 6) && data.data.size >= 1) {
                 MyApplication.currentOrderId = data.data[0].id.toString()
-                MyApplication.currentOrderId = data.data[0].type.toString()
+                MyApplication.currentOrderType = data.data[0].type.toString()
             }
         }
         return data.data

--
Gitblit v1.7.1