Merge branch 'feature/im' into 'release/6.8.9'

fix new im data



See merge request !1724

@@ -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/',
 

@@ -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}}

@@ -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;

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