Merge branch 'release/5.3' into gray

@@ -139,7 +139,6 @@
                 {{> common/goods}}
                 {{> common/goods}}
             {{/@root.firstPageGoodsList}}
             {{/@root.firstPageGoodsList}}
         </div>
         </div>
-        <div class="search-divide">正在加载...</div>
         <div class="default-goods container clearfix"></div>
         <div class="default-goods container clearfix"></div>
         <div class="new-goods container clearfix"></div>
         <div class="new-goods container clearfix"></div>
         <div class="sale-goods container clearfix"></div>
         <div class="sale-goods container clearfix"></div>

@@ -13,7 +13,7 @@ module.exports = () => {
             pageChannel: {}
             pageChannel: {}
         };
         };
 
 
-        let ua = req.get('User-Agent').toLowerCase();
+        let ua = (req.get('User-Agent') || '').toLowerCase();
 
 
         const channel = req.query.channel || req.cookies._Channel || 'boys';
         const channel = req.query.channel || req.cookies._Channel || 'boys';
 
 

@@ -212,7 +212,7 @@ var chat = {
             self._sysInfo(`您对我们的服务评价为：${data}`);
             self._sysInfo(`您对我们的服务评价为：${data}`);
             self.canEvalute = false;
             self.canEvalute = false;
             cmEntity.type = socketConf.recType.EVALUTE_SUCCESS;
             cmEntity.type = socketConf.recType.EVALUTE_SUCCESS;
-            socket.send(cmEntity);
+            socket.send(JSON.stringify(cmEntity));
             resizeFooter();
             resizeFooter();
         });
         });
 
 
@@ -413,7 +413,7 @@ var chat = {
             case 1:
             case 1:
                 viewData.type = msgTypeMap[1];
                 viewData.type = msgTypeMap[1];
                 viewData.data = {
                 viewData.data = {
-                    content: emojiHanlder(chatMessage.content)
+                    content: emojiHanlder(chatMessage.newContent)
                 };
                 };
 
 
                 break;
                 break;