Merge remote-tracking branch 'origin/develop_01上线4.7.4’

# Conflicts: # .DS_Store
2020-01-17 13:44:48 +08:00
parent 057d0da045 8fca79324a
commit 8457a28000
62 changed files with 5106 additions and 280 deletions
@@ -37,8 +37,12 @@
        attch.image = [UIImage imageNamed:@"explore_iocn_authentication"];
        attch.bounds = CGRectMake(0,0, 12, 10);
    }
-    NSAttributedString *str=[NSAttributedString attributedStringWithAttachment:attch];
-    [attri appendAttributedString:str];
+    if (attch.image)
+    {
+        NSAttributedString *str=[NSAttributedString attributedStringWithAttachment:attch];
+           [attri appendAttributedString:str];
+    }
+   
    self.tanSuoTitle.attributedText = attri;
    
 }