|
@@ -297,6 +297,7 @@
|
|
|
android:id="@+id/orderLayout"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:visibility="gone"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/rvUploadData">
|
|
@@ -334,7 +335,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="@dimen/divider_38px"
|
|
|
android:layout_marginTop="@dimen/divider_16px"
|
|
|
- android:text='@{"下单时间:"+payOrder.sendPayTime}'
|
|
|
+ android:text='@{"下单时间:"+payOrder.getPayTimeInfo()}'
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_24px"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
@@ -347,7 +348,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="@dimen/divider_38px"
|
|
|
android:layout_marginTop="@dimen/divider_16px"
|
|
|
- android:text='@{"应付金额:"+payOrder.sendPayTime}'
|
|
|
+ android:text='@{"应付金额:"+payOrder.getPayMoneyInfo()}'
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_24px"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
@@ -360,7 +361,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="@dimen/divider_38px"
|
|
|
android:layout_marginTop="@dimen/divider_16px"
|
|
|
- android:text="@string/paid_in_amount"
|
|
|
+ android:text='@{"实付金额:"+payOrder.getPayMoneyInfo()}'
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_24px"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
@@ -373,7 +374,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="@dimen/divider_38px"
|
|
|
android:layout_marginTop="@dimen/divider_16px"
|
|
|
- android:text="@string/payment_method"
|
|
|
+ android:text='@{"支付方式:"+payOrder.getPayMethodInfo()}'
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_24px"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
@@ -386,14 +387,13 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="@dimen/divider_38px"
|
|
|
android:layout_marginTop="@dimen/divider_16px"
|
|
|
- android:text='@{"支付时间:"+payOrder.sendPayTime}'
|
|
|
+ android:text='@{"支付时间:"+payOrder.getCreateTimeInfo()}'
|
|
|
android:textColor="@color/color_FF333333"
|
|
|
android:textSize="@dimen/divider_24px"
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/tvPaymentMethod" />
|
|
|
|
|
|
-
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatButton
|