Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/webapp/o2o/dist/js/model/recharge.js

@@ -1 +1 @@
-define(["base","$","native","api","user","config"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="recharge"};return s.prototype=new e,s.prototype.getRechargeList=function(e){var t=this;r.getRechargeList({},function(t){t.success,typeof e=="function"&&e(t)})},s.prototype.addRechargeorder=function(e,t){var n=this;r.addRechargeorder({user_id:e.user_id,recharge_id:e.recharge_id},function(e){e.success,typeof t=="function"&&t(e)})},new s});
+define(["base","$","native","api","user","config"],function(e,t,n,r,i){var s=function(){if(typeof s.instance=="object")return s.instance;s.instance=this,this.storagePrefix="recharge"};return s.prototype=new e,s.prototype.getRechargeList=function(e){var t=this;r.getRechargeList({},function(t){t.success,typeof e=="function"&&e(t)})},s.prototype.addRechargeorder=function(e,t){var n=this;r.addRechargeorder({user_id:e.user_id,value:e.value,recharge_id:e.recharge_id},function(e){e.success,typeof t=="function"&&t(e)})},new s});

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

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,value:"200",backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,value:"200",recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/model/recharge.js

@@ -30,6 +30,7 @@ define(['base', '$', 'native', 'api', 'user', 'config'], function (base, $, nati
         var that = this;
         api.addRechargeorder({
             user_id: data.user_id,
+            value:data.value,
             recharge_id: data.recharge_id
         }, function (res) {
             if (res.success) {
@@ -42,4 +43,4 @@ define(['base', '$', 'native', 'api', 'user', 'config'], function (base, $, nati
     };
 
     return new Recharge();
-})
+})

www/webapp/o2o/js/page/rechargee.js

@@ -65,6 +65,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				var value = $(this).attr('data-value');
 				recharge.addRechargeorder({
 					user_id: user.id,
+					value:'200',
 					recharge_id: $(this).attr('data-id')
 				}, function (res) {
 					$doc.trigger('spa:closeloader');
@@ -81,7 +82,6 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 							pushData: {
 								isRecharge: true,
 								orderID: res.data._id.$id,
-								value:'200',
 								backHash: 'recharge'
 							}
 						});