Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/src/main/res/values-zh-rCN/strings.xml
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Feb 08 16:46:02 CST 2018
-debugName=239
+#Thu Feb 08 17:53:25 CST 2018
+debugName=242
 versionName=620
-debugCode=239
+debugCode=242
 versionCode=159

app_core/common/src/main/assets/work_menu.json

@@ -24,6 +24,15 @@
         "caller": "",
         "isHide": false
       },
+      {
+        "isLocalMenu": true,
+        "menuName": "charitable",
+        "menuIcon": "ic_work_charitable_donations",
+        "menuActivity": "com.modular.work.CharitableActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      },
       {
         "isLocalMenu": true,
         "menuName": "str_work_invite_register",
@@ -176,6 +185,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_company_salary",
+        "menuIcon": "company_salary",
+        "menuActivity": "com.modular.appme.CheckWagesActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },
@@ -275,15 +293,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "str_company_salary",
-        "menuIcon": "company_salary",
-        "menuActivity": "com.modular.appme.CheckWagesActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },

app_modular/appworks/src/main/res/layout/item_bus_travel_hotel.xml

@@ -58,7 +58,7 @@
             android:id="@+id/businessNameTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/levelTv"
+            android:layout_alignTop="@id/levelTv"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/levelTv"
             android:text="香格里拉酒店"
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/levelTv"
-            android:layout_below="@id/levelTv"
+            android:layout_below="@id/businessNameTv"
             android:layout_marginTop="@dimen/padding"
             android:text="入住：12-10     离店：12-12    共两晚"
             android:textColor="@color/white"