Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
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
1
Merge Requests
1
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
lify
RvApp
Commits
b1071a56
Commit
b1071a56
authored
Nov 08, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复会员订单详情金额显示错误的问题;隐藏订单内部推广人;修改测试环境的ShareInstall
parent
8d13160c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
strings.xml
RvClient/src/sit/res/values/strings.xml
+2
-2
MemberOrderDetailsActivity.java
...module/ui/main/home/order/MemberOrderDetailsActivity.java
+1
-1
rv_act_confim_order.xml
module_home/src/main/res/layout/rv_act_confim_order.xml
+1
-0
activity_confirm_order_travel.xml
...ism/src/main/res/layout/activity_confirm_order_travel.xml
+1
-0
view_member_privilege.xml
plugin_member/src/main/res/layout/view_member_privilege.xml
+1
-0
No files found.
RvClient/src/sit/res/values/strings.xml
View file @
b1071a56
<resources>
<resources>
<string
name=
"app_name"
>
滴房车(测试)
</string>
<string
name=
"app_name"
>
滴房车(测试)
</string>
<string
name=
"share_install_key"
>
7ABKE
AKBFE7ERB
</string>
<string
name=
"share_install_key"
>
7ABKE
7BEK62K22
</string>
<string
name=
"share_install_scheme"
>
fc2761a700
</string>
<string
name=
"share_install_scheme"
>
pcbd5965
</string>
</resources>
</resources>
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/MemberOrderDetailsActivity.java
View file @
b1071a56
...
@@ -170,7 +170,7 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
...
@@ -170,7 +170,7 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
if
(
dataBean
!=
null
)
{
if
(
dataBean
!=
null
)
{
status
=
dataBean
.
getStatus
();
status
=
dataBean
.
getStatus
();
orderAmount
=
dataBean
.
get
Order
Amount
();
orderAmount
=
dataBean
.
get
Real
Amount
();
}
}
/**
/**
*
*
...
...
module_home/src/main/res/layout/rv_act_confim_order.xml
View file @
b1071a56
...
@@ -792,6 +792,7 @@
...
@@ -792,6 +792,7 @@
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_15"
android:layout_marginTop=
"@dimen/size_15"
...
...
module_tourism/src/main/res/layout/activity_confirm_order_travel.xml
View file @
b1071a56
...
@@ -458,6 +458,7 @@
...
@@ -458,6 +458,7 @@
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_15"
android:layout_marginTop=
"@dimen/size_15"
...
...
plugin_member/src/main/res/layout/view_member_privilege.xml
View file @
b1071a56
...
@@ -172,6 +172,7 @@
...
@@ -172,6 +172,7 @@
android:textSize=
"@dimen/sp_12"
/>
android:textSize=
"@dimen/sp_12"
/>
<TextView
<TextView
android:visibility=
"gone"
android:inputType=
"phone"
android:inputType=
"phone"
android:maxLength=
"11"
android:maxLength=
"11"
android:id=
"@+id/tv_inviter_phone"
android:id=
"@+id/tv_inviter_phone"
...
...
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