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

@@ -93,7 +93,7 @@ function orderCompute() {
     }).then(function(res) {
     }).then(function(res) {
         var priceHtml;
         var priceHtml;
 
 
-        if (!res.length) {
+        if ($.type(res) !== 'object') {
             window.location.reload();
             window.location.reload();
         } else {
         } else {
             /*if (res.order_amount) {
             /*if (res.order_amount) {

@@ -3,6 +3,14 @@
     position: relative;
     position: relative;
     padding-left: 16rem / $pxConvertRem;
     padding-left: 16rem / $pxConvertRem;
 
 
+    .prevent-img-click {
+       width: 20rem / $pxConvertRem;
+       height: 200rem / $pxConvertRem;
+       position: absolute;
+       background-color: transparent;
+       z-index: 99;
+    }
+
     .checkbox {
     .checkbox {
         position: absolute;
         position: absolute;
         top: 50%;
         top: 50%;

@@ -8,6 +8,7 @@
     {{/if}}
     {{/if}}
 
 
     <div class="info">
     <div class="info">
+        <div class="prevent-img-click"></div>
         <a href="{{link}}">
         <a href="{{link}}">
             <img class="thumb lazy" data-original="{{thumb}}">
             <img class="thumb lazy" data-original="{{thumb}}">
         </a>
         </a>

@@ -5,11 +5,11 @@
         <a class="swiper-slide" href="{{url}}">
         <a class="swiper-slide" href="{{url}}">
             <img class="swiper-lazy img-box" data-src="{{thumb}}">
             <img class="swiper-lazy img-box" data-src="{{thumb}}">
             <div class="price">
             <div class="price">
-                <span class="sale-price {{^price}}no-price{{/price}}">&yen;{{salePrice}}</span>
-                {{#price}}<span class="old-price">&yen;{{.}}</span>{{/price}}
+                <span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
+                {{#price}}<span class="old-price">￥{{.}}</span>{{/price}}
             </div>
             </div>
             <div class="swiper-lazy-preloader"></div>
             <div class="swiper-lazy-preloader"></div>
         </a>
         </a>
         {{/recommendList}}
         {{/recommendList}}
     </div>
     </div>
-</div>
+</div>