Browse Source

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

FANGLH 9 years ago
parent
commit
a71950f27b

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -464,7 +464,6 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         }
         if (isStartApp) {
             Intent intent = new Intent(WebViewCommActivity.this, MainActivity.class);
-           
             startActivity(intent);
             overridePendingTransition(0,0);
         } else {

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -1037,6 +1037,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if (StringUtils.isEmpty(itemValue.getGroup())) {
                             header.setVisibility(View.GONE);
                         } else {
+                            header.setVisibility(View.GONE);
+                            LogUtil.d("MainActivity:"+itemValue.getGroup());
                             if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
                                 item_add.setVisibility(View.VISIBLE);
                             } else {