diff --git a/api/message.js b/api/message.js
index dc373c46a806a824acf0bfc9cd0a1740d79b6e07..fcf2ce8280c75323c17372c0fb698126272f46fb 100644
--- a/api/message.js
+++ b/api/message.js
@@ -50,7 +50,7 @@ export function deleteMessage(ids) {
  */
 export function getUnreadChatNum() {
   return request.ajax({
-    url: `${config.api.im}/buyer/im/unread-num`,
+    url: `${config.api.buyer}/buyer/im/unread-num`,
     method: Method.POST,
     needToken: true
   })
diff --git a/chat-module/ChatApi.js b/chat-module/ChatApi.js
index 7c523609dea05c6a38134ddcef8104b8a28d12ff..0870f73636939c51400dd21da3a81893b76b3d7f 100644
--- a/chat-module/ChatApi.js
+++ b/chat-module/ChatApi.js
@@ -15,7 +15,7 @@ export default class ChatApi {
    */
   getFriends() {
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/friends-list`,
+      url: api.buyer + `/${this.client_type}/im/friends-list`,
       method: Method.GET,
       loading: false,
       needToken: true
@@ -28,7 +28,7 @@ export default class ChatApi {
    */
   createSession(receiver_id) {
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/session/${receiver_id}`,
+      url: api.buyer + `/${this.client_type}/im/session/${receiver_id}`,
       method: Method.POST,
       loading: false,
       needToken: true
@@ -45,7 +45,7 @@ export default class ChatApi {
     delete _params.no_data
     delete _params.loading
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/history`,
+      url: api.buyer + `/${this.client_type}/im/history`,
       method: Method.GET,
       loading: false,
       needToken: true,
@@ -60,7 +60,7 @@ export default class ChatApi {
    */
   getNewMessage(receiver_id) {
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/history`,
+      url: api.buyer + `/${this.client_type}/im/history`,
       method: Method.GET,
       loading: false,
       needToken: true,
@@ -81,7 +81,7 @@ export default class ChatApi {
       receiver_id: receiverId
     }
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/message/${type}`,
+      url: api.buyer + `/${this.client_type}/im/message/${type}`,
       method: 'post',
       loading: false,
       needToken: true,
@@ -96,7 +96,7 @@ export default class ChatApi {
    */
   getOrderList(params, receiverId) {
     return request.ajax({
-      url: `${api.buyer}/trade/orders/im/${receiverId}`,
+      url: `${api.buyer}/${this.client_type}/im/orders/${receiverId}`,
       method: 'get',
       loading: false,
       needToken: true,
@@ -111,7 +111,7 @@ export default class ChatApi {
    */
   getGoodsList(params) {
     return request.ajax({
-      url: `${api.buyer}/members/history/list-page`,
+      url: `${api.buyer}/${this.client_type}/members/history/list-page`,
       method: 'get',
       loading: false,
       needToken: true,
@@ -126,7 +126,7 @@ export default class ChatApi {
    */
   removeUnreadNum(receiver_id) {
     return request.ajax({
-      url: api.im + `/${this.client_type}/im/unread-num`,
+      url: api.buyer + `/${this.client_type}/im/unread-num`,
       method: 'delete',
       loading: false,
       needToken: true,
@@ -135,17 +135,4 @@ export default class ChatApi {
       }
     })
   }
-
-  /**
-   * 获取websocket连接Token
-   * @returns {*}
-   */
-  getWebsocketToken() {
-      return request.ajax({
-          url: api.im + `/${this.client_type}/im/token`,
-          method: 'get',
-          loading: false,
-          needToken: true
-      })
-  }
 }
diff --git a/chat-module/Websocket.js b/chat-module/Websocket.js
index 51b2b391ad4866e5fbb006fc2e08f0d797179411..37a4e1f6367b0f9a6dcd34f94ad1e0fda5dfee3a 100644
--- a/chat-module/Websocket.js
+++ b/chat-module/Websocket.js
@@ -59,27 +59,17 @@ function reconnect(url) {
 
 /**
  * 心跳检测
- * @type {{serverTimeoutObj: null, timeoutObj: null, start: heartCheck.start, timeout: number}}
+ * @type {{timeoutObj: null, start: heartCheck.start, timeout: number}}
  */
 var heartCheck = {
-  timeout: 1000 * 60,
+  timeout: 1000 * 20,
   timeoutObj: null,
-  serverTimeoutObj: null,
   start: function() {
-    console.log('开始心跳检测')
-    var self = this
     this.timeoutObj && clearTimeout(this.timeoutObj)
-    this.serverTimeoutObj && clearTimeout(this.serverTimeoutObj)
     this.timeoutObj = setTimeout(function() {
-      console.log('心跳检测...')
       uni.sendSocketMessage({
         data: ''
       })
-      self.serverTimeoutObj = setTimeout(function() {
-        if (!socketOpen) {
-          uni.closeSocket()
-        }
-      }, self.timeout)
     }, this.timeout)
   }
 }
diff --git a/chat-module/chat-item.vue b/chat-module/chat-item.vue
index 92bebb0cdecb28f600e871abec4d4745fe6d24e4..b853a3d155b75a1a00c9d80b8e520b7374e9437a 100644
--- a/chat-module/chat-item.vue
+++ b/chat-module/chat-item.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="chat-item" :class="{'is-self': message['is_self']}">
-    <image :src="user.face" class="chat-face" />
+    <image :src="userFace" class="chat-face" />
     <view class="chat-content" :class="message.type" @tap="handleClickMessage">
       <!-- 文字[emoji]消息 -->
       <view v-if="message.type === 'TEXT'">
@@ -11,29 +11,32 @@
         <image :src="message['goods_image']" class="goods-image" />
         <view class="goods-info">
           <text class="goods-name">{{ message['goods_name'] }}</text>
-          <text class="goods-price">￥{{ message['goods_price'] }}</text>
+          <text class="goods-price">{{unitOfCurrency }}{{ message['goods_price'] }}</text>
         </view>
       </view>
       <!-- 订单消息 -->
       <view v-else-if="message.type === 'ORDER'" class="order-message">
         <view class="order-info">
-          <text>订单号: {{ message['order_sn'] }}</text>
-          <text style="width: 30%;">{{ formatDate(message['create_time'], 'MM-dd hh:mm') }}</text>
+          <view>订单号: {{ message['order_sn'] }}</view>
+          <view>下单时间: {{ formatDate(message['create_time'], 'MM-dd hh:mm') }}</view>
         </view>
-        <view class="order-goods" v-for="goods in message.goods_list" :key="goods.name">
-          <image :src="goods['goods_image']" class="goods-image" />
-          <view class="goods-info">
-            <text class="goods-name">{{ goods['goods_name'] }}</text>
+        <view class="order-goods">
+          <view class="goods-message" v-for="goods in message.goods_list">
+            <image :src="goods['goods_image']" class="goods-image" />
+            <view class="goods-info">
+              <text class="goods-name">{{goods['goods_name']}}</text>
+            </view>
           </view>
         </view>
-          <view class="order-price-status">
-              <text class="order-price">订单金额：￥{{ message['order_price'] }}</text>
-              <text class="order-status">{{ message['order_status'] }}</text>
-          </view>
+        <view class="order-footer">
+          <text class="order-price">订单金额合计:{{ message['order_price'] | unitPrice }}</text>
+          <text class="order-status">{{ message['order_status'] | unixOrderStatus }}</text>
+        </view>
+
       </view>
       <!-- 图片消息 -->
       <view v-else-if="message.type === 'IMAGES'" class="image-message">
-        <img :src="message.url" class="image" alt="" />
+        <image :src="message.url" class="image" alt="" />
       </view>
       <!-- 视频消息 -->
       <view v-else-if="message.type === 'VIDEO'" class="video-message">
@@ -63,12 +66,18 @@ export default {
       type: [Object, String],
       required: false
     },
+    avatar: {
+      type: String
+    },
     getEmojiPath: Function,
     formatDate: Function
   },
   data() {
     return {
-      videoCtx: ''
+      unitOfCurrency: this.$UnitOfCurrency,
+      videoCtx: '',
+      defaultFace: require('./icon-noface.jpg'),
+      platformFace: require('./platform.jpg')
     }
   },
   computed: {
@@ -79,7 +88,19 @@ export default {
       const { text } = this.message
       if (!text) return
       return this.message.text.replace(/alt="(e\d+)"/g, this.getEmojiSrc)
-    }
+    },
+    userFace() {
+      if (this.receiver && !Number(this.receiver.target_id) && !this.message['is_self']) {
+        return this.platformFace
+      } else if (!this.message['is_self']) {
+        if (this.avatar && this.avatar !== 'undefined') {
+          return this.avatar
+        }
+        return this.defaultFace
+      }
+      const user = uni.getStorageSync('user')
+      return user.face || this.defaultFace
+    },
   },
   mounted() {
     const { type, url } = this.message
@@ -232,17 +253,19 @@ export default {
     overflow: hidden;
     box-sizing: border-box;
     .order-info {
+      width: 100%;
+      font-size: 26rpx;
+      color: #656665;
+    }
+    .order-footer {
+      margin-top: 10px;
+      font-size: 26rpx;
+      color: #333;
       display: flex;
       align-items: center;
       justify-content: space-between;
-      width: 100%;
-      text {
-        font-size: 24rpx;
-        color: #656665;
-      }
     }
     .order-goods {
-      display: flex;
       padding: 14rpx;
       margin-top: 20rpx;
       background-color: #f4f4f4;
@@ -271,7 +294,6 @@ export default {
         -webkit-line-clamp: 2;
         -webkit-box-orient: vertical;
       }
-    }
       .order-price-status {
         display: flex;
         justify-content: space-between;
@@ -285,6 +307,7 @@ export default {
       .order-status {
         color: #9d9d9c;
       }
+    }
   }
   .image-message {
     overflow: hidden;
diff --git a/chat-module/chat-list.vue b/chat-module/chat-list.vue
index 3c2f91ef8050ac44372bb74ad322b1b8638228c9..bc2bf7c59c97d8bfc7a6711b2d1c4c034d2dd0c7 100644
--- a/chat-module/chat-list.vue
+++ b/chat-module/chat-list.vue
@@ -2,7 +2,7 @@
   <view class="chat-list-container" @click="handleCloseSwipeAction">
     <u-swipe-action
       v-for="(item, index) in friends"
-      :key="item['friends_id']"
+      :key="item['target_id']"
       :index="index"
       :show="item.show"
       :options="uSwipeActionOptions"
@@ -11,7 +11,9 @@
       @click.stop="handleClickSwipeAction"
     >
       <view class="item-friend" @click.stop="handleToChat(item)">
-        <view class="face-friend" :style="{backgroundImage: `url(${item['face']})`}" />
+        <view v-if="!Number(item.target_id)" class="face-friend" :style="{backgroundImage: `url(${platformFace})`}" />
+        <view v-else-if="item['avatar']" class="face-friend" :style="{backgroundImage: `url(${item['avatar']})`}" />
+        <view v-else class="face-friend" :style="{backgroundImage: `url(../../../static/images/member/icon-noface.jpg)`}" />
         <view class="info-friend">
           <view class="name-friend">
             <text>{{ item['name'] }}</text>
@@ -20,7 +22,7 @@
             </text>
           </view>
           <div class="desc-friend">
-            <text>{{ messageDesc(item) }}</text>
+            <text>{{ item['last_msg'] }}</text>
           </div>
         </view>
       </view>
@@ -35,10 +37,6 @@
 <script>
 import ChatApi from './ChatApi'
 import uSwipeAction from '../uview-ui/components/u-swipe-action/u-swipe-action'
-import { api } from '../config/config'
-import JSONBig from '../common/json-bigint'
-import websocket from './Websocket'
-
 export default {
   name: 'chat-list',
   components: { uSwipeAction },
@@ -47,58 +45,40 @@ export default {
       chatApi: new ChatApi('buyer'),
       loading: true,
       friends: [],
+      friend_timer: null,
       uSwipeActionOptions: [
         { text: '删除', style: { backgroundColor: '#dd524d' } }
-      ]
+      ],
+      platformFace: require('./platform.jpg')
     }
   },
   onShow() {
-    if(!websocket.isOpen()) {
-      this.chatApi.getWebsocketToken().then(res=>{
-        websocket.init(api.im + '/im/ws?token=' + res)
-      })
-    }
-    //处理websocket消息
-    uni.$on('websocket-msg', this.handleSocketMessage)
     this.getFriends()
   },
-  onHide() {
-    uni.$off('websocket-msg', this.handleSocketMessage)
-  },
   methods: {
     /**
      * 获取好友列表，轮询
      */
     getFriends() {
+      clearTimeout(this.friend_timer)
       this.chatApi.getFriends().then(res => {
         this.friends = res.map(item => {
           item.show = false
           return item
         })
         this.loading = false
+        this.friend_timer = setTimeout(this.getFriends, 5000)
       })
     },
-    /**
-     * 朋友最后一条消息预览
-     * @param item
-     * @returns {string}
-     */
-    messageDesc(item) {
-      const message = item['message_list'][0]
-      if (!message) return ''
-      if (message['type'] === 'IMAGES') return '[图片]'
-      if (message['type'] === 'VIDEO') return '[视频]'
-      if (message['type'] !== 'TEXT') return '[链接]'
-      return message['text'].replace(/<img.+>/g, '[表情]').replace(/\n|&nbsp;/g, '')
-    },
     /**
      * 去聊天界面
      * @param item
      */
     handleToChat(item) {
       let url = '/chat-module/chat'
-      url += `?receiver_id=${item['friends_id']}`
+      url += `?receiver_id=${item['target_id']}`
       url += `&receiver_name=${encodeURIComponent(item['name'])}`
+      url += `&avatar=${item.avatar}`
       uni.navigateTo({ url })
     },
     /**
@@ -129,31 +109,13 @@ export default {
         return item
       })
 
-    },
-    /**
-     * 处理socket消息
-     */
-    handleSocketMessage(message) {
-      let msg = JSONBig.parse(message)
-
-      if (msg.type === 'friend') {
-        this.getFriends()
-      }
-      if (msg.type === 'msg') {
-        if (typeof msg.payload !== 'object') return
-        const sender_id = msg.sender_id
-        const index = this.friends.findIndex(item => Number(item.friends_id) === Number(sender_id))
-        if (index === -1) return
-        const friend = this.friends[index]
-        friend.un_read_num += 1
-        friend.message_list.splice(0, 0, msg.payload)
-        const friends = this.friends
-        friends.splice(index, 1, friend)
-        this.friends = friends
-      }
     }
   },
+  onHide() {
+    clearTimeout(this.friend_timer)
+  },
   onUnload() {
+    clearTimeout(this.friend_timer)
   }
 }
 </script>
diff --git a/chat-module/chat.vue b/chat-module/chat.vue
index df9d3651f96fb2be89e86e5118b43014231ce540..725892c5dbe015bc5b000ef466bf76cbe6a9b776 100644
--- a/chat-module/chat.vue
+++ b/chat-module/chat.vue
@@ -1,20 +1,8 @@
 <template>
-  <view
-    class="chat-container"
-    :class="{'show-keyboard': show_keyboard}"
-    :style="{height: container_height}"
-    @touchmove.prevent
-  >
-    <scroll-view
-      class="chat-list"
-      :class="{'show-board': show_board}"
-      scroll-y
-      scroll-with-animation
-      :scroll-top="scrollTop"
-      :style="{height: chat_scroll_height}"
-      @scroll="handleScroll"
-      @tap="hideChatBoard"
-    >
+  <view class="chat-container" :class="{ 'show-keyboard': show_keyboard }" :style="{ height: container_height }"
+    @touchmove.prevent>
+    <scroll-view class="chat-list" :class="{ 'show-board': show_board }" scroll-y scroll-with-animation
+      :scroll-top="scrollTop" :style="{ height: chat_scroll_height }" @scroll="handleScroll" @tap="hideChatBoard">
       <view class="load-more chat" @tap="loadMoreChat">
         {{ chatParams.no_data ? '没有更多了...' : (chatParams.loading ? '努力加载中...' : '点击加载更多') }}
       </view>
@@ -24,133 +12,95 @@
         :message="item"
         :sender="sender"
         :receiver="receiver"
+        :avatar="avatar"
         :get-emoji-path="getEmojiPath"
         :format-date="unixToDate"
-        @handle-click="handleTapMessage"
-      />
+        @handle-click="handleTapMessage" />
     </scroll-view>
-    <view class="chat-board" :style="{bottom: chat_board_bottom}">
+    <view class="chat-board" :style="{ bottom: chat_board_bottom }">
       <view class="chat-input">
-        <view class="icon-input emoji" @click="showChatEmoji"/>
-        <input
-          v-model="chatContent"
-          class="chat-editor"
-          confirm-type="send"
-          confirm-hold
-          :adjust-position="false"
-          @focus="handleEditorFocus"
-          @blur="handleEditorBlur"
-          @confirm="handleEditorConfirm"
-        />
-        <view class="icon-input menu" @click="showChatMenu"/>
+        <view class="icon-input emoji" @click="showChatEmoji" />
+        <input v-model="chatContent" class="chat-editor" confirm-type="send" confirm-hold :adjust-position="false"
+          @focus="handleEditorFocus" @blur="handleEditorBlur" @confirm="handleEditorConfirm" />
+        <view class="icon-input menu" @click="showChatMenu" />
       </view>
-      <view class="chat-menus" :style="{height: show_board ? '460rpx' : 0}">
-        <chat-emojis
-          v-if="show_chat_emoji"
-          @click-emoji="handleAddEmoji"
-          @back-message="handleBackMessage"
-          class="chat-emojis"
-        />
+      <view class="chat-menus" :style="{ height: show_board ? '460rpx' : 0 }">
+        <chat-emojis v-if="show_chat_emoji" @click-emoji="handleAddEmoji" @back-message="handleBackMessage"
+          class="chat-emojis" />
         <view v-if="show_chat_emoji" class="board-tools">
-          <view class="item-tools emoji active"/>
+          <view class="item-tools emoji active" />
           <view class="send-tools" @click="handleSendMessage('TEXT')">
             <text>发送</text>
           </view>
         </view>
         <view v-if="show_chat_menu" class="menus-list">
           <view class="item-menus" @tap="handleSelectImage('camera')">
-            <view class="item-icon photo"/>
+            <view class="item-icon photo" />
             <text class="item-label">拍摄照片</text>
           </view>
           <view class="item-menus" @tap="handleSelectImage('album')">
-            <view class="item-icon photo-lib"/>
+            <view class="item-icon photo-lib" />
             <text class="item-label">选择照片</text>
           </view>
           <view class="item-menus" @tap="handleSelectVideo('camera')">
-            <view class="item-icon video"/>
+            <view class="item-icon video" />
             <text class="item-label">拍摄视频</text>
           </view>
           <view class="item-menus" @tap="handleSelectVideo('album')">
-            <view class="item-icon video-lib"/>
+            <view class="item-icon video-lib" />
             <text class="item-label">选择视频</text>
           </view>
           <view class="item-menus" @tap="handleOpenBoardPopup('order')">
-            <view class="item-icon order"/>
+            <view class="item-icon order" />
             <text class="item-label">订单</text>
           </view>
           <view class="item-menus" @tap="handleOpenBoardPopup('goods')">
-            <view class="item-icon history"/>
+            <view class="item-icon history" />
             <text class="item-label">浏览</text>
           </view>
         </view>
       </view>
     </view>
-    <u-popup
-      v-model="show_board_popup"
-      mode="bottom"
-      border-radius="20"
-      closeable
-      safe-area-inset-bottom
-      height="950rpx"
-      class="board-popup"
-    >
+    <u-popup v-model="show_board_popup" mode="bottom" border-radius="20" closeable safe-area-inset-bottom height="950rpx"
+      class="board-popup">
       <view class="board-popup--title">请选择您要咨询的内容</view>
       <view class="board-popup--tab">
-        <view
-          class="tab-item"
-          :class="{active: board_popup_type === 'order'}"
-          @tap="board_popup_type = 'order'"
-        >我的订单</view>
-        <view
-          class="tab-item"
-          :class="{active: board_popup_type === 'goods'}"
-          @tap="board_popup_type = 'goods'"
-        >我的浏览</view>
+        <view class="tab-item" :class="{ active: board_popup_type === 'order' }" @tap="board_popup_type = 'order'">
+          我的订单</view>
+        <view class="tab-item" :class="{ active: board_popup_type === 'goods' }" @tap="board_popup_type = 'goods'">
+          我的浏览</view>
       </view>
       <scroll-view scroll-y class="board-popup--scroll">
         <view v-show="board_popup_type === 'order'" class="order-list">
-          <view
-            v-for="item in orderList"
-            :key="item['sn']"
-            class="order-item"
-            @tap="handleSendMessage('ORDER', item['sn'])"
-          >
+          <view v-for="item in orderList" :key="item['sn']" class="order-item"
+            @tap="handleSendMessage('ORDER', item['sn'])">
             <view class="order-sn-date">
               <text>订单号：{{ item['sn'] }}</text>
               <text>{{ unixToDate(item['create_time'], 'yyyy-MM-dd hh:mm') }}</text>
             </view>
             <view class="goods-info">
-              <scroll-view scroll-x class="scrollView" @touchmove.stop>
-                  <view class="goods-info" id="order-goods-info">
-                    <view v-for="img in item['sku_list']" :key="img.sku_id">
-                      <img :src="img['goods_image']" class="goods-image" alt />
-                    </view>
-                  </view>
-              </scroll-view>
-            </view>
-            <view class="goods-other">
-              <view class="goods-price-status">
-                <text class="goods-price">订单金额：￥{{ item['order_amount'] }}</text>
-                <text class="goods-status"> {{ item['order_status_text'] }}</text>
+              <image :src="item['sku_list'][0]['goods_image']" class="goods-image" alt />
+              <view class="goods-other">
+                <text class="goods-name">{{ item['sku_list'][0]['name'] }}</text>
+                <view class="goods-price-status">
+                  <text class="goods-price">{{ item['order_amount'] | unitPrice }}</text>
+                  <text class="goods-status">{{ item['order_status_text'] }}</text>
+                </view>
               </view>
             </view>
-            <view class="goods-hr"/>
+            <view class="goods-hr" />
           </view>
           <view class="load-more" @tap="loadMoreOrder">
             {{ orderParams.no_data ? '没有更多了...' : (orderParams.loading ? '努力加载中...' : '加载更多') }}
           </view>
         </view>
         <view v-show="board_popup_type === 'goods'" class="goods-list">
-          <view
-            v-for="(item, index) in goodsList"
-            :key="index"
-            class="goods-item"
-            @tap="handleSendMessage('GOODS', item['goods_id'])"
-          >
-            <img :src="item['goods_img']" alt class="goods-image" />
+          <view v-for="(item, index) in goodsList" :key="index" class="goods-item"
+            @tap="handleSendMessage('GOODS', item['goods_id'])">
+            <image :src="item['goods_img']" alt class="goods-image" />
             <view class="goods-other">
               <text class="goods-name">{{ item['goods_name'] }}</text>
-              <text class="goods-price">￥{{ item['goods_price'] }}</text>
+              <text class="goods-price">{{ item['goods_price'] | unitPrice }}</text>
             </view>
             <view class="goods-hr" />
           </view>
@@ -224,6 +174,7 @@ export default {
 
       scrollTop: 0,
       oldScrollTop: 0,
+      avatar: ''
     }
   },
   computed: {
@@ -262,12 +213,18 @@ export default {
     },
   },
   onLoad(params) {
-    const { receiver_id, receiver_name } = params
+    if (!Cache.getItem(Keys.user)) {
+      uni.navigateTo({ url: '/pages/auth/login?back_url=' + encodeURIComponent(location.href) })
+      return
+    }
+
+    const { receiver_id, receiver_name, avatar } = params
     this.receiver_id = receiver_id
+    this.avatar = avatar
     uni.setNavigationBarTitle({ title: decodeURIComponent(receiver_name) })
     // 获取接收者信息
     this.getReceiverInfo().then(() => {
-      // 创建会话后，开始轮询获取新消息
+      // 创建会话后，开始获取新消息
       this.chatApi
         .createSession(this.receiver_id)
         .then(async () => {
@@ -285,36 +242,61 @@ export default {
       softinputNavBar: 'none'
     })
     // #endif
-  },
-  onShow() {
+
+    //连接websocket
     if (!websocket.isOpen()) {
-      this.chatApi.getWebsocketToken().then(res => {
-        websocket.init(api.im + '/im/ws?token=' + res)
-      })
+      websocket.init(api.buyer + '/ws/shop?appType=buyer&token=' + uni.getStorageSync(Keys.accessToken))
     }
+
     //处理websocket消息
-    uni.$on('websocket-msg', this.handleSocketMessage)
-    this.getNewMessage().then(this.handleScrollToBottom)
-  },
-  onHide() {
-    uni.$off('websocket-msg', this.handleSocketMessage)
+    uni.$on('websocket-msg', (message) => {
+      let messageObject = JSONBig.parse(message)
+      if (messageObject.module_type !== 'IM') {
+        return
+      }
+
+      let msg = messageObject.data
+      if (msg.type == 'msg') {
+        let num = 0
+        let item = msg.payload
+        let msgId = item.msg_id.toString()
+
+        if (!this.chatList.map(_item => _item['msg_id']).includes(msgId)) {
+          item.msg_id = msgId
+          this.chatList.push(item)
+          num++
+        }
+
+        if (num !== 0) {
+          this.handleScrollToBottom()
+          if (this.receiver_id) {
+            this.chatApi.removeUnreadNum(this.receiver_id)
+          }
+        }
+        return
+      }
+
+      // 会话内容变化
+      if (msg.type === 'friend') {
+        this.getReceiverInfo()
+        return
+      }
+    })
   },
   methods: {
     /**
-     * 获取新消息|轮询
+     * 获取新消息
      */
     getNewMessage() {
-      return new Promise(resolve => {
-        this.chatApi.getNewMessage(this.receiver_id).then(res => {
-          let num = 0
-          res.data.forEach(item => {
-            // 检查是否有和消息列表里不一样的项，有的话就push进去。
-            if (!this.chatList.map(_item => _item['msg_id']).includes(item['msg_id'])) {
-              this.chatList.push(item)
-              num++
-            }
-          })
-        }).finally(resolve)
+      this.chatApi.getNewMessage(this.receiver_id).then(res => {
+        let num = 0
+        res.data.forEach(item => {
+          // 检查是否有和消息列表里不一样的项，有的话就push进去。
+          if (!this.chatList.map(_item => _item['msg_id']).includes(item['msg_id'])) {
+            this.chatList.push(item)
+            num++
+          }
+        })
       })
     },
     /**
@@ -323,7 +305,7 @@ export default {
     getReceiverInfo() {
       return new Promise(resolve => {
         this.chatApi.getFriends().then(res => {
-          this.receiver = res.filter(item => item['friends_id'] === this.receiver_id)[0]
+          this.receiver = res.filter(item => item['target_id'] === this.receiver_id)[0]
           resolve()
         })
       })
@@ -413,15 +395,19 @@ export default {
       if (type === 'ORDER' || type === 'GOODS') {
         this.show_board_popup = false
       }
-      await this.chatApi.sendMessage(type, this.receiver_id, content)
-      await this.getNewMessage()
+      const res = await this.chatApi.sendMessage(type, this.receiver_id, content)
+      this.chatList.push(res)
       this.handleScrollToBottom()
     },
     /**
      * 选择照片
      * @param sourceType
      */
-    handleSelectImage(sourceType) {
+    async handleSelectImage(sourceType) {
+      /* #ifdef APP-PLUS */
+      let result = await this.$store.dispatch("requestPermissions",'WRITE_EXTERNAL_STORAGE')
+      if (result !== 1) return
+      /* #endif */
       uni.chooseImage({
         count: 1,
         sourceType: [sourceType],
@@ -492,7 +478,7 @@ export default {
     uploadFile(filePath, type) {
       uni['showLoading']({ title: '上传中...' })
       uni.uploadFile({
-        url: `${this.chatApi.api.buyer}/uploaders`,
+        url: `${this.chatApi.api.buyer}/buyer/uploaders`,
         header: { Authorization: Cache.getItem(Keys.accessToken) },
         filePath: filePath,
         name: 'file',
@@ -606,35 +592,13 @@ export default {
      */
     handleScroll(event) {
       this.oldScrollTop = event.detail.scrollTop
-    },
-    /**
-     * 处理socket消息
-     * @param message
-     */
-    handleSocketMessage(message) {
-      let msg = JSONBig.parse(message)
-      if (msg.type === 'msg') {
-        let num = 0
-        let item = msg.payload
-        let msgId = item.msg_id
-
-        if (!this.chatList.map(_item => _item['msg_id']).includes(msgId)) {
-          item.msg_id = msgId
-          this.chatList.push(item)
-          num++
-        }
-
-        if (num !== 0) {
-          this.handleScrollToBottom()
-          this.chatApi.removeUnreadNum(this.receiver_id)
-        }
-      }
     }
   },
-  // 页面卸载时
+  // 页面卸载时，清除轮询
   onUnload() {
     // 取消监听键盘键盘高度变化
     uni['offKeyboardHeightChange'](this.handleKeyboardHeightChange)
+    this.receiver_id = null
   }
 }
 </script>
@@ -648,36 +612,4 @@ page {
 
 <style lang="scss" scoped>
 @import "chat";
-.board-popup--scroll .order-list {
-  .goods-info {
-    padding-left: 0rpx;
-    border-radius: 0rpx;
-  }
-  .goods-other {
-    display: flex;
-    justify-content: flex-end;
-    .goods-price-status {
-      margin-right: 25rpx;
-      padding-top: 5rpx;
-      color: #252525;
-      .goods-price {
-        margin-right: 50rpx;
-        font-weight: 500;
-      }
-      .goods-status {
-        color: #999999;
-      }
-    }
-  }
-}
-
-.scrollView {
-  white-space: nowrap;
-  width:100%;
-  #order-goods-info {
-    .goods-image {
-      padding: 20rpx 30rpx 0rpx 0rpx;
-    }
-  }
-}
 </style>
diff --git a/chat-module/icon-noface.jpg b/chat-module/icon-noface.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..21c6aa59437c4df4017cf10501e1a0d035c43755
Binary files /dev/null and b/chat-module/icon-noface.jpg differ
diff --git a/chat-module/images/e01.png b/chat-module/images/e01.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e02.png b/chat-module/images/e02.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e03.png b/chat-module/images/e03.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e04.png b/chat-module/images/e04.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e05.png b/chat-module/images/e05.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e06.png b/chat-module/images/e06.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e07.png b/chat-module/images/e07.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e08.png b/chat-module/images/e08.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e09.png b/chat-module/images/e09.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e10.png b/chat-module/images/e10.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e11.png b/chat-module/images/e11.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e12.png b/chat-module/images/e12.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e13.png b/chat-module/images/e13.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e14.png b/chat-module/images/e14.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e15.png b/chat-module/images/e15.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e16.png b/chat-module/images/e16.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e17.png b/chat-module/images/e17.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e18.png b/chat-module/images/e18.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e19.png b/chat-module/images/e19.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e20.png b/chat-module/images/e20.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e21.png b/chat-module/images/e21.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e22.png b/chat-module/images/e22.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e23.png b/chat-module/images/e23.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e24.png b/chat-module/images/e24.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e25.png b/chat-module/images/e25.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e26.png b/chat-module/images/e26.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e27.png b/chat-module/images/e27.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e28.png b/chat-module/images/e28.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e29.png b/chat-module/images/e29.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e30.png b/chat-module/images/e30.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e31.png b/chat-module/images/e31.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e32.png b/chat-module/images/e32.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e33.png b/chat-module/images/e33.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e34.png b/chat-module/images/e34.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e35.png b/chat-module/images/e35.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e36.png b/chat-module/images/e36.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e37.png b/chat-module/images/e37.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e38.png b/chat-module/images/e38.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e39.png b/chat-module/images/e39.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e40.png b/chat-module/images/e40.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e41.png b/chat-module/images/e41.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e42.png b/chat-module/images/e42.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e43.png b/chat-module/images/e43.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e44.png b/chat-module/images/e44.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e45.png b/chat-module/images/e45.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e46.png b/chat-module/images/e46.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e47.png b/chat-module/images/e47.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e48.png b/chat-module/images/e48.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e49.png b/chat-module/images/e49.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e50.png b/chat-module/images/e50.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e51.png b/chat-module/images/e51.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e52.png b/chat-module/images/e52.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e53.png b/chat-module/images/e53.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e54.png b/chat-module/images/e54.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e55.png b/chat-module/images/e55.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e56.png b/chat-module/images/e56.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e57.png b/chat-module/images/e57.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e58.png b/chat-module/images/e58.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e59.png b/chat-module/images/e59.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e60.png b/chat-module/images/e60.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e61.png b/chat-module/images/e61.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e62.png b/chat-module/images/e62.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e63.png b/chat-module/images/e63.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e64.png b/chat-module/images/e64.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e65.png b/chat-module/images/e65.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e66.png b/chat-module/images/e66.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e67.png b/chat-module/images/e67.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e68.png b/chat-module/images/e68.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e69.png b/chat-module/images/e69.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e70.png b/chat-module/images/e70.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e71.png b/chat-module/images/e71.png
old mode 100644
new mode 100755
diff --git a/chat-module/images/e72.png b/chat-module/images/e72.png
old mode 100644
new mode 100755
diff --git a/chat-module/platform.jpg b/chat-module/platform.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f7e5e0bb460c0a389cf3ece7db6b20fcc06cf82e
Binary files /dev/null and b/chat-module/platform.jpg differ
diff --git a/config/config.js b/config/config.js
index f41fb38791d22b252b21e1b274ca9f4353e18fc2..b9710ed297b8ee4b12f9051da47845ed4c747dfe 100644
--- a/config/config.js
+++ b/config/config.js
@@ -8,14 +8,12 @@ const api = {
   // 开发环境
   dev: {
     base: 'https://base-bbc-api.shoptnt.cn',
-    buyer: 'https://shop-bbc-api.shoptnt.cn',
-    im: 'https://api.shoptnt.cn/im'
+    buyer: 'https://shop-bbc-api.shoptnt.cn'
   },
   // 生产环境
   pro: {
-    base: 'https://base-bbc-api.shoptnt.cn',
-    buyer: 'https://shop-bbc-api.shoptnt.cn',
-    im: 'https://api.shoptnt.cn/im'
+    base: 'https://api.shoptnt.cn/base',
+    buyer: 'https://api.shoptnt.cn/buyer'
   }
 }
 /**