Merge branch 'develop' into 'develop'

Develop

活动列表样式修改

See merge request !81

@@ -57,6 +57,7 @@
 
 
         .price{
         .price{
             font-size: pxToRem(24px);
             font-size: pxToRem(24px);
+            display: inline;
         }
         }
         .sale-price {
         .sale-price {
             color: #e10;
             color: #e10;

@@ -191,7 +191,9 @@
             height: 4px;
             height: 4px;
             background-color: #000;
             background-color: #000;
             border-radius: 50%;
             border-radius: 50%;
-            margin-right: 8rem / $pxConvertRem;
+            position: relative;
+            left: 0;
+            top: -.12rem;
         }
         }
     }
     }
     .price-compute {
     .price-compute {

@@ -276,7 +276,7 @@ $basicBtnC:#eb0313;
         }
         }
     }
     }
     .price-date {
     .price-date {
-        // width: 100%;
+        width: 100%;
         color: $subFontC;
         color: $subFontC;
         height: pxToRem(88px);
         height: pxToRem(88px);
         padding-left: pxToRem(28px);
         padding-left: pxToRem(28px);
@@ -365,6 +365,9 @@ $basicBtnC:#eb0313;
         }
         }
     }
     }
     .goodsDiscount {
     .goodsDiscount {
+        display: block;
+        width: 100%; 
+        height:auto;
         font-size: pxToRem(28px);
         font-size: pxToRem(28px);
         color: $mainFontC;
         color: $mainFontC;
         background-color: #fff;
         background-color: #fff;
@@ -373,7 +376,6 @@ $basicBtnC:#eb0313;
             position: relative;
             position: relative;
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
             line-height: pxToRem(36px);
             line-height: pxToRem(36px);
-            // line-height: pxToRem(88px);
         }
         }
 
 
         .short-text {
         .short-text {