Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
王海
TangKuPos
Commits
271bdd29
Commit
271bdd29
authored
Jan 03, 2018
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改登录UI
parent
7e416277
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
15 deletions
+20
-15
app/src/main/res/layout/activity_marketing_menu.xml
app/src/main/res/layout/activity_marketing_menu.xml
+1
-0
app/src/main/res/layout/dialog_integral_exchange_setting.xml
app/src/main/res/layout/dialog_integral_exchange_setting.xml
+1
-1
app/src/main/res/layout/dialog_integral_get_setting.xml
app/src/main/res/layout/dialog_integral_get_setting.xml
+17
-13
app/src/main/res/layout/dialog_ticket_add_setting.xml
app/src/main/res/layout/dialog_ticket_add_setting.xml
+1
-1
No files found.
app/src/main/res/layout/activity_marketing_menu.xml
View file @
271bdd29
...
...
@@ -28,6 +28,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:background=
"@color/gray_zhouyu"
app:layout_constraintTop_toBottomOf=
"@+id/ic_title"
></android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @
271bdd29
...
...
@@ -263,7 +263,7 @@
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_margin=
"@dimen/all_margin"
android:background=
"@
color/red_guanyu
"
android:background=
"@
drawable/red_border
"
android:onClick=
"@{OnClickListener}"
android:text=
"确定"
android:textColor=
"@color/white"
...
...
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @
271bdd29
...
...
@@ -62,7 +62,7 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@
color/gray_huanggai
"
></View>
android:background=
"@
drawable/red_border
"
></View>
<TextView
android:layout_width=
"match_parent"
...
...
@@ -161,7 +161,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/all_margin"
android:layout_marginRight=
"@dimen/all_
margin
"
android:layout_marginRight=
"@dimen/all_
padding_left_right
"
android:layout_weight=
"1"
android:background=
"@drawable/selector_checkbox_bg"
android:button=
"@null"
...
...
@@ -216,7 +216,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_marginRight=
"@dimen/all_
margin
"
android:layout_marginRight=
"@dimen/all_
padding_left_right
"
android:layout_weight=
"5"
android:drawableRight=
"@mipmap/createstore_drop_down"
android:ems=
"10"
...
...
@@ -370,7 +370,7 @@
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_
margin
"
android:layout_marginRight=
"@dimen/all_
padding_left_right
"
android:layout_weight=
"2"
android:gravity=
"right"
android:text=
"元一个积分"
...
...
@@ -421,7 +421,7 @@
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_
margin
"
android:layout_marginRight=
"@dimen/all_
padding_left_right
"
android:layout_weight=
"2"
android:gravity=
"right"
android:text=
"个月"
...
...
@@ -444,6 +444,7 @@
android:layout_height=
"wrap_content"
android:background=
"@color/white"
android:gravity=
"center"
android:orientation=
"vertical"
android:visibility=
"gone"
>
<LinearLayout
...
...
@@ -458,7 +459,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding
_left_right
"
android:text=
"商品品类:"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -505,6 +506,7 @@
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_marginLeft=
"@dimen/all_padding"
android:layout_marginRight=
"@dimen/all_padding_left_right"
android:layout_weight=
"1.5"
android:drawableRight=
"@mipmap/createstore_drop_down"
android:ellipsize=
"end"
...
...
@@ -534,10 +536,6 @@
android:textSize=
"@dimen/et_textsize"
android:visibility=
"gone"
/>
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"0.5"
/>
</LinearLayout>
...
...
@@ -561,7 +559,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding
_left_right
"
android:text=
"积分比例:"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -582,7 +580,9 @@
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_padding_left_right"
android:layout_weight=
"2"
android:gravity=
"right"
android:text=
"元一个积分"
android:textColor=
"@color/black"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -609,7 +609,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding
_left_right
"
android:text=
"有效期限:"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -632,7 +632,9 @@
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_padding_left_right"
android:layout_weight=
"2"
android:gravity=
"right"
android:text=
"个月"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -653,7 +655,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"2"
android:paddingLeft=
"@dimen/all_padding"
android:paddingLeft=
"@dimen/all_padding
_left_right
"
android:text=
"有效期限:"
android:textColor=
"@color/black_baozheng"
android:textSize=
"@dimen/et_textsize"
/>
...
...
@@ -677,6 +679,8 @@
<TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_padding_left_right"
android:gravity=
"right"
android:layout_weight=
"2"
android:text=
"个月"
android:textColor=
"@color/black_baozheng"
...
...
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @
271bdd29
...
...
@@ -320,7 +320,7 @@
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_margin=
"@dimen/all_margin"
android:background=
"@
color/red_guanyu
"
android:background=
"@
drawable/red_border
"
android:onClick=
"@{OnClickListener}"
android:text=
"确定"
android:textColor=
"@color/white"
...
...
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