ds

im/package.json

@@ -37,6 +37,7 @@
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
+    "postcss": "^8.4.20",
     "style-resources-loader": "^1.4.1",
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-svg-component-runtime": "^1.0.1",

im/src/components/chat/panel/TalkPanel.vue

@@ -869,7 +869,26 @@ export default {
     color: black;
   }
 }
+.base {
+    margin-top: 5px;
+    height: 120px;
+    display: flex;
 
+    div {
+      width: 100px;
+      overflow: hidden;
+      text-overflow:ellipsis;
+      margin-top: 8px;
+      white-space: nowrap;
+    }
+
+    .image {
+        height: 100px;
+        margin-top: 3px;
+        width: 100px
+    }
+
+}
 .talk-bubble {
   position: absolute;
   left: 0px;

im/src/components/chat/panel/template/footPrint.vue

@@ -2,7 +2,7 @@
     <div>
         最近浏览
         <dl>
-            <dd v-for="(item, index) in list">
+            <dd v-for="item in list" v-infinite-scroll="loadMore()">
                 <div class="base" @click="linkToGoods(item.goodsId,item.id)">
                     <div>
                         <img :src="item.thumbnail" class="image" />
@@ -31,6 +31,9 @@ export default {
         "el-button": button,
     },
     methods:{
+        loadMore(){
+            this.$emit('loadMore')
+        },
     },
     props: {
         list: {
@@ -54,6 +57,10 @@ export default {
     display: flex;
 
     div {
+        overflow: hidden;
+        text-overflow:ellipsis;
+        margin-top: 8px;
+        white-space: nowrap;
         margin-top: 4px;
     }
 

im/src/components/chat/panel/template/goodsLink.vue

@@ -158,11 +158,19 @@ export default {
   height: 120px;
   display: flex;
 
-  div {
+  <<<<<<< HEAD div {
     margin-top: 8px;
   }
 
-  .image {
+  =======div {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-top: 8px;
+    white-space: nowrap;
+    margin-top: 8px;
+  }
+
+  >>>>>>>aa4dbc1bbd212aedbdfbecefb3f5f977aec0cc14 .image {
     height: 100px;
     margin-top: 3px;
     width: 100px
@@ -170,6 +178,12 @@ export default {
 
 }
 
+.click-button {
+  margin-top: 8px;
+  background-color: white;
+  border-color: #F56C6C;
+}
+
 .separate {
   margin-top: 8px;
 }