Showing
5 changed files
with
14 additions
and
8 deletions
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | </div> | 11 | </div> |
12 | <!--im 主体--> | 12 | <!--im 主体--> |
13 | <div id="chat-window"> | 13 | <div id="chat-window"> |
14 | - <div id="chat-history-loader"><i></i>获取等多历史数据</div> | 14 | + <div id="chat-history-loader"><i></i>获取更多历史数据</div> |
15 | </div> | 15 | </div> |
16 | <div class="fake-img-wrap"> | 16 | <div class="fake-img-wrap"> |
17 | <img src="#" alt=""> | 17 | <img src="#" alt=""> |
1 | {{#each .}} | 1 | {{#each .}} |
2 | <div class="msg-wrap {{style from}}" data-uuid={{uuid}}> | 2 | <div class="msg-wrap {{style from}}" data-uuid={{uuid}}> |
3 | - <img src="{{image avatar 80 80}}" alt="" class="head-icon"> | 3 | + <img src="http:{{image avatar 80 80}}" alt="" class="head-icon"> |
4 | <div class="chat-info clearfix"> | 4 | <div class="chat-info clearfix"> |
5 | {{#with data}} | 5 | {{#with data}} |
6 | {{> (lookup .. 'type')}} | 6 | {{> (lookup .. 'type')}} |
@@ -10,9 +10,9 @@ | @@ -10,9 +10,9 @@ | ||
10 | <div class="order-good" data-id="{{id}}"> | 10 | <div class="order-good" data-id="{{id}}"> |
11 | <div class="thumb-wrap"> | 11 | <div class="thumb-wrap"> |
12 | {{#if link}} | 12 | {{#if link}} |
13 | - <a href="{{link}}"><img class="thumb lazy" src="{{image thumb 90 120}}"></a> | 13 | + <a href="{{link}}"><img class="thumb lazy" src="{{thumb}}"></a> |
14 | {{else}} | 14 | {{else}} |
15 | - <img class="thumb lazy" src="{{image thumb 90 120}}"> | 15 | + <img class="thumb lazy" src="{{thumb}}"> |
16 | {{/if}} | 16 | {{/if}} |
17 | <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p> | 17 | <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p> |
18 | </div> | 18 | </div> |
@@ -465,9 +465,7 @@ var chat = { | @@ -465,9 +465,7 @@ var chat = { | ||
465 | // ------------------------------------------ | 465 | // ------------------------------------------ |
466 | // 用户进入 | 466 | // 用户进入 |
467 | case allTypes.ENTER: | 467 | case allTypes.ENTER: |
468 | - if (chatMessage.type === 0) { | ||
469 | - this._sysInfo(chatMessage.newContent); | ||
470 | - } | 468 | + chatMessage.newContent || this._sysInfo(chatMessage.newContent); |
471 | break; | 469 | break; |
472 | 470 | ||
473 | case allTypes.BREAK_TIME: | 471 | case allTypes.BREAK_TIME: |
@@ -687,7 +685,7 @@ var chat = { | @@ -687,7 +685,7 @@ var chat = { | ||
687 | }, | 685 | }, |
688 | human: { | 686 | human: { |
689 | title: '<i class="chat-status"></i><span class="js-service-txt">正在连接...</span>', | 687 | title: '<i class="chat-status"></i><span class="js-service-txt">正在连接...</span>', |
690 | - right: '<span data-trigger="rating">评价</span>' | 688 | + right: '<span class="chat-rating-trigger" data-trigger="rating">评价</span>' |
691 | } | 689 | } |
692 | }; | 690 | }; |
693 | 691 |
@@ -129,6 +129,10 @@ | @@ -129,6 +129,10 @@ | ||
129 | transform: translate3d(100%, 0, 0); | 129 | transform: translate3d(100%, 0, 0); |
130 | } | 130 | } |
131 | 131 | ||
132 | + .chat-rating-trigger { | ||
133 | + display: none; | ||
134 | + } | ||
135 | + | ||
132 | /* 客服在线 */ | 136 | /* 客服在线 */ |
133 | .online { | 137 | .online { |
134 | .chat-status { | 138 | .chat-status { |
@@ -138,5 +142,9 @@ | @@ -138,5 +142,9 @@ | ||
138 | .menu-trigger { | 142 | .menu-trigger { |
139 | display: block !important; | 143 | display: block !important; |
140 | } | 144 | } |
145 | + | ||
146 | + .chat-rating-trigger { | ||
147 | + display: inline-block; | ||
148 | + } | ||
141 | } | 149 | } |
142 | } | 150 | } |
-
Please register or login to post a comment