提交分类： 打包版本；

提交内容：  打包发布
当前版本：  正式版本6.1.6
是否冲突：  否

WeiChat/build.gradle

@@ -120,7 +120,7 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
-    /*applicationVariants.all { variant ->
+    applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
@@ -142,7 +142,7 @@ android {
                 output.outputFile = new File(outputFile.parent, fileName)
             }
         }
-    }*/
+    }
 }
 
 dependencies {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -188,7 +188,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     } else if (ApiUtils.getApiModel() instanceof ApiUAS) {
                         String travelCaller = CommonUtil.getSharedPreferences(context, Constants.WORK_TRAVEL_CALLER_CACHE);
                         if (StringUtil.isEmpty(travelCaller)) {
-                            intent.putExtra("caller", "FeePlease!CCSQ!new");
+                            intent.putExtra("caller", "FeePlease!CCSQ");
                         } else {
                             intent.putExtra("caller", travelCaller);
                         }

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 19:46:15 CST 2018
-debugName=155
-versionName=613
-debugCode=155
-versionCode=152
+#Thu Jan 25 09:56:32 CST 2018
+debugName=159
+versionName=617
+debugCode=159
+versionCode=156

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

@@ -271,7 +271,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_b2b_commerce",
         "menuIcon": "ic_work_b2b_commerce",
-        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuActivity": "com.modular.work.B2BBusinessLoginActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false
@@ -284,15 +284,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "b2b商务",
-        "menuIcon": "",
-        "menuActivity": "com.modular.work.B2BBusinessLoginActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   }

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

@@ -127,7 +127,7 @@
         "isLocalMenu": true,
         "menuName": "str_work_b2b_commerce",
         "menuIcon": "ic_work_b2b_commerce",
-        "menuActivity": "com.modular.apputils.activity.SimpleWebActivity",
+        "menuActivity": "com.modular.work.B2BBusinessLoginActivity",
         "menuUrl": "",
         "caller": "",
         "isHide": false

app_core/common/src/main/java/com/core/app/Constants.java

@@ -17,7 +17,7 @@ public class Constants {
         String url = "";
         if (BaseConfig.isDebug()) {
             url = IM_BASE_URL_TEST;
-            url = IM_BASE_URL;
+//            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -477,7 +477,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         toast(failStr);
     }
 
-    class Reply {
+    public static class Reply {
 
         /**
          * lapQty : 10

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

@@ -77,12 +77,13 @@
             android:gravity="right"
             android:paddingLeft="10dp"
             android:text="¥"
-            android:textColor="@color/text_main" />
+            android:textColor="@color/text_main"
+            android:visibility="gone" />
 
         <FrameLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="3">
+            android:layout_weight="4">
 
             <EditText
                 android:id="@+id/list_subsection_quotation_price_et"