wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 0599b609c327144a3acb76e59c4ed59fa91105ca 2 parents 0b358d86 ec2b220f

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
@@ -150,8 +150,6 @@ a { @@ -150,8 +150,6 @@ a {
150 @import "home/index"; 150 @import "home/index";
151 @import "category/index"; 151 @import "category/index";
152 @import "product/index"; 152 @import "product/index";
153 -@import "product/comments-consults";  
154 -@import "product/product-description";  
155 @import "index/index"; 153 @import "index/index";
156 @import "shopping-cart/index"; 154 @import "shopping-cart/index";
157 @import "me/index"; //个人中心 155 @import "me/index"; //个人中心
@@ -330,3 +330,5 @@ $basicBtnC:#eb0313; @@ -330,3 +330,5 @@ $basicBtnC:#eb0313;
330 } 330 }
331 } 331 }
332 } 332 }
  333 +@import "comments-consults";
  334 +@import "product-description";
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 <div class="gap-block"></div> 21 <div class="gap-block"></div>
22 22
23 - {{#sizeInfo}} 23 +{{#sizeInfo}}
24 <div class="size-info page-block"> 24 <div class="size-info page-block">
25 <h1 class="title"> 25 <h1 class="title">
26 {{title}} 26 {{title}}
@@ -43,11 +43,11 @@ @@ -43,11 +43,11 @@
43 </div> 43 </div>
44 {{/detail}} 44 {{/detail}}
45 </div> 45 </div>
46 - {{/sizeInfo}} 46 +{{/sizeInfo}}
47 47
48 <div class="gap-block"></div> 48 <div class="gap-block"></div>
49 49
50 - {{#measurementMethod}} 50 +{{#measurementMethod}}
51 <div class="measurement-method page-block"> 51 <div class="measurement-method page-block">
52 <h1 class="title"> 52 <h1 class="title">
53 {{title}} 53 {{title}}
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
56 <div class="detail" style="width:100%"> 56 <div class="detail" style="width:100%">
57 <img class="lazy" data-original="{{img}}" alt=""> 57 <img class="lazy" data-original="{{img}}" alt="">
58 </div> 58 </div>
  59 +</div>
59 {{/measurementMethod}} 60 {{/measurementMethod}}
60 61
61 <div class="gap-block"></div> 62 <div class="gap-block"></div>