code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-08-06 19:07:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

滚动请求

Browse Source
This commit is contained in:
程
2022-12-28 14:54:57 +08:00
parent 61c44af5a0
commit 84d3dd247d
4 changed files with 275 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
im/src/components/chat/panel/template/goodsLink.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="width: 350px;">
当前浏览
<div class="base">
<div>
@@ -158,11 +158,7 @@ export default {
height: 120px;
display: flex;
<<<<<<< HEAD div {
margin-top: 8px;
}
=======div {
div {
overflow: hidden;
text-overflow: ellipsis;
margin-top: 8px;
@@ -170,7 +166,7 @@ export default {
margin-top: 8px;
}
>>>>>>>aa4dbc1bbd212aedbdfbecefb3f5f977aec0cc14 .image {
.image {
height: 100px;
margin-top: 3px;
width: 100px