电子门票确认页

lijing
Commit 51cc3089a9b9626282a3395321ee0269aafcd501 1 parent 41158025
Showing 3 changed files with 29 additions and 34 deletions
apps/cart/models/cart.js
apps/cart/models/ticketsConfirm.js
public/js/cart/order-ensure.js
--- a/apps/cart/models/cart.js
View file @51cc308
+++ b/apps/cart/models/cart.js
View file @51cc308
@@ -150,7 +150,6 @@ exports.orderCompute = (uid, cartType, deliveryWay, paymentType, couponCode, yoh
 exports.ticketsOrderCompute = (uid, productSku, buyNumber, yohoCoin) => {
     return shoppingAPI.checkTickets(uid, productSku, buyNumber, yohoCoin).then(result => {
         if (result && result.data) {
-            
             // result.data.shopping_cart_data.use_yoho_coin = transPrice(result.data.shopping_cart_data.use_yoho_coin);
             // result.data.yohoCoinCompute = paymentProcess.yohoCoinCompute(result.data.shopping_cart_data);
             let resu = {};
--- a/apps/cart/models/ticketsConfirm.js
View file @51cc308
+++ b/apps/cart/models/ticketsConfirm.js
View file @51cc308
@@ -48,7 +48,8 @@ const yohoCoinCompute = ($orderCompute) => {
         $yohoCoinData.yohoCoinMsg = '共' + $yohoCoinData.totalYohoCoinNum +
         '有货币，满' + $orderCompute.yoho_coin_pay_rule.num_limit + '可用';
     } else if ($yohoCoinData.useYohoCoin > 0 || $yohoCoinData.yohoCoin > 0) {
-        let yohoCoin = parseInt($yohoCoinData.useYohoCoin > 0 ? $yohoCoinData.useYohoCoin : $yohoCoinData.yohoCoin, 10).toFixed(2);
+        let yohoCoin = parseInt($yohoCoinData.useYohoCoin > 0 ?
+            $yohoCoinData.useYohoCoin : $yohoCoinData.yohoCoin, 10).toFixed(2);
         $yohoCoinData.yohoCoinMsg = '可抵¥' + yohoCoin;
         $yohoCoinData.yohoCoinClick = 1;
@@ -80,7 +81,7 @@ const ticketsConfirm = (param) => {
                     thumb: helpers.image(val.goods_images, 120, 160),
                     name: val.product_name,
                     color: val.color_name,
-                    size: val.product_skn == SINGLE_TICKETS_SKN ? '' : val.size_name,
+                    size: val.product_skn === SINGLE_TICKETS_SKN ? '' : val.size_name,
                     count: val.buy_number,
                     price: parseInt(val.last_price, 10).toFixed(2)
                 });
--- a/public/js/cart/order-ensure.js
View file @51cc308
+++ b/public/js/cart/order-ensure.js
View file @51cc308
@@ -3,17 +3,17 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/11/12
  */
-
-var $ = require('yoho-jquery'),
+require('cart/order-ensure.page.css');
+let $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload'),
     cookie = require('yoho-cookie');
-var tip = require('../plugin/tip'),
+let tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     order = require('./order-info'),
     richTip = require('../plugin/rich-tip');
-var $invoice = $('.invoice'),
+let $invoice = $('.invoice'),
     $couponUse = $('.coupon-use.used'),
     $addressWrap = $('.address-wrap'),
     $coinCheck = $('.coin-check'),
@@ -33,8 +33,8 @@ var $invoice = $('.invoice'),
     isYohoCoinClick = $coinLi.data('yoho-coin-click') * 1, // 判断有货币是否可以单击
     addressTop = $('.address-wrap').outerHeight();
-var orderCont = cookie.get('order-info') && JSON.parse(cookie.get('order-info'));
-var invoiceCont = {
+let orderCont = cookie.get('order-info') && JSON.parse(cookie.get('order-info'));
+let invoiceCont = {
         7: '服装',
         1: '图书',
         9: '配件',
@@ -62,7 +62,7 @@ function invoiceInit() {
 }
 function getQueryParam() {
-    var queryArray = location.search.substr(1).split('&'),
+    let queryArray = location.search.substr(1).split('&'),
         i,
         subArr = [],
         obj = {};
@@ -98,9 +98,9 @@ if (document.referrer && document.referrer.indexOf('/cart/index/index') !== -1) 
 }
 isLimitGood() && (function() {
-    var a = [];
+    let a = [];
-    var data = getQueryParam();
+    let data = getQueryParam();
     data.type = 'limitcode';
@@ -114,7 +114,7 @@ if (queryString.cartType || queryString.carttype || !orderInfo('cartType')) {
 }
 // function dispacthTapEvt(e) {
-//     var $cur = $(e.target).closest('li');
+//     let $cur = $(e.target).closest('li');
 //     if ($cur.length === 0 || $cur.hasClass('chosed')) {
 //         return;
@@ -125,7 +125,7 @@ if (queryString.cartType || queryString.carttype || !orderInfo('cartType')) {
 // }
 $('.checkbox').on('touchstart', function(e) {
-    var $this = $(this);
+    let $this = $(this);
     if ($(e.target).closest('.coin-check').length && !isYohoCoinClick) {
         return true;
@@ -142,7 +142,7 @@ $('.checkbox').on('touchstart', function(e) {
 });
 $invoice.on('touchend', '.checkbox', function() {
-    var $this = $(this);
+    let $this = $(this);
     if ($this.hasClass('icon-cb-radio')) {
         $invoice.addClass('focus');
@@ -167,7 +167,7 @@ $invoice.on('touchend', '.checkbox', function() {
 function updateDeliverId(id) {
-    var $moreJit = $('.more-jit a').get(0),
+    let $moreJit = $('.more-jit a').get(0),
         url;
     if ($moreJit) {
@@ -184,7 +184,7 @@ function updateDeliverId(id) {
 }
 function orderCompute() {
-    var yohoCoin = orderInfo('yohoCoin'),
+    let yohoCoin = orderInfo('yohoCoin'),
         deliverId = orderInfo('deliveryId'),
         data = {
             cartType: orderInfo('cartType') || 'ordinary',
@@ -192,7 +192,7 @@ function orderCompute() {
             paymentType: orderInfo('paymentType'),
             couponCode: orderInfo('couponCode'),
             yohoCoin: yohoCoin,
-            skuList: isLimitGood() ? orderInfo('skuList') : undefined
+            skuList: isLimitGood() ? orderInfo('skuList') : void 0
         };
     // 门票
@@ -214,7 +214,7 @@ function orderCompute() {
         if ($.type(res) !== 'object') {
             window.location.reload();
         } else {
-            if (typeof res.last_order_amount !== undefined) {
+            if (typeof res.last_order_amount !== 'undefined') {
                 res.last_order_amount = (+res.last_order_amount).toFixed(2);
             }
@@ -249,7 +249,7 @@ function orderCompute() {
 }
 function submitOrder() {
-    var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
+    let invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
         msg = $('#msg').find('input').val() || orderInfo('msg');
     if (isSubmiting) {
@@ -291,10 +291,10 @@ function submitOrder() {
             paymentType: orderInfo('paymentType'), // 支付方式
             couponCode: orderInfo('couponCode'),
             yohoCoin: orderInfo('yohoCoin'),
-            skuList: isLimitGood() ? orderInfo('skuList') : undefined
+            skuList: isLimitGood() ? orderInfo('skuList') : void 0
         }
     }).then(function(res) {
-        var url;
+        let url;
         if (!res) {
             tip.show('系统繁忙,请稍后再试!');
@@ -364,7 +364,7 @@ $('.delivery-id').on('touchend', 'li', function() {
 });
 $('.payment-type').on('touchend', 'li', function() {
-    var $paymentType = $('.icon-cb-radio', this);
+    let $paymentType = $('.icon-cb-radio', this);
     orderInfo('paymentTypeId', $paymentType.data('id')); // 支付方式id
     orderInfo('paymentType', $paymentType.data('payment-type')); // 支付方式
@@ -381,7 +381,7 @@ $('.yoho-coin-help-dialog-bg, .yoho-coin-footer').on('touchend', function(e) {
 });
 $('.coin').on('touchend', function(e) {
-    var $this = $(this);
+    let $this = $(this);
     if ($(e.target).closest('.yoho-coin-help').length) {
         $('.yoho-coin-help-dialog-bg').removeClass('hide');
@@ -410,7 +410,7 @@ $('.coin').on('touchend', function(e) {
 });
 $invoice.on('touchend', '.checkbox', function(e) {
-    var $this = $(this);
+    let $this = $(this);
     orderInfo('invoice', $this.hasClass('icon-cb-radio'));
     e.preventDefault();
@@ -479,7 +479,7 @@ $subBlock.on('touchstart', 'li', function() {
 $('.bill a').on('touchstart', function() {
-    var $paymentType;
+    let $paymentType;
     if (isTickets) {
         ticketsConfirm(); // eslint-disable-line
@@ -508,18 +508,13 @@ if (orderInfo('address') && orderInfo('address').is_support === 'N') {
 // 电子票下单
 function ticketsConfirm() {
-    var data = {
+    let data = {
         productSku: productSku,
         buyNumber: buyNumber,
         mobile: $ticketsMobile.val(),
         useYohoCoin: orderInfo('yohoCoin')
     };
-    // 如果没有勾选选择有货币，不取cookie有货币值，直接置0
-    if (!$('.checkbox').hasClass('icon-cb-radio')) {
-        data.useYohoCoin = 0;
-    }
-
     if (!$ticketsMobile.val()) {
         tip.show('手机号必填');
         return;
@@ -548,8 +543,8 @@ function ticketsConfirm() {
 // 校验手机号
 $ticketsMobile.blur(function() {
-    var reg = /^[0123456789]{1,30}$/;
-    var mobile = $ticketsMobile.val();
+    let reg = /^[0123456789]{1,30}$/;
+    let mobile = $ticketsMobile.val();
     if (!reg.test(mobile)) {
         tip.show('手机号码不正确！');