From 21ce6c4a7d1b1be3fe81a0d153c9e1a70fe112c1 Mon Sep 17 00:00:00 2001
From: ninaSun <serena_online@163.com>
Date: Fri, 17 May 2024 16:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |   9 ++
 api/message.js              |   2 +-
 chat-module/ChatApi.js      |  29 +---
 chat-module/Websocket.js    |  14 +-
 chat-module/chat-item.vue   |  67 ++++++---
 chat-module/chat-list.vue   |  70 ++-------
 chat-module/chat.vue        | 284 ++++++++++++++----------------------
 chat-module/icon-noface.jpg | Bin 0 -> 5073 bytes
 chat-module/images/e01.png  | Bin
 chat-module/images/e02.png  | Bin
 chat-module/images/e03.png  | Bin
 chat-module/images/e04.png  | Bin
 chat-module/images/e05.png  | Bin
 chat-module/images/e06.png  | Bin
 chat-module/images/e07.png  | Bin
 chat-module/images/e08.png  | Bin
 chat-module/images/e09.png  | Bin
 chat-module/images/e10.png  | Bin
 chat-module/images/e11.png  | Bin
 chat-module/images/e12.png  | Bin
 chat-module/images/e13.png  | Bin
 chat-module/images/e14.png  | Bin
 chat-module/images/e15.png  | Bin
 chat-module/images/e16.png  | Bin
 chat-module/images/e17.png  | Bin
 chat-module/images/e18.png  | Bin
 chat-module/images/e19.png  | Bin
 chat-module/images/e20.png  | Bin
 chat-module/images/e21.png  | Bin
 chat-module/images/e22.png  | Bin
 chat-module/images/e23.png  | Bin
 chat-module/images/e24.png  | Bin
 chat-module/images/e25.png  | Bin
 chat-module/images/e26.png  | Bin
 chat-module/images/e27.png  | Bin
 chat-module/images/e28.png  | Bin
 chat-module/images/e29.png  | Bin
 chat-module/images/e30.png  | Bin
 chat-module/images/e31.png  | Bin
 chat-module/images/e32.png  | Bin
 chat-module/images/e33.png  | Bin
 chat-module/images/e34.png  | Bin
 chat-module/images/e35.png  | Bin
 chat-module/images/e36.png  | Bin
 chat-module/images/e37.png  | Bin
 chat-module/images/e38.png  | Bin
 chat-module/images/e39.png  | Bin
 chat-module/images/e40.png  | Bin
 chat-module/images/e41.png  | Bin
 chat-module/images/e42.png  | Bin
 chat-module/images/e43.png  | Bin
 chat-module/images/e44.png  | Bin
 chat-module/images/e45.png  | Bin
 chat-module/images/e46.png  | Bin
 chat-module/images/e47.png  | Bin
 chat-module/images/e48.png  | Bin
 chat-module/images/e49.png  | Bin
 chat-module/images/e50.png  | Bin
 chat-module/images/e51.png  | Bin
 chat-module/images/e52.png  | Bin
 chat-module/images/e53.png  | Bin
 chat-module/images/e54.png  | Bin
 chat-module/images/e55.png  | Bin
 chat-module/images/e56.png  | Bin
 chat-module/images/e57.png  | Bin
 chat-module/images/e58.png  | Bin
 chat-module/images/e59.png  | Bin
 chat-module/images/e60.png  | Bin
 chat-module/images/e61.png  | Bin
 chat-module/images/e62.png  | Bin
 chat-module/images/e63.png  | Bin
 chat-module/images/e64.png  | Bin
 chat-module/images/e65.png  | Bin
 chat-module/images/e66.png  | Bin
 chat-module/images/e67.png  | Bin
 chat-module/images/e68.png  | Bin
 chat-module/images/e69.png  | Bin
 chat-module/images/e70.png  | Bin
 chat-module/images/e71.png  | Bin
 chat-module/images/e72.png  | Bin
 chat-module/platform.jpg    | Bin 0 -> 40807 bytes
 config/config.js            |   6 +-
 82 files changed, 191 insertions(+), 290 deletions(-)
 create mode 100755 .gitignore
 create mode 100644 chat-module/icon-noface.jpg
 mode change 100644 => 100755 chat-module/images/e01.png
 mode change 100644 => 100755 chat-module/images/e02.png
 mode change 100644 => 100755 chat-module/images/e03.png
 mode change 100644 => 100755 chat-module/images/e04.png
 mode change 100644 => 100755 chat-module/images/e05.png
 mode change 100644 => 100755 chat-module/images/e06.png
 mode change 100644 => 100755 chat-module/images/e07.png
 mode change 100644 => 100755 chat-module/images/e08.png
 mode change 100644 => 100755 chat-module/images/e09.png
 mode change 100644 => 100755 chat-module/images/e10.png
 mode change 100644 => 100755 chat-module/images/e11.png
 mode change 100644 => 100755 chat-module/images/e12.png
 mode change 100644 => 100755 chat-module/images/e13.png
 mode change 100644 => 100755 chat-module/images/e14.png
 mode change 100644 => 100755 chat-module/images/e15.png
 mode change 100644 => 100755 chat-module/images/e16.png
 mode change 100644 => 100755 chat-module/images/e17.png
 mode change 100644 => 100755 chat-module/images/e18.png
 mode change 100644 => 100755 chat-module/images/e19.png
 mode change 100644 => 100755 chat-module/images/e20.png
 mode change 100644 => 100755 chat-module/images/e21.png
 mode change 100644 => 100755 chat-module/images/e22.png
 mode change 100644 => 100755 chat-module/images/e23.png
 mode change 100644 => 100755 chat-module/images/e24.png
 mode change 100644 => 100755 chat-module/images/e25.png
 mode change 100644 => 100755 chat-module/images/e26.png
 mode change 100644 => 100755 chat-module/images/e27.png
 mode change 100644 => 100755 chat-module/images/e28.png
 mode change 100644 => 100755 chat-module/images/e29.png
 mode change 100644 => 100755 chat-module/images/e30.png
 mode change 100644 => 100755 chat-module/images/e31.png
 mode change 100644 => 100755 chat-module/images/e32.png
 mode change 100644 => 100755 chat-module/images/e33.png
 mode change 100644 => 100755 chat-module/images/e34.png
 mode change 100644 => 100755 chat-module/images/e35.png
 mode change 100644 => 100755 chat-module/images/e36.png
 mode change 100644 => 100755 chat-module/images/e37.png
 mode change 100644 => 100755 chat-module/images/e38.png
 mode change 100644 => 100755 chat-module/images/e39.png
 mode change 100644 => 100755 chat-module/images/e40.png
 mode change 100644 => 100755 chat-module/images/e41.png
 mode change 100644 => 100755 chat-module/images/e42.png
 mode change 100644 => 100755 chat-module/images/e43.png
 mode change 100644 => 100755 chat-module/images/e44.png
 mode change 100644 => 100755 chat-module/images/e45.png
 mode change 100644 => 100755 chat-module/images/e46.png
 mode change 100644 => 100755 chat-module/images/e47.png
 mode change 100644 => 100755 chat-module/images/e48.png
 mode change 100644 => 100755 chat-module/images/e49.png
 mode change 100644 => 100755 chat-module/images/e50.png
 mode change 100644 => 100755 chat-module/images/e51.png
 mode change 100644 => 100755 chat-module/images/e52.png
 mode change 100644 => 100755 chat-module/images/e53.png
 mode change 100644 => 100755 chat-module/images/e54.png
 mode change 100644 => 100755 chat-module/images/e55.png
 mode change 100644 => 100755 chat-module/images/e56.png
 mode change 100644 => 100755 chat-module/images/e57.png
 mode change 100644 => 100755 chat-module/images/e58.png
 mode change 100644 => 100755 chat-module/images/e59.png
 mode change 100644 => 100755 chat-module/images/e60.png
 mode change 100644 => 100755 chat-module/images/e61.png
 mode change 100644 => 100755 chat-module/images/e62.png
 mode change 100644 => 100755 chat-module/images/e63.png
 mode change 100644 => 100755 chat-module/images/e64.png
 mode change 100644 => 100755 chat-module/images/e65.png
 mode change 100644 => 100755 chat-module/images/e66.png
 mode change 100644 => 100755 chat-module/images/e67.png
 mode change 100644 => 100755 chat-module/images/e68.png
 mode change 100644 => 100755 chat-module/images/e69.png
 mode change 100644 => 100755 chat-module/images/e70.png
 mode change 100644 => 100755 chat-module/images/e71.png
 mode change 100644 => 100755 chat-module/images/e72.png
 create mode 100644 chat-module/platform.jpg

diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..97a7a46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/unpackage/dist/*
+/unpackage/debug/*
+/unpackage/cache/*
+/unpackage/release/*
+/node_modules/*
+/.idea/*
+deploy.sh
+.DS_Store
+/.hbuilderx/*
diff --git a/api/message.js b/api/message.js
index d33c869..26bc069 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 7c52360..0870f73 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 51b2b39..37a4e1f 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 92bebb0..b853a3d 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 3c2f91e..bc2bf7c 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 df9d365..725892c 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
GIT binary patch
literal 5073
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
H&4K>`izlC|

literal 0
HcmV?d00001

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
GIT binary patch
literal 40807
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
F{~uM4p$-55

literal 0
HcmV?d00001

diff --git a/config/config.js b/config/config.js
index 5eb6a6c..b9710ed 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://api.shoptnt.cn/base',
-    buyer: 'https://api.shoptnt.cn/buyer',
-    im: 'https://api.shoptnt.cn/im'
+    buyer: 'https://api.shoptnt.cn/buyer'
   }
 }
 /**
-- 
Gitee