Merge branch 'release/6.8.9' into 'master'

Release/6.8.9



See merge request !1727

@@ -4,7 +4,9 @@
             {{#each prdList}}
             <div id="{{../../template_id}}" name="{{../../template_intro}}" class="product-item" data-product-skn="{{productSkn}}"
                 data-activity-id="{{activityId}}">
-                <img src="{{image2 defaultImages w=188 h=250 q=60 mode=3}}"></img>
+                <div class="product-image-bg">
+                    <img src="{{image2 defaultImages w=188 h=250 q=60 mode=3}}"></img>
+                </div>
                 <div class="product-name">{{brandName}}</div>
                 <div class='product-price-wrap'>
                     <span class='product-price'>{{formatCollagePrice}}</span>

@@ -34,8 +34,8 @@ const domains = {
     ufo: 'http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/',
     yoLuck: 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com',
 
-    imSocket: 'wss://imsocket.yohobuy.com:443',
-    imCs: 'https://imhttp.yohobuy.com/api',
+    imSocket: 'ws://socket.yohobuy.com:10240',
+    imCs: 'http://im.yohobuy.com/api',
     global: 'http://api-global.yohobuy.com',
     store: 'http://192.168.102.47:8080/portal-gateway/',
 

 {
   "name": "yohobuywap-node",
-  "version": "6.8.9",
+  "version": "6.8.9-2",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -14,10 +14,7 @@
   <div class="msg-content msg-order">
     {{!--<img src="{{imgSrc}}">--}}
     <div class="order-info">
-        <span class="label">订单号: </span><span>{{orderCode}}</span><br>
-        <span class="label">金额: </span><span class="red">{{cost}}</span><br>
-        <span class="label">下单时间: </span><span>{{createTime}}</span><br>
-        <span class="label">订单状态: </span><span>{{orderStatus}}</span><br>
+        {{{content}}}
     </div>
 </div>
 {{/inline}}

@@ -277,7 +277,7 @@ let chat = {
                         }
                     };
 
-                    self.sendMSG(content);
+                    self.sendMSG(content, true);
                     event.target.value = '';
                 }
             });
@@ -290,7 +290,7 @@ let chat = {
                     style: 'send-msg',
                 };
 
-                self.sendMSG(msg);
+                self.sendMSG(msg, true);
                 self.$chatWin[0].scrollTop = self.$chatWin[0].scrollHeight;
             });
 
@@ -552,14 +552,9 @@ let chat = {
 
                 break;
             case 10:
-                chatMessage.content = JSON.parse(chatMessage.content);
-
                 viewData.type = msgTypeMap[10];
                 viewData.data = {
-                    orderCode: chatMessage.content[1],
-                    cost: chatMessage.content[3],
-                    createTime: chatMessage.content[5],
-                    orderStatus: chatMessage.content[7],
+                    content: chatMessage.newContent
                 };
 
                 break;
@@ -603,6 +598,13 @@ let chat = {
         }
 
         switch (recType) {
+            case allTypes.CU_SEND:
+                viewData = this.buildViewData(rec);
+                if (viewData.type === msgTypeMap[2]) {
+                    break;
+                }
+                viewData && this._drawMSG(viewData);
+                break;
 
             // 客服消息
             case allTypes.CS_SEND:

@@ -17,6 +17,13 @@
         }
     }
 
+    .product-image-bg {
+        display: block;
+        width: 188px;
+        overflow: hidden;
+        height: 250px;
+    }
+
     .product-name {
         text-align: center;
         font-size: 24px;

@@ -181,15 +181,12 @@
             padding: 0;
             font-size: 28px;
             line-height: 1;
+            color: #b0b0b0;
         }
 
         .red {
             color: #d0021b;
         }
-
-        .label {
-            color: #b0b0b0;
-        }
     }
 
     /* 网络连接失败 */