Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/shopping/assets/common.css

@@ -100,3 +100,6 @@ a {
   color: #313131;
 }
 .textfield {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+*{
+  font-family: PingFang SC-Semibold, PingFang SC;
+}

ant-design-vue-jeecg/src/views/shopping/pages/clothType.vue

@@ -59,10 +59,10 @@
                 </div>
                 <div class="clothTitle">
                   <p class="price d-flex">
-                    <span class="f_16 c_333">￥{{ item.currentPrice }}</span>
+                    <span class="f_18 c_333">￥{{ item.currentPrice }}</span>
                     <span class="f_12 c_999">￥{{ item.historicalPrice }}</span>
                   </p>
-                  <p class="f_12 c_333">{{ item.title }}</p>
+                  <p class="f_16 c_333">{{ item.title }}</p>
                   <p class="f_12 c_9a9b9b">热度{{ item.heat }}</p>
                 </div>
               </div>
@@ -452,17 +452,20 @@
           flex-wrap: wrap;
           align-items: center;
           .item {
-            width: 308px;
+            width: 288px;
             height: 562px;
-            margin-bottom: 30px;
+            padding: 10px;
+            margin-bottom: 0px;
             margin-right: 10px;
+            /*border: 0.5px solid #ccc;*/
+            /*background-color: rgba(246, 246, 246, 1);*/
             .imgDiv {
               position: relative;
               img {
                 /*width: 308px;*/
                 /*height: 462px;*/
-                width: 287px;
-                height: 450px;
+                width: 268px;
+                height: 380px;
                 object-fit: cover;
               }
               &:hover .button {
@@ -487,17 +490,23 @@
               width: 100%;
               height: 100px;
               .price {
+                margin-top: 16px;
                 align-items: center;
+                margin-bottom: 8px;
                 padding-left: 6px;
-                .f_16 {
+                .f_18 {
                   margin-right: 10px;
                 }
                 .f_12 {
                   text-decoration: line-through;
                 }
               }
-              & > .f_12 {
+              & > .f_16 {
                 font-weight: 600;
+                height: 46px;
+                margin-bottom: 10px;
+                /*overflow: hidden;text-overflow: ellipsis;white-space: nowrap;*/
+                overflow: hidden;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp:2;-webkit-box-orient: vertical;white-space:normal;
               }
             }
           }