Merge branch 'hotfix/yohocoinuse' into beta

Conflicts:
	library/Api/Yohobuy.php
	static/js/cart/good.js
	static/js/cart/order-ensure.js

--Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
++Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec

@@ -248,13 +248,15 @@ class CartData
      *
      *
      * @param int $uid 用户ID
      * @param int $uid 用户ID
      * @param string $cartType 购物车类型，ordinary表示普通购物车
      * @param string $cartType 购物车类型，ordinary表示普通购物车
+     * @param int $isUseYohoCoin 是否使用有货币，默认0不使用, 1使用
      * @return array 接口返回的数据
      * @return array 接口返回的数据
      */
      */
-    public static function cartPay($uid, $cartType)
+    public static function cartPay($uid, $cartType, $isUseYohoCoin = 0)
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['method'] = 'app.Shopping.payment';
         $param['method'] = 'app.Shopping.payment';
         $param['cart_type'] = $cartType;
         $param['cart_type'] = $cartType;
+        $param['yoho_coin_mode'] = $isUseYohoCoin;
         $param['uid'] = $uid;
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
 
 

@@ -12,8 +12,6 @@ var $ = require('jquery'),
 var dialog = require('../me/dialog'),
 var dialog = require('../me/dialog'),
     tip = require('../plugin/tip');
     tip = require('../plugin/tip');
 
 
-// orderInfo = require('./order-info').orderInfo;
-
 var $selectAllBtn = $('.balance .checkbox'),
 var $selectAllBtn = $('.balance .checkbox'),
     requesting = false;
     requesting = false;
 
 
@@ -107,9 +105,7 @@ $('.icon-del').on('touchstart', function(e) {
                     autoHide: true,
                     autoHide: true,
                     fast: true
                     fast: true
                 });
                 });
-
-                // orderInfo('couponCode', null);
-                // orderInfo('couponName', null);
+                window.setCookie('order-info', '');
                 window.setCookie('_yoho-cart-refreshByDelete', true);
                 window.setCookie('_yoho-cart-refreshByDelete', true);
                 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
                 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
             } else {
             } else {

@@ -88,7 +88,11 @@ $('.invoice').on('touchend', '.checkbox', function() {
     }
     }
 });
 });
 
 
-function orderCompute() {
+function orderCompute(firstEnter) {
+    var yohoCoin = orderInfo('yohoCoin');
+    if (firstEnter) {
+        yohoCoin = 0;
+    }
     $.ajax({
     $.ajax({
         method: 'POST',
         method: 'POST',
         url: '/cart/index/orderCompute',
         url: '/cart/index/orderCompute',
@@ -97,7 +101,7 @@ function orderCompute() {
             deliveryId: orderInfo('deliveryId'),
             deliveryId: orderInfo('deliveryId'),
             paymentTypeId: orderInfo('paymentTypeId'),
             paymentTypeId: orderInfo('paymentTypeId'),
             couponCode: orderInfo('couponCode'),
             couponCode: orderInfo('couponCode'),
-            yohoCoin: orderInfo('yohoCoin')
+            yohoCoin: yohoCoin
         }
         }
     }).then(function(res) {
     }).then(function(res) {
         var priceHtml;
         var priceHtml;
@@ -127,7 +131,7 @@ function orderCompute() {
 }
 }
 
 
 // 进入页面计算一次价格
 // 进入页面计算一次价格
-orderCompute();
+//orderCompute(1);
 
 
 function submitOrder() {
 function submitOrder() {
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),

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

@@ -449,7 +449,11 @@ class CartModel
 
 
             // 有货币
             // 有货币
             $result['yohoCoin'] = $payReturn['yoho_coin'];
             $result['yohoCoin'] = $payReturn['yoho_coin'];
-            $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['use_yoho_coin'];
+            /*
+             * 默认使用有货币
+             * $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['use_yoho_coin'];
+             */
+            $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : false;
 
 
             // 订单数据
             // 订单数据
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {