Skip to content

S
ShenghuoquanBusiness
Commit b0f63d6a authored by yinjiacheng's avatar yinjiacheng
Browse files
Options

fix SHQBD-468 商品列表UI调整

parent 6ed55e37
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 22 deletions
Components/commodity/src/main/res/layout/commodity_item_commodity_audit_list.xml
View file @ b0f63d6a
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="￥" android:text="￥"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_commodity_name" /> app:layout_constraintStart_toStartOf="@id/tv_commodity_name" />
...@@ -89,10 +89,11 @@ ...@@ -89,10 +89,11 @@
android:id="@+id/tv_commodity_price" android:id="@+id/tv_commodity_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp4" android:layout_marginTop="@dimen/dp10"
android:includeFontPadding="false"
android:text="@{@string/commodity_price(data.price)}" android:text="@{@string/commodity_price(data.price)}"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp24" android:textSize="@dimen/sp20"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol" app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol"
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
android:text="@{@string/commodity_original_price((int) data.originalPrice)}" android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp12" android:textSize="@dimen/sp12"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price" app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
......
Components/commodity/src/main/res/layout/commodity_item_commodity_offline_list.xml
View file @ b0f63d6a
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="￥" android:text="￥"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_commodity_name" /> app:layout_constraintStart_toStartOf="@id/tv_commodity_name" />
...@@ -89,10 +89,11 @@ ...@@ -89,10 +89,11 @@
android:id="@+id/tv_commodity_price" android:id="@+id/tv_commodity_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp4" android:layout_marginTop="@dimen/dp10"
android:includeFontPadding="false"
android:text="@{@string/commodity_price(data.price)}" android:text="@{@string/commodity_price(data.price)}"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp24" android:textSize="@dimen/sp20"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol" app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol"
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
android:text="@{@string/commodity_original_price((int) data.originalPrice)}" android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp12" android:textSize="@dimen/sp12"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price" app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
...@@ -119,10 +121,11 @@ ...@@ -119,10 +121,11 @@
android:layout_marginEnd="@dimen/dp25" android:layout_marginEnd="@dimen/dp25"
android:onClick="@{() -> vm.commodityOnline(data)}" android:onClick="@{() -> vm.commodityOnline(data)}"
android:text="@string/up_shelves" android:text="@string/up_shelves"
android:textColor="@color/color_333333" android:textColor="@color/color_1852F1"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_edit"
app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit" app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit"
app:layout_constraintTop_toTopOf="@id/tv_commodity_edit"
tools:text="上架" /> tools:text="上架" />
<View <View
...@@ -130,10 +133,10 @@ ...@@ -130,10 +133,10 @@
android:layout_width="@dimen/dp1" android:layout_width="@dimen/dp1"
android:layout_height="@dimen/dp9" android:layout_height="@dimen/dp9"
android:background="@color/color_F2F2F2" android:background="@color/color_F2F2F2"
app:layout_constraintBottom_toBottomOf="@id/tv_commodity_action" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_edit"
app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit" app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit"
app:layout_constraintStart_toEndOf="@id/tv_commodity_action" app:layout_constraintStart_toEndOf="@id/tv_commodity_action"
app:layout_constraintTop_toTopOf="@id/tv_commodity_action" /> app:layout_constraintTop_toTopOf="@id/tv_commodity_edit" />
<TextView <TextView
android:id="@+id/tv_commodity_edit" android:id="@+id/tv_commodity_edit"
...@@ -143,8 +146,9 @@ ...@@ -143,8 +146,9 @@
android:text="@string/edit" android:text="@string/edit"
android:textColor="@color/color_1852F1" android:textColor="@color/color_1852F1"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_price"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_commodity_price"
tools:text="编辑" /> tools:text="编辑" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
Components/commodity/src/main/res/layout/commodity_item_commodity_online_list.xml
View file @ b0f63d6a
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="￥" android:text="￥"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_commodity_name" /> app:layout_constraintStart_toStartOf="@id/tv_commodity_name" />
...@@ -89,10 +89,11 @@ ...@@ -89,10 +89,11 @@
android:id="@+id/tv_commodity_price" android:id="@+id/tv_commodity_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp4" android:layout_marginTop="@dimen/dp10"
android:includeFontPadding="false"
android:text="@{@string/commodity_price(data.price)}" android:text="@{@string/commodity_price(data.price)}"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp24" android:textSize="@dimen/sp20"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol" app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol"
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
android:text="@{@string/commodity_original_price((int) data.originalPrice)}" android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp12" android:textSize="@dimen/sp12"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price" app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
...@@ -121,8 +123,9 @@ ...@@ -121,8 +123,9 @@
android:text="@string/down_shelves" android:text="@string/down_shelves"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_edit"
app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit" app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit"
app:layout_constraintTop_toTopOf="@id/tv_commodity_edit"
tools:text="下架" /> tools:text="下架" />
<View <View
...@@ -130,10 +133,10 @@ ...@@ -130,10 +133,10 @@
android:layout_width="@dimen/dp1" android:layout_width="@dimen/dp1"
android:layout_height="@dimen/dp9" android:layout_height="@dimen/dp9"
android:background="@color/color_F2F2F2" android:background="@color/color_F2F2F2"
app:layout_constraintBottom_toBottomOf="@id/tv_commodity_action" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_edit"
app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit" app:layout_constraintEnd_toStartOf="@id/tv_commodity_edit"
app:layout_constraintStart_toEndOf="@id/tv_commodity_action" app:layout_constraintStart_toEndOf="@id/tv_commodity_action"
app:layout_constraintTop_toTopOf="@id/tv_commodity_action" /> app:layout_constraintTop_toTopOf="@id/tv_commodity_edit" />
<TextView <TextView
android:id="@+id/tv_commodity_edit" android:id="@+id/tv_commodity_edit"
...@@ -143,8 +146,9 @@ ...@@ -143,8 +146,9 @@
android:text="@string/edit" android:text="@string/edit"
android:textColor="@color/color_1852F1" android:textColor="@color/color_1852F1"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_price"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_commodity_price"
tools:text="编辑" /> tools:text="编辑" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
Components/commodity/src/main/res/layout/commodity_item_commodity_reject_list.xml
View file @ b0f63d6a
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="￥" android:text="￥"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp12"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_commodity_name" /> app:layout_constraintStart_toStartOf="@id/tv_commodity_name" />
...@@ -89,10 +89,11 @@ ...@@ -89,10 +89,11 @@
android:id="@+id/tv_commodity_price" android:id="@+id/tv_commodity_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp4" android:layout_marginTop="@dimen/dp10"
android:includeFontPadding="false"
android:text="@{@string/commodity_price(data.price)}" android:text="@{@string/commodity_price(data.price)}"
android:textColor="@color/color_F26E3D" android:textColor="@color/color_F26E3D"
android:textSize="@dimen/sp24" android:textSize="@dimen/sp20"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol" app:layout_constraintStart_toEndOf="@id/tv_commodity_price_symbol"
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
android:text="@{@string/commodity_original_price((int) data.originalPrice)}" android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
android:textColor="@color/color_999999" android:textColor="@color/color_999999"
android:textSize="@dimen/sp12" android:textSize="@dimen/sp12"
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price" app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_commodity_price" app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
...@@ -120,8 +122,9 @@ ...@@ -120,8 +122,9 @@
android:text="@string/edit" android:text="@string/edit"
android:textColor="@color/color_1852F1" android:textColor="@color/color_1852F1"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@id/tv_commodity_price"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_commodity_price"
tools:text="编辑" /> tools:text="编辑" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
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