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

@@ -1179,13 +1179,22 @@
                   }
                   }
                 },
                 },
 
 
+
                  'materials' : {
                  'materials' : {
                                 'title' : '商品材质',
                                 'title' : '商品材质',
                                 'enTitle' : '',
                                 'enTitle' : '',
                                 'img' : '',
                                 'img' : '',
-                    'desc' : '用各种洗涤剂',
-                    'materialType' : ''
+                                'desc' : '用各种洗涤剂',//remark
                             },
                             },
+                 'washTips' : {
+                        'list' : [
+                           {
+                              "caption":"不可干洗",
+                               "img":"http://static.yohobuy.com/images/wash_5.png"
+                           }
+                        ]
+                 }
+
 
 
             'productDetail' : {
             'productDetail' : {
                     'title' : '商品详情',
                     'title' : '商品详情',

 {{> layout/header}}
 {{> layout/header}}
-
 <div class="consult-form-page">
 <div class="consult-form-page">
 	<form class="consult-form">
 	<form class="consult-form">
 		<textarea>这款衣服有WS吗？</textarea>
 		<textarea>这款衣服有WS吗？</textarea>

@@ -111,6 +111,16 @@
 </div>
 </div>
 {{/materials}}
 {{/materials}}
 
 
+{{#washTips}}
+<div class="icons-wrapper washTips  page-block">
+    <ul class="icons-list clearfix">
+        {{#list}}
+        <li class="icons-item"><a href="{{url}}" class="imagebar"><img src="{{img}}" alt=""></a><a href="{{url}}" class="linkbar">{{title}}</a></li>
+        {{/list}}
+    </ul>
+</div>
+{{/washTips}}
+
 <div class="gap-block"></div>
 <div class="gap-block"></div>
 
 
 {{#productDetail}}
 {{#productDetail}}