Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
49944a09
Commit
49944a09
authored
Sep 14, 2021
by
shiyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改自提点地址字端
parent
7d8a1be7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
OrderConfirmDto.kt
...com/yidian/shenghuoquan/buserorder/dto/OrderConfirmDto.kt
+2
-2
ConfirmOrderViewModel.kt
...henghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
+1
-1
border_activity_confirm_order.xml
...der/src/main/res/layout/border_activity_confirm_order.xml
+1
-1
No files found.
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/dto/OrderConfirmDto.kt
View file @
49944a09
...
@@ -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
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
View file @
49944a09
...
@@ -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
)
)
}
}
...
...
Components/BUserOrder/src/main/res/layout/border_activity_confirm_order.xml
View file @
49944a09
...
@@ -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}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment