Merge branch 'feature/addressId' into release/6.3

@@ -33,12 +33,12 @@ exports.index = (req, res, next) => {
 exports.editAddress = (req, res, next) => {
     let uid = req.user.uid;
 
-    if (!req.query.id) {
-        return {code: 400};
+    if (!req.body.id) {
+        return res.json({code: 400});
     }
 
     // 真实数据输出
-    req.ctx(addressModel).editAddress(req.query, uid).then(result => {
+    req.ctx(addressModel).editAddress(req.body, uid).then(result => {
         res.json(result);
     }).catch(next);
 };
@@ -62,10 +62,10 @@ exports.delAddress = (req, res, next) => {
     let uid = req.user.uid;
 
     if (!req.query.id) {
-        return {
+        return res.json({
             code: 400,
             message: '缺失必填项'
-        };
+        });
     }
 
     // 真实数据输出
@@ -80,15 +80,15 @@ exports.delAddress = (req, res, next) => {
 exports.defaultAddress = (req, res, next) => {
     let uid = req.user.uid;
 
-    if (!req.query.id) {
-        return {
+    if (!req.body.id) {
+        return res.json({
             code: 400,
             message: '缺失必填项'
-        };
+        });
     }
 
     // 真实数据输出
-    req.ctx(addressModel).defaultAddress(req.query, uid).then(result => {
+    req.ctx(addressModel).defaultAddress(req.body, uid).then(result => {
         res.json(result);
     }).catch(next);
 };

@@ -118,7 +118,6 @@ module.exports = class extends global.yoho.BaseModel {
         let that = this;
 
         return co(function*() {
-
             let id = params.id,
                 respData = {};
             let addressDataModel = new AddressApi(that.ctx);

@@ -259,13 +259,13 @@ router.get('/address', tabsMiddleware.getCommonHeader, AddressController.index);
 
 router.get('/address/area', UserController.getProviceList);
 
-router.get('/address/editAddress', AddressController.editAddress);
+router.post('/address/editAddress', AddressController.editAddress);
 
 router.post('/address/saveAddress', AddressController.saveAddress);
 
 router.get('/address/delAddress', AddressController.delAddress);
 
-router.get('/address/defaultAddress', AddressController.defaultAddress);
+router.post('/address/defaultAddress', AddressController.defaultAddress);
 
 // 兑换礼品卡
 

@@ -45,7 +45,11 @@ var address = {
     },
 
     editAddr: function(id) {
-        $.getJSON('/home/address/editAddress?id=' + id, function(jsonData) {
+        $.ajax({
+            url: '/home/address/editAddress',
+            type: 'POST',
+            data: {id: id},
+        }).done(function(jsonData) {
             if (jsonData.code === 200) {
                 $('#form-status').html('修改地址');
                 $('#addressName').val(jsonData.data.consignee);
@@ -96,10 +100,14 @@ var address = {
     setDefaultAddr: function(addrId) {
         var oldBtn = $('.address-list').find('.default-btn'),
             oldLi = $('.address-list').find('.default-btn').parents('li'),
-            curLi = $('.address-list').find('li[addressId=' + addrId + ']'),
+            curLi = $('.address-list').find('li[addressId="' + addrId + '"]'),
             curBtn = curLi.find('.set-default-btn');
 
-        $.getJSON('/home/address/defaultAddress?id=' + addrId, function(jsonData) {
+        $.ajax({
+            url: '/home/address/defaultAddress',
+            type: 'POST',
+            data: {id: addrId},
+        }).done(function(jsonData) {
             if (jsonData.code === 200) {
                 oldBtn.attr('class', 'btn-c3 set-default-btn');
                 oldLi.removeClass('preferred');