Merge branch 'release4.7.13' of http://192.168.3.207:8080/qmx/jy into release4.7.13

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1088,8 +1088,7 @@ function kfData(acync, num) {
     type: 'POST',
     url: '/jyapi/message/messageCount',
     async: acync || false,
-    data: JSON.stringify({userType: 2}),
-    contentType: 'application/json',
+    data: {userType: 2},
     success: function (res) {
       localStorage.setItem('isMsgNum', num + res.count)
     }

src/web/staticres/js/message.js

@@ -91,7 +91,7 @@ function Message() {
                         success: function (s) {
                             if (r.data.count + s.count > 0) {
                                 $('#tips').show()
-                                $('#tips').html(r.data.count > 99 ? '99+' : r.data.count)
+                                $('#tips').html(r.data.count + s.count > 99 ? '99+' : r.data.count + s.count)
                                 $('#noNum').html(r.data.count + s.count)
                             } else {
                                 $('#tips').hide()