Commit 911769c6 authored by yinjiacheng's avatar yinjiacheng

update 订单详情页合计金额UI

parent 2f4c5a71
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
android:id="@+id/tv_coupon_amount" android:id="@+id/tv_coupon_amount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{@string/discount_amount(data.discountFee)}" android:text='@{"- " + @string/amount(data.discountFee)}'
android:textColor="@color/color_FB4653" android:textColor="@color/color_FB4653"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
android:visibility="@{data.couponList.size() > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{data.couponList.size() > 0 ? View.VISIBLE : View.GONE}"
...@@ -180,6 +180,17 @@ ...@@ -180,6 +180,17 @@
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount" app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount"
app:layout_constraintEnd_toStartOf="@id/tv_total_amount_symbol" />
<TextView
android:id="@+id/tv_total_amount_symbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/renminbi"
android:textColor="@color/black"
android:textSize="@dimen/sp14"
android:textStyle="bold"
app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount"
app:layout_constraintEnd_toStartOf="@id/tv_total_amount" /> app:layout_constraintEnd_toStartOf="@id/tv_total_amount" />
<TextView <TextView
...@@ -187,7 +198,7 @@ ...@@ -187,7 +198,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp24" android:layout_marginTop="@dimen/dp24"
android:text="@{@string/amount(data.payment)}" android:text='@{String.format("%.2f", data.payment)}'
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp18" android:textSize="@dimen/sp18"
android:textStyle="bold" android:textStyle="bold"
......
...@@ -31,6 +31,5 @@ ...@@ -31,6 +31,5 @@
<string name="pickup_point_distance">距您: %fkm</string> <string name="pickup_point_distance">距您: %fkm</string>
<string name="commodity_count">共%d件</string> <string name="commodity_count">共%d件</string>
<string name="amount">¥%.2f</string> <string name="amount">¥%.2f</string>
<string name="discount_amount">- ¥%.2f</string>
<string name="pickup_point_contract_name">提货点联系人: %s</string> <string name="pickup_point_contract_name">提货点联系人: %s</string>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment