From 0d40485baa416e3bbdc25fcd6af08d6eb29204a8 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Tue, 20 Mar 2018 10:49:16 +0800
Subject: [PATCH] no message

---
 app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java | 3 +++
 app/src/main/res/layout/activity_mychild.xml                                          | 2 ++
 app/src/main/res/layout/fragment_login_and_regist.xml                                 | 2 +-
 app/src/main/res/layout/item_childlist.xml                                            | 3 +++
 app/src/main/res/layout/item_order_list.xml                                           | 1 +
 app/src/main/res/values/colors.xml                                                    | 2 +-
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
index 424458c..54ea630 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
@@ -168,6 +168,9 @@ public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContra
                             case 2://交易关闭
                                 tvPayState.setText("交易关闭");
                                 break;
+                            case 3:
+                                tvPayState.setText("支付失败");
+                                break;
                         }
                     }
                 }
diff --git a/app/src/main/res/layout/activity_mychild.xml b/app/src/main/res/layout/activity_mychild.xml
index 878e98c..c9420af 100644
--- a/app/src/main/res/layout/activity_mychild.xml
+++ b/app/src/main/res/layout/activity_mychild.xml
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/bgColor"
     android:layout_height="match_parent"
     android:orientation="vertical"
     >
@@ -24,6 +25,7 @@
         android:text="添加绑定账号"
         android:textColor="@color/white"
         android:textSize="@dimen/txtsize_title"
+        android:layout_marginBottom="@dimen/size_dp_10"
         android:gravity="center"
         android:background="@drawable/rudiobtn"
         />
diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml
index ef28507..57ebd48 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -21,7 +21,7 @@
                 android:layout_width="60dp"
                 android:layout_height="20dp"
                 android:visibility="invisible"
-                android:src="@drawable/arrow_left"
+                android:src="@drawable/back"
                 />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_childlist.xml b/app/src/main/res/layout/item_childlist.xml
index ce653fd..b97c3d5 100644
--- a/app/src/main/res/layout/item_childlist.xml
+++ b/app/src/main/res/layout/item_childlist.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/white"
+    android:divider="@color/divider_gray"
+    android:layout_marginTop="@dimen/size_dp_10"
     android:layout_height="wrap_content">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_order_list.xml b/app/src/main/res/layout/item_order_list.xml
index 8b620a0..ba49589 100644
--- a/app/src/main/res/layout/item_order_list.xml
+++ b/app/src/main/res/layout/item_order_list.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:elevation="@dimen/size_dp_5"
+    android:layout_margin="@dimen/size_dp_5"
     android:background="@drawable/shape_xueqing_radius8"
     android:id="@+id/layout_order_list"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 787a673..b74abc3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,7 @@
     <color name="colorAccent">#FF4081</color>
 
 
-    <color name="hintTextColor">#C1C1C1</color>
+    <color name="hintTextColor">#494947</color>
     <color name="bottomline">#B8B8B9</color>
     <color name="bg_main">#F0EFF5</color>
     <color name="textRed">#FC5B6A</color>
--
libgit2 0.21.0