Merge branch 'main' of https://gitlab.com/tea28/client

src/components/goodsList.vue

@@ -64,22 +64,13 @@ export default {
 }
 
 .product {
-  /* width: calc(50% - 20rpx); */
   width: 50%;
   padding: 20rpx 10rpx;
   display: flex;
   flex-direction: column;
 }
 
-/* .image-view { */
-  /* height: 330upx; */
-  /* width: 330upx;
-        margin: 12upx 0; */
-/* } */
-
 .product-image {
-  /* height: 330upx;
-        width: 330upx; */
   border-radius: 10rpx 10rpx 0 0;
   width: 100%;
   height: 260rpx;
@@ -87,22 +78,14 @@ export default {
 }
 
 .product-title {
-  width: 300upx;
-  word-break: break-all;
-  display: -webkit-box;
+  width: 100%;
   overflow: hidden;
   line-height: 1.5;
-  text-overflow: ellipsis;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
 }
 
 .product-price {
   color: #121212;
   font-size: 28rpx;
-  /* margin-top: 10upx;
-        font-size: 28upx;
-        line-height: 1.5; */
   position: relative;
 }
 
@@ -132,20 +115,5 @@ export default {
 .product-txt {
   font-size: 22rpx;
   color: #787878;
-  /* margin-bottom: 8rpx; */
-}
-
-.ellipsis1 {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.ellipsis2 {
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
 }
 </style>

src/static/css/public.scss

@@ -6,7 +6,7 @@
     clear: both;
     visibility: hidden;
 }
-.nowrap {
+.ellipsis1 {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;