Skip to content

T
TangKuPos
Commit cfaaeaaa authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9bfadc4c 4930d9e1
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 7 deletions
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @ cfaaeaaa
......@@ -123,6 +123,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_padding"
android:text="积分面值:"
android:textColor="@color/black_baozheng"
......@@ -173,6 +175,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:gravity="left"
android:paddingLeft="@dimen/all_padding"
android:text="订单实收满 "
......@@ -221,6 +225,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:gravity="left"
android:paddingLeft="@dimen/all_padding"
android:text="可以使用 "
......@@ -250,6 +256,7 @@
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
......
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ cfaaeaaa
......@@ -196,6 +196,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="会员等级:"
android:textColor="@color/black_baozheng"
......@@ -341,6 +343,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="积分比例:"
android:textColor="@color/black_baozheng"
......@@ -392,6 +396,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="有效期限:"
android:textColor="@color/black_baozheng"
......@@ -445,6 +451,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="商品品类:"
android:textColor="@color/black_baozheng"
......@@ -542,6 +550,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="积分比例:"
android:textColor="@color/black_baozheng"
......@@ -592,6 +602,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="有效期限:"
android:textColor="@color/black_baozheng"
......@@ -638,6 +650,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="有效期限:"
android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @ cfaaeaaa
......@@ -118,12 +118,14 @@
android:textSize="@dimen/et_textsize"/>
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
......@@ -140,7 +142,7 @@
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
>
>
<LinearLayout
......@@ -159,6 +161,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="优惠券面值:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -184,12 +188,14 @@
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -200,6 +206,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="券有效期:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -222,12 +230,14 @@
android:layout_weight="2"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -238,6 +248,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="订单金额满:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -263,12 +275,14 @@
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -279,6 +293,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="每单使用:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -308,6 +324,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
......
app/src/main/res/layout/fragment_bale_edit.xml
View file @ cfaaeaaa
......@@ -125,8 +125,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/cl_title"
android:background="@color/white"
android:orientation="horizontal"
>
android:orientation="horizontal">
<TextView
android:id="@+id/tv_keyword"
......@@ -154,13 +153,19 @@
/>
</LinearLayout>
<View
android:id="@+id/vw"
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:layout_below="@+id/ll_keyword"
android:background="@drawable/up_down_line_gray"></View>
<LinearLayout
android:id="@+id/ll_left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_keyword"
android:orientation="vertical"
>
android:layout_below="@+id/vw"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
......@@ -222,6 +227,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="名称："
android:textColor="@color/black"/>
......@@ -258,6 +265,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="价格："
android:textColor="@color/black"/>
......
app/src/main/res/layout/fragment_bale_index.xml
View file @ cfaaeaaa
......@@ -126,7 +126,7 @@
android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray"
android:background="@drawable/up_down_line_gray"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:orientation="horizontal"
......
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