15:10

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jan 04 14:18:32 CST 2018
-debugName=423
+#Thu Jan 04 15:05:32 CST 2018
+debugName=427
 versionName=624
-debugCode=423
+debugCode=427
 versionCode=163

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -185,8 +185,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
         else
             mBtnSignature.setVisibility(View.GONE);
 
-        if (sl_result == 1 & !ListUtils.isEmpty(kvModeList)
-                && StringUtil.isEmpty(sl_remark))
+        if (sl_result == 1 & !ListUtils.isEmpty(kvModeList))
             received_im.setVisibility(View.VISIBLE);
         else
             received_im.setVisibility(View.GONE);

app_modular/appme/src/main/res/layout/check_wages_activity.xml

@@ -99,8 +99,6 @@
             />
         <Button
             android:id="@+id/wages_code_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
             android:padding="2dp"
             android:text="获取验证码"
             android:textColor="@color/white"
@@ -109,13 +107,13 @@
             android:layout_marginRight="10dp"
             android:background="#2f95dd"
             android:visibility="visible"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="10dp"
+            android:layout_width="80dp"
+            android:layout_height="30dp"
             />
 
         <Button
             android:id="@+id/seconds_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
             android:padding="2dp"
             android:textColor="@color/white"
             android:textSize="@dimen/text_main"
@@ -123,7 +121,9 @@
             android:layout_marginRight="10dp"
             android:background="#DCDCDC"
             android:visibility="gone"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="10dp"
+            android:layout_width="80dp"
+            android:layout_height="30dp"
             />
 
 
@@ -142,7 +142,6 @@
         android:textColor="#2f95dd"
         android:textSize="12sp"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="10dp"
         android:layout_gravity="right"
         android:background="@null"
         />

app_modular/appme/src/main/res/layout/wages_details_activity.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="#ebe9e9">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -70,6 +71,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                <LinearLayout
+                   android:visibility="gone"
                    android:id="@+id/wages_ll"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@@ -147,7 +149,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:background="#ebe9e9">
+                >
 
                 <Button
                     android:id="@+id/btn_signature"