Merge branch 'release/sale' of git.yoho.cn:fe/yohobuy-node into release/sale

 the commit.

@@ -41,22 +41,22 @@
         </div>
         <div class="good-detail-text">
             <a href="{{url}}" target="_blank">{{{productName}}}</a>
-            {{!-- {{# brandName}} --}}
                 <p class="brand">
                     <a href="{{urlFormat url}}">{{brandName}}</a>
                 </p>
-            {{!-- {{/ brandName}} --}}
             <p class="price">
                 {{# marketPrice}}
                     <span class="market-price">¥{{.}}</span>
                 {{/ marketPrice}}
+                {{# salesPrice}}
                 <span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
                     ¥{{salesPrice}}
                 </span>
-                {{#vip}}<span class="vip-tag">  VIP   </span><strong>{{vipPrice}}</strong>{{/vip}}
+                {{/ salesPrice}}
+                {{#vip}}<span class="vip-tag"> VIP   </span><strong>更优惠</strong>{{/vip}}
                 {{#vip1}}<span class="vip-1">     </span><strong>{{vipPrice}}</strong>{{/vip1}}
                 {{#vip2}}<span class="vip-2">     </span><strong>{{vipPrice}}</strong>{{/vip2}}
-                {{#vip3}}<span class="vip-3">      </span><strong>{{vipPrice}}</strong>{{/vip3}}
+                {{#vip3}}<span class="vip-3">     </span><strong>{{vipPrice}}</strong>{{/vip3}}
             </p>
         </div>
     </div>

@@ -402,12 +402,51 @@
                 background-image: resolve("sale/vip.png");
                 background-repeat: no-repeat;
                 background-size: 100% 90%;
+                width: 40px;
+                color: #fff;
+                font-style: italic;
+                margin-right: 5px;
+                margin-left: 5px;
+                width: 30px;
+            }
+
+            span.vip-1 {
+                background-image: resolve("product/silver-small.png");
+                background-repeat: no-repeat;
+                width: 30px;
+                display: inline-block;
+                height: 12px;
+                color: #fff;
+                font-style: italic;
+                margin-right: 5px;
+                margin-left: 5px;
+                position: absolute;
+            }
+
+            span.vip-2 {
+                background-image: resolve("product/golden-small.png");
+                background-repeat: no-repeat;
                 width: 30px;
                 display: inline-block;
-                height: 10px;
+                height: 12px;
                 color: #fff;
                 font-style: italic;
                 margin-right: 5px;
+                margin-left: 5px;
+                position: absolute;
+            }
+
+            span.vip-3 {
+                background-image: resolve("product/platinum-small.png");
+                background-repeat: no-repeat;
+                width: 30px;
+                display: inline-block;
+                height: 12px;
+                color: #fff;
+                font-style: italic;
+                margin-right: 5px;
+                margin-left: 5px;
+                position: absolute;
             }
 
             .price-sale {