Merge branch 'release/5.3' into gray

@@ -11,7 +11,7 @@
     </div>
     <!--im 主体-->
     <div id="chat-window">
-        <div id="chat-history-loader"><i></i>获取等多历史数据</div>
+        <div id="chat-history-loader"><i></i>获取更多历史数据</div>
     </div>
     <div class="fake-img-wrap">
         <img src="#" alt="">

 {{#each .}}
 <div class="msg-wrap {{style from}}" data-uuid={{uuid}}>
-    <img src="{{image avatar 80 80}}" alt="" class="head-icon">
+    <img src="http:{{image avatar 80 80}}" alt="" class="head-icon">
     <div class="chat-info clearfix">
             {{#with data}}
                 {{> (lookup .. 'type')}}

@@ -10,9 +10,9 @@
                 <div class="order-good" data-id="{{id}}">
                     <div class="thumb-wrap">
                     {{#if link}}
-                    <a href="{{link}}"><img class="thumb lazy" src="{{image thumb 90 120}}"></a>
+                    <a href="{{link}}"><img class="thumb lazy" src="{{thumb}}"></a>
                     {{else}}
-                    <img class="thumb lazy" src="{{image thumb 90 120}}">
+                    <img class="thumb lazy" src="{{thumb}}">
                     {{/if}}
                     <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
                     </div>

@@ -465,9 +465,7 @@ var chat = {
             // ------------------------------------------
             // 用户进入
             case allTypes.ENTER:
-                if (chatMessage.type === 0) {
-                    this._sysInfo(chatMessage.newContent);
-                }
+                chatMessage.newContent || this._sysInfo(chatMessage.newContent);
                 break;
 
             case allTypes.BREAK_TIME:
@@ -687,7 +685,7 @@ var chat = {
             },
             human: {
                 title: '<i class="chat-status"></i><span class="js-service-txt">正在连接...</span>',
-                right: '<span data-trigger="rating">评价</span>'
+                right: '<span class="chat-rating-trigger" data-trigger="rating">评价</span>'
             }
         };
 

@@ -129,6 +129,10 @@
         transform: translate3d(100%, 0, 0);
     }
 
+    .chat-rating-trigger {
+        display: none;
+    }
+
     /* 客服在线 */
     .online {
         .chat-status {
@@ -138,5 +142,9 @@
         .menu-trigger {
             display: block !important;
         }
+
+        .chat-rating-trigger {
+            display: inline-block;
+        }
     }
 }