增加订单提交

@@ -30,6 +30,35 @@ function dispacthTapEvt(e) {
     $cur.addClass('chosed');
 }
 
+dispatchModeHammer = new Hammer(document.getElementsByClassName('dispatch-mode')[0]);
+dispatchModeHammer.on('tap', dispacthTapEvt);
+
+dispatchTimeHammer = new Hammer(document.getElementsByClassName('dispatch-time')[0]);
+dispatchTimeHammer.on('tap', dispacthTapEvt);
+
+$('.checkbox').on('touchstart', function() {
+    var $this = $(this);
+
+    if ($this.hasClass('icon-cb-checked')) {
+        $this.removeClass('icon-cb-checked').addClass('icon-checkbox');
+        return;
+    }
+    if ($this.hasClass('icon-checkbox')) {
+        $this.removeClass('icon-checkbox').addClass('icon-cb-checked');
+    }
+});
+
+$('.invoice').on('touchend', '.checkbox', function() {
+    var $this = $(this);
+
+    if ($this.hasClass('icon-cb-checked')) {
+        $('.invoice').addClass('focus');
+    }
+    if ($this.hasClass('icon-checkbox')) {
+        $('.invoice').removeClass('focus');
+    }
+});
+
 function orderCompute() {
     $.ajax({
         method: 'POST',
@@ -62,34 +91,29 @@ function orderCompute() {
     });
 }
 
-dispatchModeHammer = new Hammer(document.getElementsByClassName('dispatch-mode')[0]);
-dispatchModeHammer.on('tap', dispacthTapEvt);
-
-dispatchTimeHammer = new Hammer(document.getElementsByClassName('dispatch-time')[0]);
-dispatchTimeHammer.on('tap', dispacthTapEvt);
-
-$('.checkbox').on('touchstart', function() {
-    var $this = $(this);
-
-    if ($this.hasClass('icon-cb-checked')) {
-        $this.removeClass('icon-cb-checked').addClass('icon-checkbox');
-        return;
-    }
-    if ($this.hasClass('icon-checkbox')) {
-        $this.removeClass('icon-checkbox').addClass('icon-cb-checked');
-    }
-});
-
-$('.invoice').on('touchend', '.checkbox', function() {
-    var $this = $(this);
-
-    if ($this.hasClass('icon-cb-checked')) {
-        $('.invoice').addClass('focus');
-    }
-    if ($this.hasClass('icon-checkbox')) {
-        $('.invoice').removeClass('focus');
-    }
-});
+function submitOrder() {
+    $.ajax({
+        method: 'POST',
+        url: '/shoppingCart/orderSub',
+        data: {
+            addressId: orderInfo('addressId'),
+            cartType: orderInfo('cartType'),
+            deliveryId: orderInfo('deliveryId'),
+            deliveryTimeId: orderInfo('deliveryTimeId'),
+            invoiceText: orderInfo('invoiceText'),
+            invoiceType: orderInfo('invoiceType'),
+            msg: orderInfo('msg'),
+            paymentTypeId: orderInfo('paymentTypeId'),
+            paymentType: orderInfo('paymentType'), //支付方式
+            couponCode: orderInfo('couponCode'),
+            yohoCoin: orderInfo('yohoCoin')
+        }
+    }).then(function(res) {
+        console.log(res);
+    }).fail(function() {
+        tip.show('网络出错');
+    });
+}
 
 // 界面点击，状态存 cookie
 $('.dispatch-mode').on('touchend', 'li', function() {
@@ -132,4 +156,6 @@ $('#msg').find('input').on('blur', function() {
 
 $('.pay-mode').on('click', 'li', function() {
     orderInfo('paymentTypeId', $(this).data('pay-id'));
+    orderInfo('paymentType', $(this).data('pay-type'));
+    submitOrder();
 });

@@ -128,7 +128,7 @@
 
         <ul class="pay-mode">
             {{# paymentWay}}
-            <li class="{{#if default}}default{{/if}}" data-pay-id={{id}}>
+            <li class="{{#if default}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
                 <span class="iconfont">
                     {{#if default}}
                         &#xe62f;

@@ -156,7 +156,6 @@ class ShoppingCartController extends AbstractAction
 			'orderEnsure' => CartModel::cartPay($uid, $cartType, $cookieData)
 		);
 
-
 		$this->_view->display('order-ensure', $data);
 	}
 
@@ -268,13 +267,13 @@ class ShoppingCartController extends AbstractAction
 			$uid = $this->getUid(true);
 			$addressId = $this->post('addressId', null);
 			$cartType = $this->post('cartType', 'ordinary'); // 默认普通购物车
-			$deliveryTime = $this->post('deliveryTime', 1); // 默认只工作日配送
-			$deliveryWay = $this->post('deliveryWay', 1); // 默认普通快递
-			$invoiceTitle = $this->post('invoiceTitle', null);
-			$invoiceId = $this->post('invoiceId', null);
-			$paymentId = $this->post('paymentId', 15);
+			$deliveryTime = $this->post('deliveryTimeId', 1); // 默认只工作日配送
+			$deliveryWay = $this->post('deliveryId', 1); // 默认普通快递
+			$invoiceTitle = $this->post('invoiceText', null);
+			$invoiceId = $this->post('invoiceType', null);
+			$paymentId = $this->post('paymentTypeId', 15);
 			$paymentType = $this->post('paymentType', 1); // 默认在线支付
-			$remark = $this->post('remark', null); // 默认在线支付
+			$remark = $this->post('msg', null);
 			$yohoCoin = $this->post('yohoCoin', 1);
 			$result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoiceTitle, $invoiceId, $paymentId, $paymentType, $remark, $yohoCoin);
 		}
@@ -283,7 +282,7 @@ class ShoppingCartController extends AbstractAction
 			echo ' ';
 		} else {
 			// 提交成功清除Cookie
-			$this->setCookie('orderInfo', null);
+			$this->setCookie('order-info', null);
 
 			$this->echoJson($result);
 		}