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

www/webapp/moonclub/js/api.js

@@ -69,7 +69,7 @@ define(['config', 'base'], function (config, base) {
         var that = this;
         this.isLoading = true;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/product/list',
+            url: config.apiPath + '/index.php?r=moonclub/product/list',
             data: data,
             dataType: 'JSON',
             success: function(res) {
@@ -157,7 +157,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getCouponList = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/usableCoupon',
+            url: config.apiPath + '/index.php?r=moonclub/order/usableCoupon',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -179,7 +179,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.exchangeCoupon = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/user/exchangeCoupon',
+            url: config.apiPath + '/index.php?r=moonclub/user/exchangeCoupon',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -201,7 +201,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.checkAddress = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/checkAddress',
+            url: config.apiPath + '/index.php?r=moonclub/order/checkAddress',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -223,7 +223,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.addOrder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/add',
+            url: config.apiPath + '/index.php?r=moonclub/order/add',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -245,7 +245,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.cancelOrder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/del',
+            url: config.apiPath + '/index.php?r=moonclub/order/del',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -267,7 +267,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.appendOrder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/append',
+            url: config.apiPath + '/index.php?r=moonclub/order/append',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -289,7 +289,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getOrderDetail = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/detail',
+            url: config.apiPath + '/index.php?r=moonclub/order/detail',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -311,7 +311,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getPayCharge = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/pay',
+            url: config.apiPath + '/index.php?r=moonclub/order/pay',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -333,7 +333,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getAppendPayCharge = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/appendPay',
+            url: config.apiPath + '/index.php?r=moonclub/order/appendPay',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -355,7 +355,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getMyOrderList = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/list',
+            url: config.apiPath + '/index.php?r=moonclub/order/list',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -377,7 +377,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.postReview = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/product/comment',
+            url: config.apiPath + '/index.php?r=moonclub/product/comment',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -399,7 +399,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getReviewList = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/product/commentList',
+            url: config.apiPath + '/index.php?r=moonclub/product/commentList',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -531,7 +531,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.refundOrder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/retrieve',
+            url: config.apiPath + '/index.php?r=moonclub/order/retrieve',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -553,7 +553,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.finishOrder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/confirmComplete',
+            url: config.apiPath + '/index.php?r=moonclub/order/confirmComplete',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -575,7 +575,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getTradeStr = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/chubao/chubaoPay',
+            url: config.apiPath + '/index.php?r=moonclub/chubao/chubaoPay',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -597,7 +597,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.selectTech = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/selectTech',
+            url: config.apiPath + '/index.php?r=moonclub/order/selectTech',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -618,7 +618,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.techComment = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/order/techComment',
+            url: config.apiPath + '/index.php?r=moonclub/order/techComment',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -640,7 +640,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.addRechargeorder = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/recharge/addRechargeorder',
+            url: config.apiPath + '/index.php?r=moonclub/recharge/addRechargeorder',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -662,7 +662,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.payRecharge = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/recharge/payRecharge',
+            url: config.apiPath + '/index.php?r=moonclub/recharge/payRecharge',
             data: data,
             dataType: 'JSON',
             success: function (res) {
@@ -684,7 +684,7 @@ define(['config', 'base'], function (config, base) {
     API.prototype.getRechargeList = function (data, callback) {
         var that = this;
         $.signAjax({
-            url: config.apiPath + '/index.php?r=o2o/recharge/rechargeList',
+            url: config.apiPath + '/index.php?r=moonclub/recharge/rechargeList',
             data: data,
             dataType: 'JSON',
             success: function (res) {

www/webapp/moonclub/js/model/product.js

@@ -183,7 +183,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 					// that.allList=res.data.products;
 				}
 				if (typeof (callback) == 'function') {
-					callback(res);
+					// callback(res);
 				}
 			});
 		}

www/webapp/moonclub/js/page/home.js

@@ -235,11 +235,11 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				},1000);
 
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
-				product.getListAll(user.id);
+			/*	product.getListAll(user.id);
 				address.getList({
 					request_from: 'weixin',
 					user_id: user.id
-				});
+				});*/
 				$doc.trigger('spa:closeloader');
 			}
 			/* 又是这个。不知道什么玩意…… */