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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -1183,13 +1183,23 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 switch (resId) {
                     case R.id.ib_ranking_condition://排名
                         // ToastUtil.showToast(ct, year + "-" + month);
-                        ib_ranking_condition.setText(month + "月");
-                        sendPersonalRank(year + month);
+                        if (CommonUtil.isNetWorkConnected(ct)) {
+                            ib_ranking_condition.setText(month + "月");
+                            sendPersonalRank(year + month);
+                        } else {
+                            ToastUtil.showToast(ct, R.string.networks_out);
+                        }
+
                         break;
                     case R.id.ib_index_condition://图表
                         //  ToastUtil.showToast(ct, year + "-" + month);
-                        ib_index_condition.setText(month + "月");
-                        sendTargets(year + month);
+                        if (CommonUtil.isNetWorkConnected(ct)) {
+                            ib_index_condition.setText(month + "月");
+                            sendTargets(year + month);
+                        } else {
+                            ToastUtil.showToast(ct, R.string.networks_out);
+                        }
+
                         break;
                   /*  case R.id.ib_sale_condition://销售
                         ToastUtil.showToast(ct, year + "-" + month );

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorkPlatFragment.java

@@ -114,7 +114,7 @@ public class WorkPlatFragment extends BaseMVPFragment<WorkPlatPresenter> impleme
         if (isFirstLoad) {
             loadOrdersCaller();
         }
-        obtainCityIndustryService();
+//        obtainCityIndustryService();
     }
 
     private void getLocalMenu() {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 14 16:31:19 CST 2017
-debugName=163
-versionName=624
-debugCode=163
-versionCode=163
+#Thu Dec 14 15:15:01 CST 2017
+debugName=160
+versionName=625
+debugCode=160
+versionCode=164