结算页面bug修改

@@ -299,15 +299,16 @@ $('form').on('submit', function() {
 // xwg 2016/3/21 13:22
 // xwg 2016/3/21 13:22
 $('.dispatch').on('touchend', 'h3', function() {
 $('.dispatch').on('touchend', 'h3', function() {
     if ($(this).siblings('ul').is(':hidden')) {
     if ($(this).siblings('ul').is(':hidden')) {
-
+        $('.dispatch h3').removeClass('border-none');
+        $(this).addClass('border-none');
         $('.down').removeClass('hide');
         $('.down').removeClass('hide');
         $('.up').addClass('hide');
         $('.up').addClass('hide');
-
         $('.up', this).removeClass('hide');
         $('.up', this).removeClass('hide');
         $('.down', this).addClass('hide');
         $('.down', this).addClass('hide');
         $('.dispatch ul').hide();
         $('.dispatch ul').hide();
         $(this).siblings('ul').show();
         $(this).siblings('ul').show();
     } else {
     } else {
+        $(this).removeClass('border-none');
         $('.down', this).removeClass('hide');
         $('.down', this).removeClass('hide');
         $('.up', this).addClass('hide');
         $('.up', this).addClass('hide');
         $(this).siblings('ul').hide();
         $(this).siblings('ul').hide();

@@ -222,5 +222,6 @@ $('.phone').on('touchend', function() {
 
 
 $('input[name = "mobile"]').on('blur', function() {
 $('input[name = "mobile"]').on('blur', function() {
     $('.phone').css('display', 'block');
     $('.phone').css('display', 'block');
+    $('.phone').html(phoneHidden($('input[name = "mobile"]').val()));
     $('input[name = "mobile"]').attr('type', 'hidden');
     $('input[name = "mobile"]').attr('type', 'hidden');
 });
 });

@@ -22,6 +22,9 @@
     .hide{
     .hide{
         display: none !important;
         display: none !important;
     }
     }
+    .border-none{
+        border-bottom:none !important;
+    }
     .boys{
     .boys{
         background:image-url('shopping-cart/boys.png') bottom left repeat-x #fff;
         background:image-url('shopping-cart/boys.png') bottom left repeat-x #fff;
     }    
     }    

@@ -38,7 +38,7 @@
             <h3>
             <h3>
                 <p>配送方式</p>
                 <p>配送方式</p>
                 {{#each dispatchMode}}
                 {{#each dispatchMode}}
-                    {{#if isSelected}}<span>{{name}}</span>{{/if}}
+                    {{#if isSelected}}<span>{{name}}¥{{cost}}</span>{{/if}}
                 {{/each}}
                 {{/each}}
                 <i class="iconfont down">&#xe616;</i>
                 <i class="iconfont down">&#xe616;</i>
                 <i class="iconfont hide up">&#xe615;</i>
                 <i class="iconfont hide up">&#xe615;</i>
@@ -46,7 +46,7 @@
             <ul class="dispatch-mode">
             <ul class="dispatch-mode">
                 {{#each dispatchMode}}
                 {{#each dispatchMode}}
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
                 <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
-                    <span>{{name}}</span>
+                    <span>{{name}}¥{{cost}}</span>
                     <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i>
                     <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i>
                 </li>
                 </li>
                 {{/each}}
                 {{/each}}

@@ -404,6 +404,7 @@ class CartModel
                     $oneDeliv = array();
                     $oneDeliv = array();
                     $oneDeliv['id'] = $val['delivery_way_id'];
                     $oneDeliv['id'] = $val['delivery_way_id'];
                     $oneDeliv['name'] = $val['delivery_way_name'];
                     $oneDeliv['name'] = $val['delivery_way_name'];
+                    $oneDeliv['cost'] = $val['delivery_way_cost'];
                     ($val['default'] === 'Y') && $defaultKey = $key;
                     ($val['default'] === 'Y') && $defaultKey = $key;
 
 
                     $idArr[$key] = $oneDeliv['id'];
                     $idArr[$key] = $oneDeliv['id'];
@@ -505,7 +506,7 @@ class CartModel
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
                 $result['price'] = Helpers::transPrice($price);
                 $result['price'] = Helpers::transPrice($price);
                 // 订单商品数
                 // 订单商品数
-                $result['num'] = $payReturn['shopping_cart_data']['goods_count'];
+                $result['num'] = $payReturn['shopping_cart_data']['selected_goods_count'];
                 // 商品金额
                 // 商品金额
                 $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
                 $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
             }
             }