Commit 49944a09 authored by shiyl's avatar shiyl

修改自提点地址字端

parent 7d8a1be7
...@@ -81,7 +81,7 @@ data class Shipping( ...@@ -81,7 +81,7 @@ data class Shipping(
var contactName: String? = null,// 自提点联系人 var contactName: String? = null,// 自提点联系人
@SerializedName("phone") @SerializedName("phone")
var phone: String? = null,// 自提点电话 var phone: String? = null,// 自提点电话
@SerializedName("address") @SerializedName("location")
var address: String? = null,// 自提点地址 var location: String? = null,// 自提点地址
) : Parcelable ) : Parcelable
...@@ -142,7 +142,7 @@ class ConfirmOrderViewModel : BaseViewModel() { ...@@ -142,7 +142,7 @@ class ConfirmOrderViewModel : BaseViewModel() {
takePlaceName = point.takePlaceName, takePlaceName = point.takePlaceName,
contactName = point.contactName, contactName = point.contactName,
phone = point.phone, phone = point.phone,
address = point.address location = point.location
) )
} }
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp8" android:layout_marginTop="@dimen/dp8"
android:text="@{vm.selectedPickUpPoint.address}" android:text="@{vm.selectedPickUpPoint.location}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}" app:isShow="@{vm.selectedPickUpPoint.takePlaceName != null}"
......
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