fix 选择代金券

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

@@ -1 +1 @@
-define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(r,s){var a=this,f=e(document);if(!r.pushData.dontNeedReload){f.trigger("spa:openloader");var l=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",a).html(l),setTimeout(function(){r.scroll=new n("#homeScroll")},500),i.getCouponList(),u.getList({request_from:"weixin",user_id:i.id}),f.trigger("spa:closeloader")}s.resolve(),r.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});
+define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(r,s){var a=this,f=e(document);if(!r.pushData.dontNeedReload){f.trigger("spa:openloader");var l=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",a).html(l),setTimeout(function(){r.scroll=new n("#homeScroll")},500),u.getList({request_from:"weixin",user_id:i.id}),f.trigger("spa:closeloader")}s.resolve(),r.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});

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,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")})}}});
+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"),i.getCouponList(),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/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function(ba
     }
     User.instance = this;
     this.storagePrefix = 'user_';
-    this.id = '57e22bb59f5160c2048b456c'; //
+    this.id = ''; //57e22bb59f5160c2048b456c
     this.lastID = this.getCache('lastID', null, '');
     this.name = '';
     this.mobile = '';

www/webapp/o2o/js/page/home.js

@@ -217,8 +217,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
                 // product.getListAll(user.id, function (res) {
                 // });
 
-                user.getCouponList();
-
                 address.getList({
                     request_from: 'weixin',
                     user_id: user.id

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

@@ -87,6 +87,7 @@ define(['$', 'template', 'order', 'config', 'user', 'api'], function ($, templat
             var pushData = pageData.pushData;
 
             $doc.trigger('spa:openloader');
+            user.getCouponList();
             api.getCouponList({
                 products: pushData.products, //产品
                 booking_time: pushData.time, //预订时间