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

@@ -70,6 +70,16 @@ $('#coupon-list').on('touchend', '.employ-main', function() {
 
 
     orderInfo('couponCode', $this.data('coupon-code'));
     orderInfo('couponCode', $this.data('coupon-code'));
     orderInfo('couponName', $this.data('coupon-name'));
     orderInfo('couponName', $this.data('coupon-name'));
+}).on('touchstart', '.employ-main', function() {
+    var $this = $(this);
+
+    $this.siblings().removeClass('focus');
+    $this.addClass('focus');
+}).on('touchend touchcancel', '.employ-main', function() {
+    var $this = $(this);
+
+    $this.siblings().removeClass('focus');
+    $this.removeClass('focus');
 });
 });
 
 
 $('body').on('touchend', '.not-use', function() {
 $('body').on('touchend', '.not-use', function() {

@@ -42,13 +42,10 @@ optHammer.on('tap', function(e) {
             }).then(function(res) {
             }).then(function(res) {
                 $('#dialog-wrapper').hide();
                 $('#dialog-wrapper').hide();
                 if (!res) {
                 if (!res) {
-                    tip.show('网络错误');
                     return;
                     return;
                 }
                 }
-                if (res.code === 200) {
-                    tip.show('删除成功');
-                } else {
-                    tip.show(res.message || '网络错误');
+                if (res.message) {
+                    tip.show(res.message);
                 }
                 }
                 window.location.href = '/home/orders';
                 window.location.href = '/home/orders';
             }).fail(function() {
             }).fail(function() {
@@ -74,13 +71,10 @@ optHammer.on('tap', function(e) {
             }).then(function(res) {
             }).then(function(res) {
                 $('#dialog-wrapper').hide();
                 $('#dialog-wrapper').hide();
                 if (!res) {
                 if (!res) {
-                    tip.show('网络错误');
                     return;
                     return;
                 }
                 }
-                if (res.code === 200) {
-                    tip.show('取消成功');
-                } else {
-                    tip.show(res.message || '网络错误');
+                if (res.message) {
+                    tip.show(res.message);
                 }
                 }
                 window.location.href = '/home/orders';
                 window.location.href = '/home/orders';
             }).fail(function() {
             }).fail(function() {

@@ -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%;

@@ -40,6 +40,9 @@
     		background-size: 100% 100%;
     		background-size: 100% 100%;
     		color: #fff;
     		color: #fff;
     		position: relative;
     		position: relative;
+            &.focus {
+                background-image: image-url('me/employ/employ-red.jpg');
+            }
     		span{
     		span{
     			width: 34.482759%;
     			width: 34.482759%;
     			height: 100%;
     			height: 100%;

@@ -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,8 +5,8 @@
         <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>