From 75ba68eb8d65a32251704c604b3e27f3121808ce Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 07 一月 2021 09:22:58 +0800
Subject: [PATCH] Merge branches 'cargo_small' and 'master' of http://sinata.cn:10101/gitblit/r/android/OkGoinCar into cargo_small
---
app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt b/app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt
index 6fef456..022391a 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabOrderListFragment.kt
@@ -49,7 +49,10 @@
view.tv_start.text = it.startAddress
view.tv_end.text = it.endAddress
view.tv_money.text = it.redMoney.toString() + "元红包"
- view. tv_money_num.text = it.redMoney.toString()+"元"
+ view. tv_money_num.text = it.orderMoney.toString()+"元"
+ if (it.payManner != null){
+ view.tv_money_num.text = it.orderMoney.toString() + "元("+if (it.payManner == 1)"线上)" else "线下)"
+ }
setBlack(getNowTimeBlack(),view)
pop.showCenter(dictorView)
}
@@ -86,4 +89,6 @@
override fun initView() {
}
+
+
}
\ No newline at end of file
--
Gitblit v1.7.1