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

@@ -18,6 +18,8 @@ var dispatchModeHammer,
     $price = $('.price-cal'),
     $price = $('.price-cal'),
     $couponUse = $('.coupon-use.used'),
     $couponUse = $('.coupon-use.used'),
     $addressWrap = $('.address-wrap'),
     $addressWrap = $('.address-wrap'),
+    $coinCheck = $('.coin-check'),
+    $coinUsed = $('.coin .used'),
     payType,
     payType,
     priceTmpl = Handlebars.compile($('#tmpl-price').html()),
     priceTmpl = Handlebars.compile($('#tmpl-price').html()),
     queryString = $.queryString(),
     queryString = $.queryString(),
@@ -104,6 +106,8 @@ function orderCompute() {
             if (res.last_order_amount) {
             if (res.last_order_amount) {
                 res.last_order_amount = (+res.last_order_amount).toFixed(2);
                 res.last_order_amount = (+res.last_order_amount).toFixed(2);
             }
             }
+            $coinCheck.find('em').html('- ¥ ' + res.use_yoho_coin);
+            $coinUsed.html('已抵¥' + res.use_yoho_coin);
             priceHtml = priceTmpl({
             priceHtml = priceTmpl({
                 cartPayData: res.promotion_formula_list,
                 cartPayData: res.promotion_formula_list,
                 price: res.last_order_amount
                 price: res.last_order_amount
@@ -212,9 +216,13 @@ $('.coin').on('touchend', function() {
     if ($this.find('.checkbox').hasClass('icon-cb-checked')) {
     if ($this.find('.checkbox').hasClass('icon-cb-checked')) {
         orderInfo('yohoCoin', $this.data('yoho-coin'));
         orderInfo('yohoCoin', $this.data('yoho-coin'));
         $this.find('.coin-check em').show();
         $this.find('.coin-check em').show();
+        $this.find('.can-use').hide();
+        $this.find('.used').show();
     } else {
     } else {
         orderInfo('yohoCoin', 0);
         orderInfo('yohoCoin', 0);
         $this.find('.coin-check em').hide();
         $this.find('.coin-check em').hide();
+        $this.find('.can-use').show();
+        $this.find('.used').hide();
     }
     }
     orderCompute();
     orderCompute();
 });
 });

@@ -69,7 +69,9 @@
                     <span class="title">YOHO币</span>
                     <span class="title">YOHO币</span>
 
 
                     {{#if yohoCoin}}
                     {{#if yohoCoin}}
-                        <span class="desc">可抵¥{{yohoCoin}}</span>
+                        <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{yohoCoin}}</span>
+                        <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span>
+
                         {{#if useYohoCoin}}
                         {{#if useYohoCoin}}
                         <span class="coin-check">
                         <span class="coin-check">
                             <em>- ¥ {{yohoCoin}}</em>
                             <em>- ¥ {{yohoCoin}}</em>