From b630d26d4b1708430110800512e86bbbb9b76456 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 9 Jul 2024 16:17:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=EF=BC=9A=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chat/components/chatBox.vue      | 40 +++++++++-----------------
 pages/chat/components/goods.vue        | 11 ++++---
 pages/chat/components/select-popup.vue |  7 ++---
 pages/chat/index.vue                   | 18 ++++++------
 4 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/pages/chat/components/chatBox.vue b/pages/chat/components/chatBox.vue
index 1f19e41..f59005e 100644
--- a/pages/chat/components/chatBox.vue
+++ b/pages/chat/components/chatBox.vue
@@ -91,16 +91,16 @@
                   ></su-image>
                 </view>
               </template>
-              <!--              <template v-if="item.contentType === KeFuMessageContentTypeEnum.PRODUCT">-->
-              <!--                <GoodsItem-->
-              <!--                  :goodsData="item.content.item"-->
-              <!--                  @tap="-->
-              <!--                  sheep.$router.go('/pages/goods/index', {-->
-              <!--                    id: item.content.item.id,-->
-              <!--                  })-->
-              <!--                "-->
-              <!--                />-->
-              <!--              </template>-->
+              <template v-if="item.contentType === KeFuMessageContentTypeEnum.PRODUCT">
+                <GoodsItem
+                  :goodsData="JSON.parse(item.content)"
+                  @tap="
+                    sheep.$router.go('/pages/goods/index', {
+                      id: JSON.parse(item.content).id,
+                    })
+                  "
+                />
+              </template>
               <!--              <template v-if="item.contentType === KeFuMessageContentTypeEnum.ORDER">-->
               <!--                <OrderItem-->
               <!--                  from="msg"-->
@@ -133,8 +133,9 @@
 </template>
 
 <script setup>
-  import { nextTick, onMounted,onBeforeUnmount, reactive, ref, unref } from 'vue';
+  import { nextTick, onBeforeUnmount, onMounted, reactive, ref, unref } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
+  import GoodsItem from './goods.vue';
   import sheep from '@/sheep';
   import KeFuApi from '@/sheep/api/promotion/kefu';
   import { isEmpty } from '@/sheep/helper/utils';
@@ -175,22 +176,6 @@
   };
   defineExpose({ getMessageList });
 
-  const poller = ref(null) // TODO puhui999: 轮训定时器，暂时模拟 websocket
-  onMounted(() => {
-    // TODO puhui999: 轮训相关，功能完善后移除
-    if (!poller.value) {
-      poller.value = setInterval(() => {
-        getMessageList(1)
-      }, 1000)
-    }
-  })
-  // TODO puhui999: 轮训相关，功能完善后移除
-  onBeforeUnmount(() => {
-    if (!poller.value) {
-      return
-    }
-    clearInterval(poller.value)
-  })
   const scrollTop = ref(0); // 当前滚动区域距离顶部的距离
   const currentTop = ref(0);
   const showGoBottom = ref(false);
@@ -232,6 +217,7 @@
 
   // 虚拟列表展示可视区域的数据
   const includePage = index => {
+    console.log(visiblePagesList.value, index);
     return visiblePagesList.value.indexOf(index) > -1;
   };
 
diff --git a/pages/chat/components/goods.vue b/pages/chat/components/goods.vue
index 7fbc95c..59945af 100644
--- a/pages/chat/components/goods.vue
+++ b/pages/chat/components/goods.vue
@@ -1,15 +1,15 @@
 <template>
   <view class="goods ss-flex">
-    <image class="image" :src="sheep.$url.cdn(goodsData.image)" mode="aspectFill"> </image>
+    <image class="image" :src="sheep.$url.cdn(goodsData.picUrl)" mode="aspectFill"> </image>
     <view class="ss-flex-1">
       <view class="title ss-line-2">
-        {{ goodsData.title }}
+        {{ goodsData.spuName }}
       </view>
-      <view v-if="goodsData.subtitle" class="subtitle ss-line-1">
-        {{ goodsData.subtitle }}
+      <view v-if="goodsData.introduction" class="subtitle ss-line-1">
+        {{ goodsData.introduction }}
       </view>
       <view class="price ss-m-t-8">
-        ￥{{ isArray(goodsData.price) ? goodsData.price[0] : goodsData.price }}
+        ￥{{ goodsData.price }}
       </view>
     </view>
   </view>
@@ -17,7 +17,6 @@
 
 <script setup>
   import sheep from '@/sheep';
-  import { isArray } from 'lodash';
 
   const props = defineProps({
     goodsData: {
diff --git a/pages/chat/components/select-popup.vue b/pages/chat/components/select-popup.vue
index cd829a1..6c70144 100644
--- a/pages/chat/components/select-popup.vue
+++ b/pages/chat/components/select-popup.vue
@@ -14,11 +14,11 @@
         <view
           class="item"
           v-for="item in state.pagination.data"
-          :key="item"
+          :key="item.id"
           @tap="emits('select', { type: mode, data: item })"
         >
           <template v-if="mode == 'goods'">
-            <GoodsItem :goodsData="item.goods" />
+            <GoodsItem :goodsData="item" />
           </template>
           <template v-if="mode == 'order'">
             <OrderItem :orderData="item" />
@@ -32,7 +32,6 @@
 
 <script setup>
   import { reactive, watch } from 'vue';
-  import sheep from '@/sheep';
   import _ from 'lodash';
   import GoodsItem from './goods.vue';
   import OrderItem from './order.vue';
@@ -83,7 +82,7 @@
             page,
             list_rows,
           });
-    let orderList = _.concat(state.pagination.data, res.data.data);
+    let orderList = _.concat(state.pagination.data, res.data.list);
     state.pagination = {
       ...res.data,
       data: orderList,
diff --git a/pages/chat/index.vue b/pages/chat/index.vue
index 77cd40a..5188ee3 100644
--- a/pages/chat/index.vue
+++ b/pages/chat/index.vue
@@ -118,19 +118,17 @@
           content: res.data,
         };
         break;
-      // TODO puhui999: 还需要重构
       case 'goods':
         msg = {
           contentType: KeFuMessageContentTypeEnum.PRODUCT,
-          content: {
-            item: {
-              id: data.goods.id,
-              title: data.goods.title,
-              image: data.goods.image,
-              price: data.goods.price,
-              stock: data.goods.stock,
-            },
-          },
+          content: JSON.stringify({
+            id: data.id,
+            spuName: data.spuName,
+            picUrl: data.picUrl,
+            price: data.price,
+            introduction: data.introduction,
+            stock: data.stock,
+          })
         };
         break;
       case 'order':