1.货源信息-货主端。

app/src/main/AndroidManifest.xml

@@ -100,6 +100,7 @@
         <activity android:name=".activity.BillDetailsActivity"/>
         <activity android:name=".activity.MyOwnerActivity"/>
         <activity android:name=".activity.AllOwnerActivity"/>
+        <activity android:name=".activity.CommentListActivity"/>
 
 
     </application >

app/src/main/java/com/quansu/heifengwuliu/activity/CommentListActivity.kt

@@ -0,0 +1,29 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.adapter.CommentListAdapter
+import com.quansu.heifengwuliu.base.MBRActivity
+import com.quansu.heifengwuliu.databinding.ActivityCommentListBinding
+import com.quansu.heifengwuliu.vmodel.CommentListVModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/23
+ */
+class CommentListActivity : MBRActivity<CommentListVModel, CommentListAdapter, ActivityCommentListBinding>(){
+
+    override fun binding(): ActivityCommentListBinding {
+        return ActivityCommentListBinding.inflate(layoutInflater)
+    }
+
+    override fun initAdapter(): CommentListAdapter {
+       return CommentListAdapter()
+    }
+
+    override fun vmClass(): Class<CommentListVModel> {
+        return CommentListVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "我的评价"
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/adapter/CommentListAdapter.kt

@@ -0,0 +1,15 @@
+package com.quansu.heifengwuliu.adapter
+
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.quansu.heifengwuliu.R
+import com.quansu.heifengwuliu.databinding.ItemBillBinding
+import com.quansu.heifengwuliu.databinding.ItemCommentListBinding
+import com.quansu.heifengwuliu.model.AmountList
+import com.ysnows.base.base.BAdapter
+
+class CommentListAdapter() : BAdapter<AmountList, BaseDataBindingHolder<ItemCommentListBinding>>(R.layout.item_comment_list) {
+    override fun convert(holder: BaseDataBindingHolder<ItemCommentListBinding>, item: AmountList) {
+        holder.dataBinding?.item = item
+
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/fragment/DeliverGoodsFragment.kt

@@ -52,16 +52,16 @@ class DeliverGoodsFragment : MBFragment<BViewModel<BRepository>, FragmentDeliver
 
    private fun clickType(type:Int){
         if(type==0){
-            binding.butSingle.setTextColor(Color.parseColor("#ffffff"))
-            binding.butMore.setTextColor(Color.parseColor("#292929"))
+            binding.butSingle.setTextColor(Color.parseColor("#FCA100"))
+            binding.butMore.setTextColor(Color.parseColor("#ffffff"))
             binding.butSingle.setBackgroundResource(R.drawable.bg_chose_on)
             binding.butMore.setBackgroundResource(R.drawable.bg_chose_off)
             switchContent(0)
         }else{
-            binding.butSingle.setTextColor(Color.parseColor("#292929"))
-            binding.butMore.setTextColor(Color.parseColor("#ffffff"))
-            binding.butSingle.setBackgroundResource(R.drawable.bg_chose_off)
-            binding.butMore.setBackgroundResource(R.drawable.bg_chose_on)
+            binding.butSingle.setTextColor(Color.parseColor("#ffffff"))
+            binding.butMore.setTextColor(Color.parseColor("#FCA100"))
+            binding.butSingle.setBackgroundResource(R.drawable.bg_chose_right_off)
+            binding.butMore.setBackgroundResource(R.drawable.bg_chose_right_on)
             switchContent(1)
         }
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/CommentListVModel.kt

@@ -0,0 +1,41 @@
+package com.quansu.heifengwuliu.vmodel
+
+
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.model.AmountCount
+import com.quansu.heifengwuliu.model.DataInfoBean
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRRepository
+import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
+
+class CommentListVModel : BRViewModel<BRRepository>() {
+
+    val info: MutableLiveData<AmountCount> = MutableLiveData<AmountCount>()
+
+    var type="0"
+    var status="0"
+
+
+    fun getTotalInfo() {
+        //添加司机
+
+        repository()
+                .lreq(NetEngine.service.amountTotal(type,status,repository().autoPage()))
+                .doOnNext {
+                    if (it.ok(false)) {
+                        var bean=it.data() as AmountCount
+                        info.value=bean
+
+                    }
+                }
+                .subscribe()
+    }
+
+
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.amountList(type,status,repository().autoPage())
+    }
+
+}

app/src/main/java/com/quansu/heifengwuliu/vmodel/MineVModel.kt

@@ -54,6 +54,10 @@ open class MineVModel : BViewModel<MineRepository>() {
         single(InvoiceActivity::class.java)
     }
 
+    fun goComment(){
+        single(CommentListActivity::class.java)
+    }
+
 
 
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/OrderListVModel.kt

@@ -23,7 +23,7 @@ class OrderListVModel : BRViewModel<BRRepository>() {
             20 -> "待接单"
             30 -> "进行中"
             40 -> "已完成"
-            40 -> "已取消"
+            100 -> "已取消"
             else -> ""
         }
 

app/src/main/java/com/quansu/heifengwuliu/vmodel/SettingsVModel.kt

@@ -41,4 +41,9 @@ class SettingsVModel : BViewModel<UserInfoRepository>() {
 
     }
 
+    fun goEditProfile(){//编辑资料
+
+
+    }
+
 }

app/src/main/res/drawable/bg_chose_off.xml

@@ -6,8 +6,13 @@ android:shape="rectangle" >
 
     <stroke
         android:width="1dp"
-        android:color="#BBBBBB" />
+        android:color="#ffffff" />
 
+    <corners
+        android:topRightRadius="8dp"
+        android:bottomRightRadius="8dp"
+        >
+    </corners>
 
    
 

app/src/main/res/drawable/bg_chose_on.xml

@@ -4,11 +4,12 @@ android:shape="rectangle" >
 
 <!-- 填充的颜色-->
 
-    <solid android:color="#E17E30" />
+    <solid android:color="#FFFFFF" />
 
-<!--    <corners-->
-<!--        android:radius="2dp"-->
-<!--       >-->
-<!--    </corners>-->
+    <corners
+        android:topLeftRadius="8dp"
+        android:bottomLeftRadius="8dp"
+       >
+    </corners>
 
 </shape >

app/src/main/res/drawable/bg_chose_right_off.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle" >
+
+<!-- 填充的颜色-->
+
+    <stroke
+        android:width="1dp"
+        android:color="#ffffff" />
+
+    <corners
+        android:topLeftRadius="8dp"
+        android:bottomLeftRadius="8dp"
+        >
+    </corners>
+
+   
+
+</shape >

app/src/main/res/drawable/bg_chose_right_on.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle" >
+
+<!-- 填充的颜色-->
+
+    <solid android:color="#FFFFFF" />
+
+    <corners
+        android:topRightRadius="8dp"
+        android:bottomRightRadius="8dp"
+       >
+    </corners>
+
+</shape >

app/src/main/res/layout/activity_allowner.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.quansu.heifengwuliu.vmodel.CollectionVModel" />
+            type="com.quansu.heifengwuliu.vmodel.AllOwnerVModel" />
     </data >
 
 

app/src/main/res/layout/activity_comment_list.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.CommentListVModel" />
+    </data>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_marginStart="17dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:paddingStart="12dp"
+            android:paddingTop="11dp"
+            app:qmui_radius="4dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            android:layout_height="80dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="共计"
+                    android:textSize="16sp"
+                    android:textColor="#3D3F4E"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    tools:text="48"
+                    android:textSize="16sp"
+                    android:textColor="#3D3F4E"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="条评论"
+                    android:textSize="16sp"
+                    android:textColor="#3D3F4E"
+                    android:layout_height="wrap_content"/>
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_marginTop="12dp"
+                android:gravity="center_vertical"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="平均评分"
+                    android:textSize="14sp"
+                    android:textColor="#3D3F4E"
+                    android:layout_height="wrap_content"/>
+                <ImageView
+                    android:layout_width="13dp"
+                     android:layout_height="14dp"
+                    android:textSize="16sp"
+                    android:src="@drawable/ic_star_on"
+                    android:layout_marginStart="5dp"
+                  />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="4.9分"
+                    android:textSize="12sp"
+                    android:layout_marginStart="3dp"
+                    android:textColor="#939393"
+                    android:layout_height="wrap_content"/>
+
+
+
+            </LinearLayout>
+
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_comment_list" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+    </LinearLayout>
+
+</layout>

app/src/main/res/layout/activity_settings.xml

@@ -52,6 +52,47 @@
                             android:textSize="@dimen/sp_12" />
 
                         <RelativeLayout
+                            android:id="@+id/lay_data"
+                            android:layout_width="match_parent"
+                            android:layout_height="44dp"
+                            android:background="@color/white"
+                            android:onClick="@{v->vm.goEditProfile()}"
+                            android:paddingStart="19dp" >
+
+                            <ImageView
+                                android:id="@+id/img_data"
+                                android:layout_width="21dp"
+                                android:layout_height="21dp"
+                                android:layout_centerVertical="true"
+                                android:src="@drawable/ic_setting_data" />
+
+                            <TextView
+                                android:id="@+id/tv_data"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginStart="18dp"
+                                android:layout_toRightOf="@id/img_data"
+                                android:gravity="center_vertical"
+                                android:text="编辑资料"
+                                android:textColor="@color/text_title"
+                                android:textSize="@dimen/sp_14" />
+
+                            <ImageView
+                                style="@style/mine_arrow_right"
+                                android:layout_centerVertical="true"
+                                android:layout_alignParentRight="true"
+                                android:layout_marginEnd="@dimen/dp_17"
+                                android:src="@drawable/mine_right" />
+
+                        </RelativeLayout >
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:background="#EEEFF0" />
+
+                        <RelativeLayout
                             android:id="@+id/lay_login_password"
                             android:layout_width="match_parent"
                             android:layout_height="44dp"

app/src/main/res/layout/fragment_delivergoods.xml

@@ -19,6 +19,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="#FFBC00"
                 android:orientation="vertical">
 
 
@@ -27,23 +28,26 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="28dp"
+                    android:layout_marginBottom="13dp"
                     android:orientation="horizontal">
 
                     <Button
                         android:id="@+id/but_single"
-                        android:layout_width="120dp"
-                        android:layout_height="40dp"
+                        android:layout_width="80dp"
+                        android:layout_height="30dp"
                         android:background="@drawable/bg_chose_on"
                         android:text="一装一卸"
-                        android:textColor="@color/white"></Button>
+                        android:textSize="14sp"
+                        android:textColor="#FCA100"></Button>
 
                     <Button
                         android:id="@+id/but_more"
-                        android:layout_width="120dp"
-                        android:layout_height="40dp"
+                        android:layout_width="80dp"
+                        android:layout_height="30dp"
                         android:background="@drawable/bg_chose_off"
                         android:text="一装多卸"
-                        android:textColor="#292929"></Button>
+                        android:textSize="14sp"
+                        android:textColor="#ffffff"></Button>
 
 
                 </LinearLayout>

app/src/main/res/layout/fragment_mine.xml

@@ -240,7 +240,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:onClick="@{v->vm.goInvoice()}"
+                            android:onClick="@{v->vm.goComment()}"
 
                             android:orientation="vertical">
 

app/src/main/res/layout/fragment_order_list.xml

@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
         android:orientation="vertical" >
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -27,4 +28,4 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
     </LinearLayout >
 
-</layout >
+</layout >

app/src/main/res/layout/fragment_ownermore.xml

@@ -2,6 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
+
     <data>
 
         <variable
@@ -13,7 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/color_bg"
         android:orientation="vertical">
 
 
@@ -25,39 +26,25 @@
             <com.quansu.heifengwuliu.widget.ShipmentHeadView
                 android:id="@+id/view_head"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-            </com.quansu.heifengwuliu.widget.ShipmentHeadView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_10"
-                android:text="卸货信息"
-                android:textColor="#101010"
-                android:textSize="@dimen/sp_16"></TextView>
-
+                android:layout_height="wrap_content"></com.quansu.heifengwuliu.widget.ShipmentHeadView>
 
             <LinearLayout
                 android:id="@+id/ll_operation"
                 android:layout_width="match_parent"
-                android:layout_height="42dp"
-                android:layout_marginTop="10dp"
-                android:background="@color/white"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingLeft="15dp"
-                android:paddingRight="12dp">
+                android:layout_height="wrap_content"
+                android:layout_marginStart="14dp"
+                android:layout_marginTop="15dp"
+                android:layout_marginEnd="11dp"
+                android:layout_marginBottom="4dp"
+                android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="操作"
-                    android:textColor="#1E1E1E"
-                    android:textSize="16sp">
-
-                </TextView>
+                    android:text="卸货信息"
+                    android:textColor="#545556"
+                    android:textSize="@dimen/sp_15" />
 
                 <ImageView
                     android:layout_width="22dp"
@@ -69,38 +56,38 @@
 
                 </ImageView>
 
-
             </LinearLayout>
 
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_outcar"
-                android:nestedScrollingEnabled="false"
-                android:layout_height="wrap_content">
-            </androidx.recyclerview.widget.RecyclerView>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_outcar"/>
+
             </RelativeLayout>
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_12"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="7dp"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_10"
-                android:paddingEnd="@dimen/dp_12"
-                android:paddingBottom="@dimen/dp_10"
-                app:qmui_borderColor="#BFBFBF"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:qmui_radius="@dimen/dp_2">
+                android:paddingStart="8dp"
+                android:paddingEnd="19dp"
+                android:paddingTop="14dp"
+                android:paddingBottom="14dp"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_radius="@dimen/dp_4">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -112,20 +99,20 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="总金额"
-                        android:textColor="#101010"
+                        android:textColor="@color/text_title"
                         android:textSize="@dimen/sp_16">
 
                     </TextView>
 
                     <TextView
-                       android:id="@+id/tv_total_money"
+                        android:id="@+id/tv_total_money"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
                         android:gravity="center_vertical|right"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
 
                 </LinearLayout>
@@ -136,22 +123,20 @@
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_12"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="7dp"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_10"
-                android:paddingEnd="@dimen/dp_12"
-                android:paddingBottom="@dimen/dp_10"
-                app:qmui_borderColor="#BFBFBF"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:qmui_radius="@dimen/dp_2">
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                app:qmui_radius="@dimen/dp_4">
 
                 <LinearLayout
                     android:id="@+id/ll_is_insurance"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -159,7 +144,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="是否购买保险"
-                        android:textColor="#101010"
+                        android:textColor="@color/text_title"
                         android:textSize="@dimen/sp_16">
 
                     </TextView>
@@ -174,9 +159,9 @@
                         android:gravity="center_vertical|right"
                         android:hint="请选择"
                         android:text="@{vm.insurance}"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
 
                     <ImageView
@@ -189,13 +174,14 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#C2C2C2" />
+                    android:background="#DEDFE0" />
 
                 <LinearLayout
                     android:id="@+id/ll_driver"
-
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -203,7 +189,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="指定常用司机"
-                        android:textColor="#101010"
+                        android:textColor="@color/text_title"
                         android:textSize="@dimen/sp_16">
 
                     </TextView>
@@ -217,9 +203,9 @@
                         android:layout_weight="1"
                         android:gravity="center_vertical|right"
                         android:hint="不指定/请选择"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
 
                     <ImageView
@@ -233,163 +219,162 @@
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_12"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="7dp"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/dp_10"
-                android:paddingTop="@dimen/dp_10"
-                android:paddingEnd="@dimen/dp_12"
-                android:paddingBottom="@dimen/dp_10"
-                app:qmui_borderColor="#BFBFBF"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:qmui_radius="@dimen/dp_2">
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_borderColor="@color/white"
+                android:paddingStart="8dp"
+                android:paddingEnd="10dp"
+                android:paddingTop="14dp"
+                android:paddingBottom="21dp"
+                app:qmui_radius="@dimen/dp_4">
 
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:text="备注"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16"></TextView>
 
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:padding="@dimen/dp_4"
-                    app:qmui_backgroundColor="#F4EFEF"
-                    app:qmui_borderColor="#F4EFEF"
+                    android:layout_height="109dp"
+                    android:paddingStart="10dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="10dp"
+                    android:paddingBottom="12dp"
+                    app:qmui_backgroundColor="#F5F5F5"
+                    app:qmui_borderColor="#F5F5F5"
+                    android:layout_marginTop="14dp"
                     app:qmui_borderWidth="@dimen/dp_1"
                     app:qmui_radius="@dimen/dp_2">
 
                     <EditText
                         android:id="@+id/et_data"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="wrap_content"
                         android:background="@null"
                         android:hint="请输入备注信息"
-                        android:textColor="#101010"
-                        android:textColorHint="#E9E4E4"
-                        android:textSize="@dimen/sp_15">
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13">
 
                     </EditText>
 
                 </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+                <LinearLayout
+                    android:id="@+id/ll_agree"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="20dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:id="@+id/iv_agree"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="6dp"
+                        android:src="@{vm.isAgree==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}" />
 
-            <LinearLayout
-                android:id="@+id/ll_agree"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="我已阅读并同意"
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13">
 
-                <ImageView
-                    android:id="@+id/iv_agree"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@{vm.isAgree==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
-                    />
+                    </TextView>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="我已阅读并同意"
-                    android:textColor="#101010"
-                    android:textSize="@dimen/sp_16">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="《平台运输协议》"
+                        android:textColor="#F6C651"
+                        android:textSize="@dimen/sp_16">
 
-                </TextView>
+                    </TextView>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="《平台运输协议》"
-                    android:textColor="#B54943"
-                    android:textSize="@dimen/sp_16">
 
-                </TextView>
+                </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/ll_public"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
 
-            </LinearLayout>
+                    <ImageView
+                        android:id="@+id/iv_public"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_marginEnd="6dp"
+                        android:src="@{vm.isPush==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}" />
 
-            <LinearLayout
-                android:id="@+id/ll_public"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_12"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
 
-                <ImageView
-                    android:id="@+id/iv_public"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@{vm.isPush==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
-                    />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="发布到"
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13">
 
+                    </TextView>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="发布到"
-                    android:textColor="#101010"
-                    android:textSize="@dimen/sp_16">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" 货源大厅"
+                        android:textColor="#F6C651"
+                        android:textSize="@dimen/sp_13">
 
-                </TextView>
+                    </TextView>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=" 货源大厅"
-                    android:textColor="#B54943"
-                    android:textSize="@dimen/sp_16">
 
-                </TextView>
+                </LinearLayout>
 
 
-            </LinearLayout>
 
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_1"
-                android:background="#C2C2C2" />
 
-            <LinearLayout
+
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_50"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:layout_marginTop="6dp"
+                android:layout_height="wrap_content">
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
 
                 <TextView
                     android:id="@+id/tv_publish"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="#5D76F4"
-                    android:gravity="center"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center"
                     android:text="发布货源信息"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16">
+                    android:textSize="16sp"
+                    android:layout_height="wrap_content">
 
                 </TextView>
 
+            </FrameLayout>
+
+
 
-            </LinearLayout>
 
 
         </LinearLayout>

app/src/main/res/layout/fragment_ownersingle.xml

@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/color_bg"
         android:orientation="vertical">
 
 
@@ -31,12 +31,12 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
-                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginStart="14dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginBottom="4dp"
                     android:text="卸货信息"
-                    android:textColor="#101010"
-                    android:textSize="@dimen/sp_16"></TextView>
-
+                    android:textColor="#545556"
+                    android:textSize="@dimen/sp_15"></TextView>
 
                 <com.quansu.heifengwuliu.widget.EnterInfoView
                     android:id="@+id/view_enter"
@@ -48,29 +48,28 @@
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_12"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_12"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="7dp"
                     android:orientation="vertical"
-                    android:paddingStart="@dimen/dp_10"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_12"
-                    android:paddingBottom="@dimen/dp_10"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+                    app:qmui_borderColor="@color/white"
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_radius="4dp"
+                    >
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
                         android:gravity="center"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
                         android:orientation="horizontal">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="货物名称"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
 
                         </TextView>
@@ -84,17 +83,24 @@
                             android:background="@null"
                             android:gravity="center_vertical|right"
                             android:hint="请输入货物名称"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></EditText>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></EditText>
 
 
                     </LinearLayout>
 
+                    <View
+                        android:layout_width="match_parent"
+                        android:background="#DEDFE0"
+                        android:layout_height="0.5dp"/>
+
                     <LinearLayout
                         android:id="@+id/ll_goods_type"
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -102,7 +108,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="货物类型"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
 
                         </TextView>
@@ -111,28 +117,32 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_10"
-                            android:layout_marginEnd="@dimen/dp_10"
+                            android:layout_marginEnd="3dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical|right"
                             android:hint="请选择货物类型"
                             android:text="@{vm.goodstype}"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></TextView>
-
-
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></TextView>
 
                         <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                           android:layout_width="8dp"
+                            android:layout_height="13dp"
+                            android:src="@drawable/img_right" />
 
 
                     </LinearLayout>
-
+                    <View
+                        android:layout_width="match_parent"
+                        android:background="#DEDFE0"
+                        android:layout_height="0.5dp"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -140,7 +150,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="单车运量"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
 
                         </TextView>
@@ -155,40 +165,55 @@
                             android:gravity="center_vertical|right"
                             android:inputType="number|numberDecimal"
                             android:hint="请输入单车运输数量"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></EditText>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></EditText>
 
-                        <LinearLayout
+
+                        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                             android:id="@+id/ll_chose_units"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
+                            android:layout_height="27dp"
+                            android:gravity="center_vertical|center"
+                            android:orientation="horizontal"
+                            android:layout_marginStart="10dp"
+                            android:paddingLeft="10dp"
+                            android:paddingRight="4dp"
+                            app:qmui_backgroundColor="#F5F5F5"
+                            app:qmui_borderColor="#F5F5F5"
+                            app:qmui_radius="@dimen/dp_1">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="@dimen/dp_10"
-                                android:layout_marginEnd="@dimen/dp_10"
-                                android:hint="请选择单位"
-                                android:gravity="right"
-                                android:text="@{vm.unit}"
-                                android:textColor="#101010"
+                                android:textColor="#636465"
+                                android:textSize="13sp"
                                 android:textColorHint="#BBBBBB"
-                                android:textSize="@dimen/sp_15"></TextView>
+                                android:text="@{vm.unit}"
+                                android:hint="单位"
+                                tools:text="黄色" />
 
                             <ImageView
-                                style="@style/mine_arrow_right"
-                                android:src="@drawable/mine_right" />
-                        </LinearLayout>
+                                android:layout_width="14dp"
+                                android:layout_height="9dp"
+                                android:layout_marginStart="7dp"
+                                android:src="@drawable/ic_select_up" />
+
+
+                        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
 
                     </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:background="#DEDFE0"
+                        android:layout_height="0.5dp"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="8dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -196,7 +221,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="单价"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
 
                         </TextView>
@@ -210,17 +235,23 @@
                             android:background="@null"
                             android:gravity="center_vertical|right"
                             android:hint="请输入单价"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></EditText>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></EditText>
 
 
                     </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:background="#DEDFE0"
+                        android:layout_height="0.5dp"/>
 
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginEnd="19dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -228,7 +259,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="总金额"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
 
                         </TextView>
@@ -242,9 +273,9 @@
                             android:background="@null"
                             android:gravity="center_vertical|right"
                             android:hint="请输入总金额"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></EditText>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></EditText>
 
 
                     </LinearLayout>
@@ -254,24 +285,22 @@
 
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_12"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_12"
-                    android:orientation="vertical"
-                    android:paddingStart="@dimen/dp_10"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_12"
-                    android:paddingBottom="@dimen/dp_10"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="7dp"
+                android:orientation="vertical"
+                app:qmui_borderColor="@color/white"
+                app:qmui_backgroundColor="@color/white"
+                app:qmui_radius="@dimen/dp_4">
 
                     <LinearLayout
                         android:id="@+id/ll_is_insurance"
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:paddingStart="8dp"
+                        android:paddingEnd="8dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -279,7 +308,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="是否购买保险"
-                            android:textColor="#101010"
+                            android:textColor="@color/text_title"
                             android:textSize="@dimen/sp_16">
                         </TextView>
 
@@ -288,32 +317,35 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_10"
-                            android:layout_marginEnd="@dimen/dp_10"
+                            android:layout_marginEnd="4dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical|right"
                             android:hint="请选择"
                             android:text="@{vm.insurance}"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></TextView>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></TextView>
 
 
                         <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                            android:layout_width="8dp"
+                            android:layout_height="13dp"
+                            android:src="@drawable/img_right" />
 
 
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_1"
-                        android:background="#C2C2C2" />
+                        android:layout_height="0.5dp"
+                        android:background="#DEDFE0" />
 
                     <LinearLayout
                         android:id="@+id/ll_driver"
                         android:layout_width="match_parent"
-                        android:layout_height="40dp"
+                        android:layout_height="50dp"
+                        android:paddingStart="8dp"
+                        android:paddingEnd="8dp"
                         android:gravity="center"
                         android:orientation="horizontal">
 
@@ -331,18 +363,19 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_10"
-                            android:layout_marginEnd="@dimen/dp_10"
+                            android:layout_marginEnd="4dp"
                             android:layout_weight="1"
                             android:gravity="center_vertical|right"
                             android:hint="不指定/请选择"
-                            android:textColor="#101010"
-                            android:textColorHint="#BBBBBB"
-                            android:textSize="@dimen/sp_15"></TextView>
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13"></TextView>
 
 
                         <ImageView
-                            style="@style/mine_arrow_right"
-                            android:src="@drawable/mine_right" />
+                            android:layout_width="8dp"
+                            android:layout_height="13dp"
+                            android:src="@drawable/img_right" />
 
 
                     </LinearLayout>
@@ -354,132 +387,136 @@
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_12"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_12"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="7dp"
                     android:orientation="vertical"
-                    android:paddingStart="@dimen/dp_10"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_12"
-                    android:paddingBottom="@dimen/dp_10"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+                    app:qmui_borderColor="@color/white"
+                    app:qmui_backgroundColor="@color/white"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="10dp"
+                    android:layout_marginBottom="10dp"
+                    app:qmui_radius="@dimen/dp_4">
 
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginTop="14dp"
                         android:text="备注"
-                        android:textColor="#101010"
+                        android:textColor="@color/text_title"
                         android:textSize="@dimen/sp_16"></TextView>
 
 
                     <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:padding="@dimen/dp_4"
-                        app:qmui_backgroundColor="#F4EFEF"
-                        app:qmui_borderColor="#F4EFEF"
+                        android:layout_height="109dp"
+                        android:paddingStart="10dp"
+                        android:paddingEnd="10dp"
+                        android:paddingTop="12dp"
+                        android:paddingBottom="10dp"
+                        app:qmui_backgroundColor="#F5F5F5"
+                        android:layout_marginTop="14dp"
+                        app:qmui_borderColor="#F5F5F5"
                         app:qmui_borderWidth="@dimen/dp_1"
                         app:qmui_radius="@dimen/dp_2">
 
                         <EditText
                             android:id="@+id/et_data"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:background="@null"
                             android:hint="请输入备注信息"
-                            android:textColor="#101010"
-                            android:textColorHint="#E9E4E4"
-                            android:textSize="@dimen/sp_15">
+                            android:textColor="@color/text_title"
+                            android:textColorHint="#979899"
+                            android:textSize="@dimen/sp_13">
 
                         </EditText>
 
                     </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                    <LinearLayout
+                        android:id="@+id/ll_agree"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="20dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/iv_agree"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:padding="2dp"
+                            android:layout_marginEnd="6dp"
+                            android:src="@{vm.isAgree==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
+                            />
 
-                <LinearLayout
-                    android:id="@+id/ll_agree"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="@dimen/dp_12"
-                    android:layout_marginTop="@dimen/dp_10"
-                    android:layout_marginEnd="@dimen/dp_12"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="我已阅读并同意"
+                            android:textColor="#979899"
+                            android:textSize="@dimen/sp_13">
 
-                    <ImageView
-                        android:id="@+id/iv_agree"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:src="@{vm.isAgree==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
-                        />
+                        </TextView>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="我已阅读并同意"
-                        android:textColor="#101010"
-                        android:textSize="@dimen/sp_16">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="《平台运输协议》"
+                            android:textColor="#F5C042"
+                            android:textSize="@dimen/sp_13">
 
-                    </TextView>
+                        </TextView>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="《平台运输协议》"
-                        android:textColor="#B54943"
-                        android:textSize="@dimen/sp_16">
 
-                    </TextView>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_public"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
+                        <ImageView
+                            android:id="@+id/iv_public"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:padding="2dp"
+                            android:layout_marginEnd="6dp"
+                            android:src="@{vm.isPush==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
+                            />
 
-                </LinearLayout>
 
-                <LinearLayout
-                    android:id="@+id/ll_public"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="@dimen/dp_12"
-                    android:layout_marginEnd="@dimen/dp_12"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="发布到"
+                            android:textColor="#979899"
+                            android:textSize="@dimen/sp_13">
+
+                        </TextView>
 
-                    <ImageView
-                        android:id="@+id/iv_public"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:src="@{vm.isPush==0?@drawable/ic_chose_off:@drawable/ic_chose_on,default=@drawable/ic_chose_on}"
-                        />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=" 货源大厅"
+                            android:textColor="#F5C042"
+                            android:textSize="@dimen/sp_13">
 
+                        </TextView>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="发布到"
-                        android:textColor="#101010"
-                        android:textSize="@dimen/sp_16">
 
-                    </TextView>
+                    </LinearLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text=" 货源大厅"
-                        android:textColor="#B54943"
-                        android:textSize="@dimen/sp_16">
 
-                    </TextView>
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
-                </LinearLayout>
 
 
                 <View
@@ -523,7 +560,7 @@
                         android:id="@+id/tv_publish"
                         android:layout_width="150dp"
                         android:layout_height="match_parent"
-                        android:background="#5D76F4"
+                        android:background="#F4B43E"
                         android:gravity="center"
                         android:text="发布货源信息"
                         android:textColor="@color/white"

app/src/main/res/layout/item_comment_list.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="com.quansu.heifengwuliu.model.AmountList" />
+
+    </data>
+
+    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="12dp"
+        android:paddingStart="9dp"
+        android:paddingEnd="10dp"
+        android:orientation="vertical"
+        app:qmui_radius="4dp"
+        app:qmui_borderColor="@color/white"
+        app:qmui_backgroundColor="@color/white"
+       >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="12dp"
+            android:gravity="center_vertical|right"
+            android:layout_height="wrap_content">
+            
+            <ImageView
+                android:layout_width="13dp"
+                android:src="@drawable/ic_star_on"
+                android:layout_marginEnd="3dp"
+                android:layout_height="13dp"/>
+            <ImageView
+                android:layout_width="13dp"
+                android:src="@drawable/ic_star_on"
+                android:layout_marginEnd="3dp"
+                android:layout_height="13dp"/>
+            <ImageView
+                android:layout_width="13dp"
+                android:src="@drawable/ic_star_on"
+                android:layout_marginEnd="3dp"
+                android:layout_height="13dp"/>
+            <ImageView
+                android:layout_width="13dp"
+                android:src="@drawable/ic_star_on"
+                android:layout_marginEnd="3dp"
+                android:layout_height="13dp"/>
+            <ImageView
+                android:layout_width="13dp"
+                android:src="@drawable/ic_star_on"
+                android:layout_marginEnd="9dp"
+                android:layout_height="13dp"/>
+            <TextView
+                android:layout_width="wrap_content"
+                tools:text="5分"
+                android:textSize="12sp"
+                android:textColor="#939393"
+                android:layout_height="wrap_content"/>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="7dp"
+            android:layout_marginBottom="21dp"
+            android:layout_height="wrap_content">
+            
+            <ImageView
+                android:layout_width="40dp"
+                android:src="@drawable/bg_need_error"
+                android:layout_height="40dp"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_marginStart="7dp"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    tools:text="运单号YD2020009122211"
+                    android:textColor="#3D3F4E"
+                    android:textSize="14sp"
+                    android:layout_height="wrap_content"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#A7A7B4"
+                    android:textSize="12sp"
+                    android:layout_marginTop="4dp"
+                    tools:text="2020-09-15 12:30:20" />
+
+
+            </LinearLayout>
+            
+
+        </LinearLayout>
+
+
+
+    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+</layout>

app/src/main/res/layout/item_myowner.xml

@@ -34,6 +34,8 @@
                 android:layout_width="37dp"
                 android:layout_height="37dp"
                 android:padding="10dp"
+                android:visibility="gone"
+                tools:visibility="visible"
                 android:layout_marginEnd="2dp"
                 android:layout_centerVertical="true"
                 android:src="@drawable/select_on"

app/src/main/res/layout/item_order.xml

@@ -19,25 +19,28 @@
         android:layout_margin="@dimen/dp_10"
         xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
-        app:qmui_borderColor="@color/gray_lite"
-        app:qmui_borderWidth="@dimen/dp_1"
-        app:qmui_radius="@dimen/dp_5" >
+        app:qmui_borderColor="@color/white"
+        app:qmui_backgroundColor="@color/white"
+        app:qmui_radius="@dimen/dp_2" >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_10"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
             android:onClick="@{v->vm.gotoInfoDetails(item.info_id)}"
-            android:paddingBottom="@dimen/dp_5" >
+            android:paddingBottom="28dp" >
 
             <TextView
                 android:id="@+id/tv_number_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="@dimen/dp_5"
-                android:paddingBottom="@dimen/dp_5"
+                android:paddingTop="11dp"
+                android:paddingBottom="10dp"
                 android:text="@string/waybill_number"
+                android:textColor="@color/text_title"
+                android:textSize="14sp"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -46,6 +49,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{item.info_sn}"
+                android:textColor="@color/text_title"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:text="11111"
                 app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
                 app:layout_constraintStart_toEndOf="@id/tv_number_name"
                 app:layout_constraintTop_toTopOf="@id/tv_number_name" />
@@ -56,6 +63,8 @@
                 android:layout_height="wrap_content"
                 android:text="@{vm.getOrderStatus(item.info_state)}"
                 tools:text="待接单(0/1)"
+                android:textColor="#FFBC00"
+                android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="@id/tv_number_name"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/tv_number_name" />
@@ -64,7 +73,7 @@
                 android:id="@+id/line"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="@color/gray_lite"
+                android:background="#E3E4E5"
                 app:layout_constraintStart_toStartOf="@id/tv_number_name"
                 app:layout_constraintTop_toBottomOf="@id/tv_number_name" />
 
@@ -76,41 +85,65 @@
                 app:layout_constraintGuide_percent="0.5" />
 
             <ImageView
+                android:id="@+id/iv_yellow"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                app:layout_constraintStart_toStartOf="@id/line"
+                app:layout_constraintTop_toTopOf="@id/img_arrow"
+                android:src="@drawable/ic_circle_yellow" />
+
+
+            <ImageView
                 android:id="@+id/img_arrow"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
+                android:layout_width="27dp"
+                android:layout_height="7dp"
+                android:layout_marginTop="27dp"
                 android:src="@drawable/ic_long_arrow"
                 app:layout_constraintEnd_toEndOf="@id/guide_line"
                 app:layout_constraintStart_toStartOf="@id/guide_line"
                 app:layout_constraintTop_toBottomOf="@id/line" />
 
+
+            <ImageView
+                android:id="@+id/iv_red"
+                android:layout_width="9dp"
+                android:layout_height="10dp"
+                android:layout_marginStart="12dp"
+                app:layout_constraintLeft_toRightOf="@id/img_arrow"
+                app:layout_constraintTop_toTopOf="@id/img_arrow"
+                android:src="@drawable/ic_circle_red" />
+
             <TextView
                 android:id="@+id/tv_from"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:text="@{item.send[0].province.name+item.send[0].city.name+item.send[0].area.name}"
-                android:textColor="@color/blue"
+                android:layout_marginStart="21dp"
+                android:text="@{item.send[0].province.name+item.send[0].city.name}"
+                tools:text="123455"
+                android:textColor="@color/text_title"
+                android:textSize="15sp"
                 app:layout_constraintBottom_toBottomOf="@id/img_arrow"
-                app:layout_constraintEnd_toStartOf="@id/img_arrow"
+                app:layout_constraintStart_toEndOf="@id/iv_yellow"
                 app:layout_constraintTop_toTopOf="@id/img_arrow" />
 
             <TextView
                 android:id="@+id/tv_to"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-                android:text="@{item.receive[item.receive.size()-1].province.name+item.receive[item.receive.size()-1].city.name+item.receive[item.receive.size()-1].area.name}"
-                android:textColor="@color/red_400"
+                android:layout_marginStart="21dp"
+                tools:text="777777"
+                android:text="@{item.receive[item.receive.size()-1].province.name+item.receive[item.receive.size()-1].city.name}"
+                android:textColor="@color/text_title"
+                android:textSize="15sp"
                 app:layout_constraintBottom_toBottomOf="@id/img_arrow"
-                app:layout_constraintStart_toEndOf="@id/img_arrow"
+                app:layout_constraintStart_toEndOf="@id/iv_red"
                 app:layout_constraintTop_toTopOf="@id/img_arrow" />
 
             <ImageView
                 android:id="@+id/img_vehicle"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginTop="@dimen/dp_5"
+                android:layout_width="20dp"
+                android:layout_height="16dp"
+                android:layout_marginTop="18dp"
                 android:src="@drawable/ic_vehicle"
                 app:layout_constraintStart_toStartOf="@id/tv_number_name"
                 app:layout_constraintTop_toBottomOf="@id/img_arrow" />
@@ -119,8 +152,10 @@
                 android:id="@+id/tv_vehicle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
-
+                android:layout_marginStart="20dp"
+                tools:text="3333"
+                android:textSize="18sp"
+                android:textColor="#727374"
                 android:text="@{item.type_info.type_name +@string/spot+item.type_info.length+@string/rice}"
                 app:layout_constraintBottom_toBottomOf="@id/img_vehicle"
                 app:layout_constraintStart_toEndOf="@id/img_vehicle"
@@ -128,10 +163,9 @@
 
             <ImageView
                 android:id="@+id/img_goods"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginTop="@dimen/dp_5"
-                android:padding="@dimen/dp_2"
+                android:layout_width="18dp"
+                android:layout_height="17dp"
+                android:layout_marginTop="11dp"
                 android:src="@drawable/ic_goods"
                 app:layout_constraintStart_toStartOf="@id/img_vehicle"
                 app:layout_constraintTop_toBottomOf="@id/img_vehicle" />
@@ -140,16 +174,35 @@
                 android:id="@+id/tv_goods"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_10"
+                android:layout_marginStart="20dp"
+                android:textSize="13sp"
+                android:textColor="#727374"
+                tools:text="苹果(农产品）· 35吨"
                 android:text="@{item.receive[0].goods+@string/spot+item.receive[0].nums+item.receive[0].nums_type.name+@string/space+@string/total_img+item.receive[0].total}"
                 app:layout_constraintBottom_toBottomOf="@id/img_goods"
                 app:layout_constraintStart_toEndOf="@id/img_goods"
                 app:layout_constraintTop_toTopOf="@id/img_goods" />
 
+
+            <TextView
+                android:id="@+id/tv_total_money"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:textSize="14sp"
+                android:textColor="#26292F"
+                tools:text="¥3500元"
+                android:text="@{@string/total_img+item.total}"
+                app:layout_constraintBottom_toBottomOf="@id/img_goods"
+                app:layout_constraintStart_toEndOf="@id/tv_goods"
+                app:layout_constraintTop_toTopOf="@id/img_goods" />
+
+
+
             <ImageView
                 android:id="@+id/img_qr"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
                 android:src="@drawable/ic_qr"
                 app:layout_constraintBottom_toBottomOf="@id/img_goods"
                 app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/item_outcar.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <data >
+    <data>
 
         <variable
             name="vm"
@@ -18,9 +18,7 @@
             type="Integer" />
 
 
-
-
-    </data >
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,25 +30,23 @@
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_12"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginEnd="@dimen/dp_12"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="7dp"
             android:orientation="vertical"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_12"
-            android:paddingBottom="@dimen/dp_10"
-            app:qmui_borderColor="#BFBFBF"
-            app:qmui_borderWidth="@dimen/dp_1"
-            app:qmui_radius="@dimen/dp_2">
+            android:paddingTop="14dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            app:qmui_radius="@dimen/dp_4">
 
             <LinearLayout
                 android:id="@+id/ll_delete"
                 android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="right|center"
                 android:visibility="gone"
-                tools:visibility="visible"
-                android:layout_height="40dp">
+                tools:visibility="visible">
 
                 <TextView
                     android:id="@+id/tv_delete"
@@ -59,8 +55,8 @@
                     android:gravity="right"
                     android:minWidth="45dp"
                     android:text="删除"
-                    android:textColor="#4070FF"
-                    android:textSize="14sp">
+                    android:textColor="#F5BF41"
+                    android:textSize="16sp">
 
                 </TextView>
 
@@ -69,6 +65,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="7dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -77,37 +75,39 @@
                     android:id="@+id/img"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_enter"
-                     />
+                    android:src="@drawable/ic_enter" />
 
 
                 <TextView
                     android:id="@+id/tv_city"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginStart="6dp"
                     android:layout_weight="1"
                     android:hint="请选择省市区"
-                    android:text="@{item.pca}"
                     android:onClick="@{v->vm.choseCity(position)}"
-                    android:textColor="#101010"
-                    android:textSize="@dimen/sp_16"></TextView>
+                    android:text="@{item.pca}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"></TextView>
 
                 <LinearLayout
                     android:id="@+id/ll_chose_address"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:onClick="@{v->vm.chosePeoPle(position)}"
-                    android:gravity="center_vertical">
+                    android:gravity="center_vertical"
+                    android:onClick="@{v->vm.chosePeoPle(position)}">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="3dp"
                         android:text="地址薄"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
                     <ImageView
                         style="@style/mine_arrow_right"
@@ -119,7 +119,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -128,30 +128,31 @@
                     android:id="@+id/et_detailed_address"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="35dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="1"
                     android:background="@null"
-                    android:text="@{vm.getContext(item.address)}"
                     android:hint="请输入详细地址"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:text="@{vm.getContext(item.address)}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
                 <LinearLayout
                     android:id="@+id/ll_chose_map"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:onClick="@{v->vm.choseMap(position)}"
-                    android:gravity="center_vertical">
+                    android:gravity="center_vertical"
+                    android:onClick="@{v->vm.choseMap(position)}">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="6dp"
                         android:text="地图选点"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
                     <ImageView
                         android:layout_width="20dp"
@@ -162,22 +163,28 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginTop="18dp"
+                android:layout_marginBottom="7dp"
+                android:layout_height="1dp"/>
 
             <TextView
-            android:id="@+id/tv_chose_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="35dp"
-            android:layout_marginTop="@dimen/dp_10"
-            android:text="@{item.time}"
-            android:hint="点击选择卸货时间"
-            android:textColor="#5E5C5C"
-            android:textSize="@dimen/sp_15"></TextView>
+                android:id="@+id/tv_chose_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="30dp"
+                android:hint="点击选择卸货时间"
+                android:text="@{item.time}"
+                android:textColor="@color/text_title"
+                android:textColorHint="#979899"
+                android:textSize="@dimen/sp_16"></TextView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="12dp"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -186,75 +193,67 @@
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="20dp"
-                    android:layout_marginStart="35dp"
-                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_marginStart="30dp"
                     android:src="@drawable/ic_name_enter" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+
 
                     <EditText
                         android:id="@+id/et_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
+                        android:paddingStart="8dp"
                         android:background="@null"
                         android:hint="姓名"
                         android:text="@{vm.getContext(item.name)}"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="20dp"
-                    android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_10"
+                    android:layout_marginStart="10dp"
                     android:src="@drawable/ic_phone_enter" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+
 
                     <EditText
                         android:id="@+id/et_phone"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
+                        android:paddingStart="8dp"
                         android:background="@null"
                         android:hint="电话"
-                        android:textColor="#101010"
                         android:text="@{vm.getContext(item.mobile)}"
-                        android:textColorHint="#BBBBBB"
+                        android:textColor="@color/text_title"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
             </LinearLayout>
 
-
-
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
+                android:layout_height="1dp"/>
 
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -262,7 +261,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="货物名称"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16">
 
                 </TextView>
@@ -273,21 +272,31 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_weight="1"
-                    android:text="@{vm.getContext(item.goods)}"
                     android:background="@null"
                     android:gravity="center_vertical|right"
                     android:hint="请输入货物名"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:text="@{vm.getContext(item.goods)}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
+                android:layout_height="1dp"/>
+
+
             <LinearLayout
                 android:id="@+id/ll_goods_type"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -295,7 +304,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="货物类型"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16">
 
                 </TextView>
@@ -306,14 +315,13 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_10"
-                    android:text="@{item.goods_type_name}"
                     android:layout_weight="1"
                     android:gravity="center_vertical|right"
                     android:hint="请选择货物类型"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></TextView>
-
+                    android:text="@{item.goods_type_name}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></TextView>
 
 
                 <ImageView
@@ -323,10 +331,20 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
+                android:layout_height="1dp"/>
+
+
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -334,7 +352,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="单车运量"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16">
 
                 </TextView>
@@ -343,49 +361,70 @@
                     android:id="@+id/et_sing_car_nums"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:paddingStart="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_10"
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="center_vertical|right"
-                    android:inputType="number|numberDecimal"
                     android:hint="请输入单车运输数量"
+                    android:inputType="number|numberDecimal"
+                    android:paddingStart="@dimen/dp_10"
+                    android:paddingEnd="@dimen/dp_10"
                     android:text="@{vm.getContext(item.nums)}"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
-                <LinearLayout
+                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                     android:id="@+id/ll_chose_units"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
+                    android:layout_height="27dp"
+                    android:gravity="center_vertical|center"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="10dp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="4dp"
+                    app:qmui_backgroundColor="#F5F5F5"
+                    app:qmui_borderColor="#F5F5F5"
+                    app:qmui_radius="@dimen/dp_1">
 
                     <TextView
                         android:id="@+id/tv_chose_units"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
-                        android:hint="请选择单位"
-                        android:text="@{item.nums_type}"
-                        android:gravity="right"
-                        android:textColor="#101010"
+                        android:textColor="#636465"
+                        android:textSize="13sp"
                         android:textColorHint="#BBBBBB"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:text="@{item.nums_type}"
+                        android:hint="单位"
+                        tools:text="黄色" />
 
                     <ImageView
-                        style="@style/mine_arrow_right"
-                        android:src="@drawable/mine_right" />
-                </LinearLayout>
+                        android:layout_width="14dp"
+                        android:layout_height="9dp"
+                        android:layout_marginStart="7dp"
+                        android:src="@drawable/ic_select_up" />
+
+
+                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
+                android:layout_height="1dp"/>
+
+
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -393,7 +432,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="单价"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16">
 
                 </TextView>
@@ -403,23 +442,33 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_marginStart="@dimen/dp_10"
-                    android:paddingEnd="@dimen/dp_10"
                     android:layout_weight="1"
                     android:background="@null"
-                    android:text="@{vm.getContext(item.price)}"
                     android:gravity="center_vertical|right"
                     android:hint="请输入单价"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:paddingEnd="@dimen/dp_10"
+                    android:text="@{vm.getContext(item.price)}"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
 
             </LinearLayout>
 
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
+                android:layout_height="1dp"/>
+
+
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="38dp"
+                android:layout_marginEnd="8dp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
@@ -427,7 +476,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="总金额"
-                    android:textColor="#101010"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16">
 
                 </TextView>
@@ -443,20 +492,17 @@
                     android:hint="请输入总金额"
                     android:paddingEnd="@dimen/dp_10"
                     android:text="@{vm.getContext(item.total)}"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
 
             </LinearLayout>
 
 
-
-
-
         </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
     </LinearLayout>
 
-</layout >
+</layout>

app/src/main/res/layout/widget_addressitem.xml

@@ -16,17 +16,17 @@
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_12"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginEnd="@dimen/dp_12"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="7dp"
             android:orientation="vertical"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_12"
-            android:paddingBottom="@dimen/dp_10"
-            app:qmui_borderColor="#BFBFBF"
-            app:qmui_borderWidth="@dimen/dp_1"
-            app:qmui_radius="@dimen/dp_2">
+            android:paddingStart="7dp"
+            android:paddingTop="14dp"
+            android:paddingEnd="9dp"
+            android:paddingBottom="23dp"
+            app:qmui_borderColor="@color/white"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_radius="4dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -47,10 +47,12 @@
                     android:id="@+id/tv_city"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginStart="6dp"
                     android:layout_weight="1"
                     android:hint="请选择省市区"
-                    android:textColor="#101010"
+                    android:textStyle="bold"
+                    android:textColorHint="#979899"
+                    android:textColor="@color/text_title"
                     android:textSize="@dimen/sp_16"></TextView>
 
                 <LinearLayout
@@ -63,13 +65,14 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="3dp"
                         android:text="地址薄"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
                     <ImageView
-                        style="@style/mine_arrow_right"
+                        android:layout_width="8dp"
+                        android:layout_height="13dp"
                         android:src="@drawable/mine_right" />
                 </LinearLayout>
             </LinearLayout>
@@ -78,7 +81,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -87,13 +90,13 @@
                     android:id="@+id/et_detailed_address"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="35dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="1"
                     android:background="@null"
                     android:hint="请输入详细地址"
-                    android:textColor="#101010"
-                    android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:textColor="#636465"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_13"></EditText>
 
                 <LinearLayout
                     android:id="@+id/ll_chose_map"
@@ -105,13 +108,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="6dp"
                         android:text="地图选点"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
                     <ImageView
-                        android:layout_width="20dp"
+                        android:layout_width="19dp"
                         android:layout_height="20dp"
                         android:src="@drawable/map_address" />
 
@@ -120,21 +123,28 @@
             </LinearLayout>
 
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginTop="18dp"
+                android:layout_marginBottom="7dp"
+                android:layout_height="1dp"/>
+
+
             <TextView
                 android:id="@+id/tv_chose_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginStart="30dp"
                 android:hint="点击选择装货时间"
-                android:textColor="#5E5C5C"
-                android:textSize="@dimen/sp_15"></TextView>
+                android:textColor="#26292F"
+                android:textColorHint="#979899"
+                android:textSize="@dimen/sp_16"></TextView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
+                android:layout_marginTop="12dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -143,61 +153,45 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_marginStart="35dp"
-                    android:layout_marginEnd="@dimen/dp_10"
                     android:src="@drawable/ic_name_enter" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
 
                     <EditText
                         android:id="@+id/et_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
                         android:background="@null"
                         android:hint="姓名"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
+                        android:paddingStart="8dp"
+                        android:textColor="#545556"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_10"
                     android:src="@drawable/ic_phone_enter" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
 
                     <EditText
                         android:id="@+id/et_phone"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
+                        android:paddingStart="8dp"
                         android:background="@null"
                         android:hint="电话"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
+                        android:textColor="#545556"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
             </LinearLayout>

app/src/main/res/layout/widget_shipmenthead.xml

@@ -9,6 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/color_bg"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:orientation="vertical">
@@ -22,36 +23,39 @@
             <com.qmuiteam.qmui.widget.tab.QMUITabSegment
                 android:id="@+id/tabs"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/title_bar_height"
+                android:layout_height="43dp"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:textSize="12sp" />
 
             <ImageView
                 android:id="@+id/img_next"
-                android:layout_width="20dp"
+                android:layout_width="13dp"
                 android:layout_height="20dp"
-                android:src="@drawable/mine_right" />
+                android:padding="2dp"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/img_right" />
         </LinearLayout>
-
         <View
             android:layout_width="match_parent"
-            android:layout_height="8dp"
-            android:background="@color/color_page" />
+            android:layout_height="1dp"
+            android:background="#E3E4E5" />
+
+
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginTop="10dp"
+            android:layout_height="116dp"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_up"
-                android:layout_width="20dp"
+                android:layout_width="11dp"
                 android:layout_height="20dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="10dp"
+                android:padding="2dp"
+                android:layout_marginStart="14dp"
+                android:layout_marginEnd="8dp"
                 android:src="@drawable/img_left" />
 
             <com.qmuiteam.qmui.widget.QMUIViewPager
@@ -62,10 +66,11 @@
 
             <ImageView
                 android:id="@+id/img_down"
-                android:layout_width="20dp"
+                android:layout_width="11dp"
                 android:layout_height="20dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="12dp"
+                android:padding="2dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="14dp"
                 android:src="@drawable/img_right" />
 
         </LinearLayout>
@@ -73,17 +78,17 @@
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_12"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginEnd="@dimen/dp_12"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="7dp"
             android:orientation="vertical"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingTop="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_12"
-            android:paddingBottom="@dimen/dp_10"
-            app:qmui_borderColor="#BFBFBF"
-            app:qmui_borderWidth="@dimen/dp_1"
-            app:qmui_radius="@dimen/dp_2">
+            android:paddingStart="7dp"
+            android:paddingTop="14dp"
+            android:paddingEnd="9dp"
+            android:paddingBottom="22dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            app:qmui_radius="4dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -96,19 +101,18 @@
                     android:id="@+id/img"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:src="@drawable/ic_out"
-                    />
-
+                    android:src="@drawable/ic_out" />
 
                 <TextView
                     android:id="@+id/tv_city"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_10"
+                    android:layout_marginStart="6dp"
                     android:layout_weight="1"
                     android:hint="请选择省市区"
-                    android:textColor="#101010"
-                    android:textSize="@dimen/sp_16"></TextView>
+                    android:textColor="@color/text_title"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold"></TextView>
 
                 <LinearLayout
                     android:id="@+id/ll_chose_address"
@@ -120,14 +124,17 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="3dp"
                         android:text="地址薄"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
+
 
                     <ImageView
-                        style="@style/mine_arrow_right"
+                        android:layout_width="8dp"
+                        android:layout_height="13dp"
                         android:src="@drawable/mine_right" />
+
                 </LinearLayout>
             </LinearLayout>
 
@@ -135,7 +142,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginTop="8dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -144,13 +151,13 @@
                     android:id="@+id/et_detailed_address"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="35dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="1"
                     android:background="@null"
                     android:hint="请输入详细地址"
-                    android:textColor="#101010"
+                    android:textColor="#636465"
                     android:textColorHint="#BBBBBB"
-                    android:textSize="@dimen/sp_15"></EditText>
+                    android:textSize="@dimen/sp_13" />
 
                 <LinearLayout
                     android:id="@+id/ll_chose_map"
@@ -162,13 +169,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginEnd="@dimen/dp_10"
+                        android:layout_marginEnd="6dp"
                         android:text="地图选点"
-                        android:textColor="#5E5C5C"
-                        android:textSize="@dimen/sp_15"></TextView>
+                        android:textColor="#979899"
+                        android:textSize="@dimen/sp_13"></TextView>
 
                     <ImageView
-                        android:layout_width="20dp"
+                        android:layout_width="19dp"
                         android:layout_height="20dp"
                         android:src="@drawable/map_address" />
 
@@ -176,22 +183,28 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#DEDFE0"
+                android:layout_marginTop="18dp"
+                android:layout_marginBottom="7dp"
+                android:layout_height="1dp"/>
+
 
             <TextView
                 android:id="@+id/tv_chose_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="35dp"
-                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginStart="30dp"
                 android:hint="点击选择装货时间"
-                android:textColor="#5E5C5C"
-                android:textSize="@dimen/sp_15"></TextView>
+                android:textColor="@color/text_title"
+                android:textColorHint="#26292F"
+                android:textSize="@dimen/sp_16"></TextView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -200,61 +213,46 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_marginStart="35dp"
-                    android:layout_marginEnd="@dimen/dp_10"
                     android:src="@drawable/ic_name_out" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
+
 
                     <EditText
                         android:id="@+id/et_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
                         android:background="@null"
                         android:hint="姓名"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
+                        android:paddingStart="8dp"
+                        android:textColor="#545556"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_10"
                     android:src="@drawable/ic_phone_out" />
 
-                <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="35dp"
-                    android:layout_weight="1"
-                    android:padding="@dimen/dp_2"
-                    app:qmui_borderColor="#BFBFBF"
-                    app:qmui_borderWidth="@dimen/dp_1"
-                    app:qmui_radius="@dimen/dp_2">
 
                     <EditText
                         android:id="@+id/et_phone"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_height="35dp"
+                        android:layout_weight="1"
                         android:background="@null"
                         android:hint="电话"
-                        android:textColor="#101010"
-                        android:textColorHint="#BBBBBB"
+                        android:paddingStart="8dp"
+                        android:textColor="#545556"
+                        android:textColorHint="#979899"
                         android:textSize="@dimen/sp_15">
 
                     </EditText>
 
-                </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
             </LinearLayout>