选择优惠券 添加extra

www/webapp/o2o/dist/js/page/picker.js

@@ -1 +1 @@
-define(["$","template","order","config","user","api"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:t})}return{title:"壹管家上门服务",body:"",init:function(n,r){var u=this,a=e(document);e.newTouch(".back-button",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)},u),u.on("tapBackButton",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)}),e.newTouch(".picker-option",function(){event.preventDefault();if(e(this).hasClass("unable"))return;u.trigger("tapBackButton"),n.callback&&e.isFunction(n.callback.onSelect)&&n.callback.onSelect(e(this).data("value"))},u),e.newTouch(".btn-coupon",function(r){r.preventDefault();var o=n.pushData,f=e("#coupon-code",u).val();f.length<8?a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]):(e(this).val(""),i.exchangeCoupon(f,function(e){a.trigger("spa:openloader"),e.success?s.getCouponList({products:o.products,type:o.type,user_id:i.id},function(e){a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]);if(e.success){i.orderCoupons=e.data;var n=t("picker/cell",{options:e.data});u.find(".card-list").html(n)}}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]))}))},u),r.resolve()},beforeopen:function(n,o){var u=e(document),a=this,f=n.pushData;u.trigger("spa:openloader"),s.getCouponList({products:f.products,booking_time:f.time,user_id:i.id,type:f.type},function(e){var i=t("picker/coupon",{options:e.data,unuseables:e.unuseable_coupons,title:"选择代金券",showNavBar:!r.isWX&&!r.isChubao});a.find(".spa-page-body").html(i),n.scroll&&(n.scroll.destroy(),n.scroll=null),setTimeout(function(){n.scroll=new IScroll("#pickerScroll")},500),o.resolve(),u.trigger("spa:closeloader")})}}});
+define(["$","template","order","config","user","api"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:t})}return{title:"壹管家上门服务",body:"",init:function(n,r){var u=this,a=e(document);e.newTouch(".back-button",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)},u),u.on("tapBackButton",function(e){e.preventDefault();var t=n.pushData;o.call(this,t.backHash)}),e.newTouch(".picker-option",function(){event.preventDefault();if(e(this).hasClass("unable"))return;u.trigger("tapBackButton"),n.callback&&e.isFunction(n.callback.onSelect)&&n.callback.onSelect(e(this).data("value"))},u),e.newTouch(".btn-coupon",function(r){r.preventDefault();var o=n.pushData,f=e("#coupon-code",u).val();f.length<8?a.trigger("spa:openpanel",["simpleAlert",{message:"请输入有效的兑换码"}]):(e(this).val(""),i.exchangeCoupon(f,function(e){a.trigger("spa:openloader"),e.success?s.getCouponList({products:o.products,type:o.type,user_id:i.id},function(e){a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]);if(e.success){i.orderCoupons=e.data;var n=t("picker/cell",{options:e.data});u.find(".card-list").html(n)}}):(a.trigger("spa:closeloader"),a.trigger("spa:openpanel",["simpleAlert",{message:e.message}]))}))},u),r.resolve()},beforeopen:function(n,o){var u=e(document),a=this,f=n.pushData;u.trigger("spa:openloader"),s.getCouponList({products:f.products,booking_time:f.time,user_id:i.id,type:f.type,extra:f.extraJson},function(e){var i=t("picker/coupon",{options:e.data,unuseables:e.unuseable_coupons,title:"选择代金券",showNavBar:!r.isWX&&!r.isChubao});a.find(".spa-page-body").html(i),n.scroll&&(n.scroll.destroy(),n.scroll=null),setTimeout(function(){n.scroll=new IScroll("#pickerScroll")},500),o.resolve(),u.trigger("spa:closeloader")})}}});

www/webapp/o2o/js/page/picker.js

@@ -91,7 +91,8 @@ define(['$', 'template', 'order', 'config', 'user', 'api'], function ($, templat
                 products: pushData.products, //产品
                 booking_time: pushData.time, //预订时间
                 user_id: user.id, //用户id
-                type: pushData.type //资源
+                type: pushData.type, //资源
+                extra:  pushData.extraJson
             }, function (res) {
                 var tpl = template('picker/coupon', {
                     options: res.data,

www/webapp/o2o/js/page/placeOrder.js

@@ -263,7 +263,10 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                 order.appendID = $(this).attr('data-extra-type');
                 order.price = $(this).attr('data-extra-price');
                 order.cost = order.price * order.productCount;
-                /* 算账 */
+                // 重置代金券
+                $('.coupon-selected-name', $view).html('选择优惠券');
+                order.couponValue = 0;
+                order.couponID = '';
                 payCharge($('.order-cost', $view));
             }, $view);
 
@@ -621,6 +624,17 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
             $.newTouch('.show-coupon-picker', function (event) {
                 if ($(this).hasClass('disabled')) return;
                 event.preventDefault();
+
+                var extraJson = '';
+                if (product.extra && !order.appendID) {
+                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                        message: '请选择extra'
+                    }]);
+                    return;
+                }else {
+                    extraJson = JSON.stringify([{type: order.appendID, price: order.price}]);
+                }
+
                 // 必须先选择时间
                 if (!order.bookingDate) {
                     $doc.trigger('spa:openpanel', ['simpleAlert', {
@@ -639,7 +653,9 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
                             product_id: order.productID,
                             count: order.productCount
                         }]),
-                        type: order.productType
+                        time: order.bookingDate + ' ' + order.bookingTime + ':00',
+                        type: order.productType,
+                        extraJson: extraJson
                     },
                     callback: {
                         // 在picker页面挑选之后，回到这个页面时执行的回调。pickValue:选中的优惠券的ID;