Commit d79feb74 authored by yinjiacheng's avatar yinjiacheng

fix 订单详情页、选择自提点页UI走查

parent 215352f2
...@@ -80,7 +80,7 @@ class PickupPointListAdapter(data: List<PickupPoint>?) : RecyclerView.Adapter<Pi ...@@ -80,7 +80,7 @@ class PickupPointListAdapter(data: List<PickupPoint>?) : RecyclerView.Adapter<Pi
class PickupPointListItemDecoration : RecyclerView.ItemDecoration() { class PickupPointListItemDecoration : RecyclerView.ItemDecoration() {
override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
outRect.top = DensityUtil.dp2px(28F) outRect.bottom = DensityUtil.dp2px(28F)
} }
} }
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:id="@+id/sv_order_status" android:id="@+id/sv_order_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp20" android:layout_marginTop="@dimen/dp16"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
android:id="@+id/pv_pickup_point_info" android:id="@+id/pv_pickup_point_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp20" android:layout_marginTop="@dimen/dp16"
app:layout_constraintTop_toBottomOf="@id/sv_order_status" /> app:layout_constraintTop_toBottomOf="@id/sv_order_status" />
<com.yidian.shenghuoquan.buserorder.ui.widget.OrderConsigneeInfoView <com.yidian.shenghuoquan.buserorder.ui.widget.OrderConsigneeInfoView
......
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="@dimen/dp16" android:layout_marginStart="@dimen/dp16"
android:layout_marginTop="@dimen/dp20" android:layout_marginTop="@dimen/dp16"
android:layout_marginEnd="@dimen/dp16" android:layout_marginEnd="@dimen/dp16"
android:layout_marginBottom="@dimen/dp20" android:layout_marginBottom="@dimen/dp16"
android:background="@drawable/shape_solid_ffffff_corner_20" android:background="@drawable/shape_solid_ffffff_corner_20"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_nearby_pickup_point"> app:layout_constraintTop_toBottomOf="@id/tv_nearby_pickup_point">
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:overScrollMode="never" android:overScrollMode="never"
android:paddingStart="@dimen/dp16" android:paddingStart="@dimen/dp16"
android:paddingTop="@dimen/dp20"
android:paddingEnd="@dimen/dp16" /> android:paddingEnd="@dimen/dp16" />
<com.yidian.bcommon.widget.CommonEmptyPageView <com.yidian.bcommon.widget.CommonEmptyPageView
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
android:text="@{@string/amount(data.price)}" android:text="@{@string/amount(data.price)}"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_commodity_name" app:layout_constraintStart_toStartOf="@id/tv_commodity_name"
app:layout_constraintTop_toBottomOf="@id/tv_commodity_count" app:layout_constraintTop_toBottomOf="@id/tv_commodity_count"
tools:text="¥15.00" /> tools:text="¥15.00" />
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
android:text="@{data.marketingName}" android:text="@{data.marketingName}"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/sp16" android:textSize="@dimen/sp16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="拼餐优惠多多拼餐优惠多多拼餐优惠多多拼餐优惠多多拼餐优惠多多" /> tools:text="拼餐优惠多多拼餐优惠多多拼餐优惠多多拼餐优惠多多拼餐优惠多多" />
...@@ -192,7 +193,6 @@ ...@@ -192,7 +193,6 @@
android:text="@string/renminbi" android:text="@string/renminbi"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp14" android:textSize="@dimen/sp14"
android:textStyle="bold"
app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount" app:layout_constraintBaseline_toBaselineOf="@id/tv_total_amount"
app:layout_constraintEnd_toStartOf="@id/tv_total_amount" /> app:layout_constraintEnd_toStartOf="@id/tv_total_amount" />
...@@ -204,7 +204,6 @@ ...@@ -204,7 +204,6 @@
android:text='@{String.format("%.2f", data.payment)}' android:text='@{String.format("%.2f", data.payment)}'
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp18" android:textSize="@dimen/sp18"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_coupon" app:layout_constraintTop_toBottomOf="@id/iv_coupon"
tools:text="¥35.00" /> tools:text="¥35.00" />
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_solid_ffffff_corner_20" android:background="@drawable/shape_solid_ffffff_corner_20"
android:paddingStart="@dimen/dp16" android:paddingStart="@dimen/dp16"
android:paddingTop="20dp" android:paddingTop="@dimen/dp20"
android:paddingEnd="@dimen/dp16" android:paddingEnd="@dimen/dp16"
android:paddingBottom="20dp"> android:paddingBottom="@dimen/dp20">
<TextView <TextView
android:id="@+id/tv_consignee_name" android:id="@+id/tv_consignee_name"
......
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