1.货主端相关UI。

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

@@ -117,4 +117,7 @@ class AddressActivity : MBActivity<BViewModel<BRepository>, ActivityAddressBindi
     override fun title(): String? {
         return null
     }
+    override fun transluent(): Boolean {
+        return true
+    }
 }

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

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.activity
 
 import android.app.Activity
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import com.quansu.heifengwuliu.R
@@ -21,6 +22,7 @@ class InvoiceActivity : MBRActivity<InvoiceVModel, InvoiceAdapter, ActivityInvoi
     override fun initView(view: View?) {
         super.initView(view)
         titleBar()?.setRightText(getString(R.string.invoice_title))
+        titleBar()?.tvRight!!.setTextColor(Color.parseColor("#FFBC00"))
         titleBar()?.tvRight!!.setOnClickListener {
             //发票抬头
             UiSwitch.single(this, InvoiceTitleActivity::class.java)

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

@@ -71,7 +71,7 @@ class PasswordActivity : MBActivity<PasswordVModel, ActivityPasswordBinding>() {
 
        })
 
-       binding.btnPaySubmit.setOnClickListener {
+       binding.flPaySubmit.setOnClickListener {
            vm.toPaySubmit(oldPassword,newPassword)
        }
 

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

@@ -1,5 +1,6 @@
 package com.quansu.heifengwuliu.vmodel
 
+import android.graphics.Color
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
@@ -21,6 +22,17 @@ class InvoiceVModel : BRViewModel<BRRepository>() {
 
     }
 
+    fun getInvoiceColor(status: Int): Int {
+        return when (status) {
+            1 -> Color.parseColor("#FFBC00")
+            2 -> Color.parseColor("#FF6029")
+            3 -> Color.parseColor("#979899")
+            9 ->Color.parseColor("#979899")
+            else -> Color.parseColor("#979899")
+        }
+
+    }
+
     override fun api(): Observable<out IResponse<*>> {
         return NetEngine.service.invoiceList(repository().autoPage())
     }

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

@@ -13,8 +13,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/color_bg"
         android:orientation="vertical">
 
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
@@ -25,12 +30,61 @@
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:paddingBottom="54dp"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_invoice" />
+                tools:listitem="@layout/item_invoice"/>
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_gravity="bottom"
+            android:background="@color/white"
+            android:layout_height="54dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_marginStart="46dp"
+                android:text="可开发票总金额："
+                android:textColor="#1C1C1C"
+                android:textSize="14sp"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:text="￥"
+                android:textColor="#FFBC00"
+                android:textSize="14sp"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                tools:text="70000.00"
+                android:textColor="#FFBC00"
+                android:textSize="20sp"
+                android:layout_height="wrap_content"/>
+            
+              <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                  android:layout_width="100dp"
+                  app:qmui_radius="20dp"
+                  app:qmui_backgroundColor="#FFBB00"
+                  android:text="申请开票"
+                  app:qmui_borderColor="#FFBB00"
+                  android:textSize="14sp"
+                  android:textColor="@color/white"
+                  android:layout_marginEnd="12dp"
+                  android:layout_height="40dp"/>
+
+
+
+
+        </LinearLayout>
+
+        </FrameLayout>
+
+
     </LinearLayout>
 
 </layout>

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

@@ -1,93 +1,115 @@
 <?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:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
 
-    <data >
         <import type="android.view.View" />
+
         <variable
             name="vm"
             type="com.quansu.heifengwuliu.vmodel.InvoiceTitleVModel" />
-    </data >
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/dp_14"
-        android:orientation="vertical"
-        android:paddingEnd="@dimen/dp_14" >
+        android:background="@color/color_bg"
+        android:orientation="vertical">
 
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-            android:id="@+id/lay_input"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_12"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_14"
-            app:qmui_borderColor="#F4F3F9"
-            app:qmui_borderWidth="@dimen/dp_1"
-            app:rv_radius="25dp" >
+            android:background="@color/white"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:orientation="vertical">
+
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
+                android:orientation="vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                    android:textSize="12sp"
+                    android:layout_marginTop="10dp"
                     android:text="名  称" />
 
                 <com.ysnows.base.widget.DelEditText
-
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
                     android:hint="@string/please_enter"
-                    android:paddingStart="@dimen/dp_18"
                     android:text="@={vm.company}"
-                    android:textSize="@dimen/sp_13" />
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
+                    android:textSize="@dimen/sp_14" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_height="1dp"/>
 
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:orientation="vertical"
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                    android:layout_marginTop="10dp"
+                    android:textSize="12sp"
                     android:text="税  号" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
                     android:hint="@string/please_enter"
-                    android:paddingStart="@dimen/dp_18"
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
                     android:text="@={vm.sn}"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
-
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_height="1dp"/>
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                    android:layout_marginTop="10dp"
+                    android:textSize="12sp"
                     android:text="单位地址" />
 
                 <com.ysnows.base.widget.DelEditText
@@ -95,22 +117,34 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
                     android:hint="@string/please_enter"
-                    android:paddingStart="@dimen/dp_18"
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
                     android:text="@={vm.addr}"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_height="1dp"/>
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                  android:layout_marginTop="10dp"
+                    android:textSize="12sp"
                     android:text="电话号码" />
 
                 <com.ysnows.base.widget.DelEditText
@@ -118,45 +152,67 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
                     android:hint="@string/please_enter"
                     android:inputType="phone"
-                    android:paddingStart="@dimen/dp_18"
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
                     android:text="@={vm.tel}"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_height="1dp"/>
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:orientation="vertical"
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                    android:layout_marginTop="10dp"
+                    android:textSize="12sp"
                     android:text="开户银行" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
                     android:hint="@string/please_enter"
-                    android:paddingStart="@dimen/dp_18"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
                     android:text="@={vm.bank}"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_height="1dp"/>
             <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
+                android:orientation="vertical"
                 android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:paddingEnd="@dimen/dp_14">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#5D5E5F"
+                    android:layout_marginTop="10dp"
+                    android:textSize="12sp"
                     android:text="银行账号" />
 
                 <com.ysnows.base.widget.DelEditText
@@ -164,34 +220,58 @@
                     android:layout_height="match_parent"
                     android:background="@color/white"
                     android:hint="@string/please_enter"
-                    android:paddingStart="@dimen/dp_18"
+                    android:layout_marginTop="18dp"
+                    android:layout_marginBottom="7dp"
+                    android:textColorHint="#ACAFAC"
+                    android:textColor="#26292F"
                     android:text="@={vm.number}"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#EFF0F1"
+                android:layout_marginBottom="25dp"
+                android:layout_height="1dp"/>
 
 
+        </LinearLayout>
 
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
 
         <View
             android:layout_width="match_parent"
-            android:layout_weight="1"
-            android:layout_height="0dp"></View>
+            android:layout_height="0dp"
+            android:layout_weight="1"></View>
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/btn_submmit"
+
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginStart="@dimen/dp_30"
-            android:layout_marginEnd="@dimen/dp_30"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:onClick="@{v->vm.toSubmit()}"
-            android:text="@string/save"
-            />
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="13dp"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:onClick="@{v->vm.toSubmit()}">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="106dp"
+                android:src="@drawable/ic_details_grab" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/save"
+                android:textColor="@color/white"
+                android:textSize="16sp">
+
+            </TextView>
+
+        </FrameLayout>
+
 
-    </LinearLayout >
+    </LinearLayout>
 
-</layout >
+</layout>

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

@@ -19,7 +19,7 @@
         android:name="com.ysnows.login.activity.LoginActivity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white"
+        android:background="@color/color_bg"
         android:fitsSystemWindows="true"
         android:orientation="vertical"
         tools:context="com.quansu.heifengwuliu.activity.LoginActivity">
@@ -31,62 +31,64 @@
             android:visibility="@{vm.type==1?View.VISIBLE:View.GONE}"
             android:orientation="vertical">
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginStart="35dp"
-                android:layout_marginEnd="35dp"
-                android:layout_marginTop="25dp"
+                android:layout_height="43dp"
+                android:layout_marginTop="12dp"
+                android:background="@color/white"
                 android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_8"
+                android:paddingStart="35dp"
                 android:paddingEnd="@dimen/dp_14"
                 android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
-                app:qmui_backgroundColor="#F4F3F9"
-                app:qmui_borderColor="#F4F3F9"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:rv_radius="25dp"
-
+                android:orientation="horizontal"
                 >
 
-                <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:padding="5dp"
-                    android:src="@drawable/ic_login_pwd" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp"
+                    android:text="原密码"
+                    android:layout_marginEnd="18dp"
+                    android:layout_height="wrap_content"/>
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_old_pwd"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@null"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
                     android:hint="@string/please_input_old_pwd"
                     android:inputType="textPassword"
                     android:text="@={vm.oldpassWord}"
-                    android:textSize="@dimen/sp_15" />
+                    android:textSize="@dimen/sp_14" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:background="#F3F4F5"
+                android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
+                android:layout_height="1dp"/>
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginStart="35dp"
-                android:layout_marginEnd="35dp"
-                android:layout_marginTop="25dp"
+                android:layout_height="43dp"
+                android:background="@color/white"
                 android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_8"
+                android:paddingStart="35dp"
                 android:paddingEnd="@dimen/dp_14"
-                app:qmui_backgroundColor="#F4F3F9"
-                app:qmui_borderColor="#F4F3F9"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:rv_radius="25dp"
-
+                android:orientation="horizontal"
                 >
 
-                <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:padding="5dp"
-                    android:src="@drawable/ic_login_pwd" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp"
+                    android:text="原密码"
+                    android:layout_marginEnd="18dp"
+                    android:layout_height="wrap_content"/>
+
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_new_pwd"
@@ -95,33 +97,35 @@
                     android:background="@null"
                     android:hint="@string/please_input_new_pwd"
                     android:inputType="textPassword"
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
                     android:text="@={vm.passWord}"
-                    android:textSize="@dimen/sp_15" />
+                    android:textSize="@dimen/sp_14" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+            </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:background="#F3F4F5"
+                android:layout_height="1dp"/>
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginStart="35dp"
-                android:layout_marginEnd="35dp"
-                android:layout_marginTop="25dp"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_8"
+                android:layout_height="43dp"
+                android:paddingStart="35dp"
+                android:background="@color/white"
                 android:paddingEnd="@dimen/dp_14"
-                app:qmui_backgroundColor="#F4F3F9"
-                app:qmui_borderColor="#F4F3F9"
-                app:qmui_borderWidth="@dimen/dp_1"
-                app:rv_radius="25dp"
-
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
                 >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/text_title"
+                    android:textSize="14sp"
+                    android:text="原密码"
+                    android:layout_marginEnd="18dp"
+                    android:layout_height="wrap_content"/>
 
-                <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:padding="5dp"
-                    android:src="@drawable/ic_login_pwd" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_new_pwd_to"
@@ -131,9 +135,12 @@
                     android:hint="@string/please_input_new_pwd_twice"
                     android:inputType="textPassword"
                     android:text="@={vm.passWordTo}"
-                    android:textSize="@dimen/sp_15" />
+                    android:textColor="@color/text_title"
+                    android:textColorHint="#979899"
+                    android:textSize="@dimen/sp_14" />
+
+            </LinearLayout>
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
             <View
                 android:layout_width="match_parent"
@@ -142,30 +149,30 @@
 
             </View>
 
-            <androidx.cardview.widget.CardView
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:layout_marginLeft="35dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="35dp"
-                android:layout_marginBottom="@dimen/dp_40"
-                android:background="@color/colorPrimary"
-                app:cardBackgroundColor="@color/colorPrimary"
-                app:cardCornerRadius="22.5dp"
-                app:cardElevation="2dp"
-                app:cardPreventCornerOverlap="true">
-
-                <Button
-                    android:id="@+id/btn_submit"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="13dp"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:onClick="@{v->vm.toSubmit()}">
+
+                <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="#E17E30"
-                    android:onClick="@{v->vm.toSubmit()}"
+                    android:layout_height="106dp"
+                    android:src="@drawable/ic_details_grab" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
                     android:text="@string/submit"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16" />
+                    android:textSize="16sp">
+
+                </TextView>
 
-            </androidx.cardview.widget.CardView>
+            </FrameLayout>
 
 
 
@@ -191,7 +198,7 @@
 
                  <TextView
                      android:layout_width="wrap_content"
-                     android:textSize="@dimen/sp_15"
+                     android:textSize="@dimen/sp_14"
                      android:textColor="@color/text_title"
                      android:text="原支付密码："
                      android:layout_height="wrap_content">
@@ -224,7 +231,7 @@
 
                  <TextView
                      android:layout_width="wrap_content"
-                     android:textSize="@dimen/sp_15"
+                     android:textSize="@dimen/sp_14"
                      android:textColor="@color/text_title"
                      android:text="新支付密码："
                      android:layout_height="wrap_content">
@@ -252,31 +259,32 @@
 
              </View>
 
-             <androidx.cardview.widget.CardView
+
+             <FrameLayout
+                 android:id="@+id/fl_pay_submit"
                  android:layout_width="match_parent"
-                 android:layout_height="45dp"
-                 android:layout_marginLeft="35dp"
-                 android:layout_marginTop="10dp"
-                 android:layout_marginRight="35dp"
-                 android:layout_marginBottom="@dimen/dp_40"
-                 android:background="@color/colorPrimary"
-                 app:cardBackgroundColor="@color/colorPrimary"
-                 app:cardCornerRadius="22.5dp"
-                 app:cardElevation="2dp"
-                 app:cardPreventCornerOverlap="true">
-
-                 <Button
-                     android:id="@+id/btn_pay_submit"
+                 android:layout_height="wrap_content"
+                 android:layout_marginStart="16dp"
+                 android:layout_marginTop="13dp"
+                 android:layout_marginEnd="@dimen/dp_16"
+                 >
+
+                 <ImageView
                      android:layout_width="match_parent"
-                     android:layout_height="match_parent"
-                     android:background="#E17E30"
+                     android:layout_height="106dp"
+                     android:src="@drawable/ic_details_grab" />
+
+                 <TextView
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_gravity="center"
                      android:text="@string/submit"
                      android:textColor="@color/white"
-                     android:textSize="@dimen/sp_16" />
-
-             </androidx.cardview.widget.CardView>
+                     android:textSize="16sp">
 
+                 </TextView>
 
+             </FrameLayout>
 
 
 

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools" >
 
     <data >
+        <import type="android.view.View" />
 
         <variable
             name="vm"
@@ -19,17 +20,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginEnd="@dimen/dp_12"
-        android:layout_marginStart="@dimen/dp_12"
-        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="17dp"
+        android:layout_marginTop="12dp"
          >
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:layout_width="match_parent"
             app:qmui_radius="@dimen/dp_4"
-            app:qmui_borderColor="#BBBBBB"
-            app:qmui_borderWidth="@dimen/dp_1"
-            android:padding="@dimen/dp_10"
+            app:qmui_borderColor="@color/white"
+            app:qmui_backgroundColor="@color/white"
+            android:paddingEnd="12dp"
+            android:paddingStart="12dp"
+            android:paddingTop="18dp"
+            android:paddingBottom="18dp"
             android:orientation="vertical"
             android:layout_height="wrap_content">
 
@@ -45,8 +49,9 @@
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:maxLines="1"
+                    android:textStyle="bold"
                     android:text="@{item.company}"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_15"
                     android:textColor="@color/text_title"
                     tools:text="@string/app_name" />
 
@@ -56,8 +61,9 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="@{vm.getInvoiceStatus(item.status)}"
-                    android:textColor="#67ACEE"
-                    android:textSize="@dimen/sp_16"
+                    tools:textColor="#FFBC00"
+                    android:textColor="@{vm.getInvoiceColor(item.status)}"
+                    android:textSize="@dimen/sp_14"
                     tools:text="@string/app_name" />
 
             </LinearLayout>
@@ -77,8 +83,8 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:text="@{@string/total_img+item.money}"
-                    android:textColor="#BC5B55"
-                    android:textSize="@dimen/sp_16"
+                    android:textColor="#FFBC00"
+                    android:textSize="@dimen/sp_17"
                     tools:text="@string/app_name" />
 
                 <TextView
@@ -87,9 +93,9 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:textColor="@color/text_title"
+                    android:textColor="#767778"
                     android:text="@{item.create_time}"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/sp_14"
                     tools:text="@string/app_name" />
 
             </LinearLayout>