wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit 71ae8a381446dac40daa81ed31d4f7ac09e7c737 1 parent 91b9ef89

update

Inline Side-by-side
Showing 4 changed files with 42 additions and 9 deletions
@@ -35,7 +35,7 @@ $basicBtnC:#eb0313; @@ -35,7 +35,7 @@ $basicBtnC:#eb0313;
35 .page-block { 35 .page-block {
36 box-sizing: border-box; 36 box-sizing: border-box;
37 width: 100%; 37 width: 100%;
38 - border-bottom: 2px solid $borderC; 38 + border-bottom: 1px solid $borderC;
39 border-top: 1px solid $borderC; 39 border-top: 1px solid $borderC;
40 padding: 0 pxToRem(28px); 40 padding: 0 pxToRem(28px);
41 >.title { 41 >.title {
@@ -36,11 +36,37 @@ @@ -36,11 +36,37 @@
36 } 36 }
37 } 37 }
38 } 38 }
39 - .material-type {  
40 - width: pxToRem(581px);  
41 - height: pxToRem(99px);  
42 - border-top: 1px solid $borderC;  
43 - padding: pxToRem(17px) 0; 39 + // .material-type {
  40 + // width: pxToRem(581px);
  41 + // height: pxToRem(99px);
  42 + // border-top: 1px solid $borderC;
  43 + // padding: pxToRem(17px) 0;
  44 + // }
  45 + }
  46 + .wash-tips{
  47 + padding-top:pxToRem(18px);
  48 + &.page-block{
  49 + border-top: none;
  50 + padding-left: pxToRem(15px);
  51 + padding-right: pxToRem(15px);
  52 + }
  53 + // padding-bottom:pxToRem(18px);
  54 + .tip{
  55 + // width: pxToRem(73px);
  56 + width: 16.666%;
  57 + display: inline-block;
  58 + // margin-right: pxToRem(24px);
  59 + img{
  60 + width: pxToRem(48px);
  61 + height: pxToRem(48px);
  62 + margin-bottom: pxToRem(10px);
  63 + }
  64 + .caption{
  65 + display: block;
  66 + font-size: pxToRem(18px);
  67 + line-height: pxToRem(22px);
  68 + margin-bottom: pxToRem(18px);
  69 + }
44 } 70 }
45 } 71 }
46 .product-detail { 72 .product-detail {
@@ -113,9 +113,16 @@ @@ -113,9 +113,16 @@
113 </div> 113 </div>
114 {{/materials}} 114 {{/materials}}
115 115
  116 +<div class="wash-tips page-block">
  117 + {{#washTips}}
  118 + <div class="tip">
  119 + <img src="{{img}}" alt="">
  120 + <span class="caption">{{caption}}</span>
  121 + </div>
  122 + {{/washTips}}
  123 +</div>
116 124
117 -  
118 -{{#washTips}} 125 +<!-- {{#washTips}}
119 <div class="icons-wrapper washTips page-block"> 126 <div class="icons-wrapper washTips page-block">
120 <ul class="icons-list clearfix"> 127 <ul class="icons-list clearfix">
121 {{#list}} 128 {{#list}}
@@ -123,7 +130,7 @@ @@ -123,7 +130,7 @@
123 {{/list}} 130 {{/list}}
124 </ul> 131 </ul>
125 </div> 132 </div>
126 -{{/washTips}} 133 +{{/washTips}} -->
127 134
128 <div class="gap-block"></div> 135 <div class="gap-block"></div>
129 136