Authored by 郭成尧

'地址选择列表OK'

... ... @@ -28,7 +28,7 @@ exports.address = (req, res, next) => {
};
addressModel.address({
uid: req.user.uid || 8039759
uid: req.user.uid || 8039759 //TODO 待删除
}).then(result => {
res.render('address/index', Object.assign(responseData, result));
}).catch(next);
... ... @@ -53,7 +53,7 @@ exports.addressAct = (req, res, next) => {
addressModel.address({
id: req.params.id,
uid: req.user.uid || 8039759
uid: req.user.uid || 8039759 //TODO 待删除
}).then(result => {
res.render('address/address-act', Object.assign(responseData, result));
}).catch(next);
... ... @@ -66,6 +66,8 @@ exports.addressAct = (req, res, next) => {
* @param next
*/
exports.saveAddress = (req, res, next) => {
// TODO 开发完成后放开
// if (!req.body.uid) {
// res.json({
// code: 400,
... ... @@ -93,7 +95,7 @@ exports.saveAddress = (req, res, next) => {
message: '请输入收件人姓名'
});
}
// TODO 开发完成后放开
// if (!req.body.email || !helpers.verifyEmail(req.body.email)) {
// res.json({
// code: 404,
... ... @@ -102,7 +104,7 @@ exports.saveAddress = (req, res, next) => {
// }
addressModel.saveAddress({
uid: req.user.uid || 8039759,
uid: req.user.uid || 8039759, //TODO 待删除
address: req.body.address,
area_code: req.body.area_code,
consignee: req.body.consignee,
... ... @@ -124,7 +126,7 @@ exports.saveAddress = (req, res, next) => {
exports.delAddress = (req, res, next) => {
addressModel.delAddress({
id: req.body.id,
uid: req.user.uid || 8039759
uid: req.user.uid || 8039759 //TODO 待删除
}).then(result => {
res.json(result);
}).catch(next);
... ... @@ -138,7 +140,7 @@ exports.delAddress = (req, res, next) => {
*/
exports.locationList = (req, res, next) => {
addressModel.locationList({
uid: req.user.uid || 8039759
uid: req.user.uid || 8039759 //TODO 待删除
}).then(result => {
res.render('address/location-list', result);
}).catch(next);
... ...
... ... @@ -22,7 +22,7 @@ var $addressForm = $('.edit-address'),
currentPage = 'edit',
newArea = [],
chinaAddressList,
queryString = $.queryString();
queryString = window.queryString;
$($editAddressPage, $addressListPage).css('min-height', function() {
return $(window).height() - $('#yoho-header').height();
... ... @@ -124,7 +124,6 @@ $submit.on('touchend', function() {
$(this).removeClass('highlight');
});
// TODO 页面报错因为这个函数
function bindAddressListEvent(html) {
$addressListPage.html(html);
... ...
/**
* 订单 地址修改
* @author: liangxiaosong
* @date: 2016/5/11
*/
var $ = require('yoho-jquery'),
tip = require('../../plugin/tip');
var $confimMod = $('.confim-modify-mask'),
$modifyAdd = $('.modifyAdd'),
orderCode = $modifyAdd.data('orderCode'),
selectId;
$('.address-item').on('touchend', function() {
selectId = $(this).data('addressId');
if ($modifyAdd.data('rel') === true) {
$confimMod.find('.content').text('关联订单的收货地址将会一起修改且不可修改第二次,请确认是否修改?');
$confimMod.fadeIn();
} else {
$confimMod.find('.content').text('收货地址仅且只能修改一次,请确认是否修改?');
$confimMod.fadeIn();
}
});
$confimMod.on('touchend', '.cancel', function() {
selectId = null;
$confimMod.fadeOut();
return false;
}).on('touchend', '.confim', function() {
$.ajax({
method: 'GET',
url: '/home/chooseAddress',
data: {
addressId: selectId,
orderCode: orderCode
}
}).then(function(res) {
if ($.type(res) !== 'object') {
res = {};
}
if (res.code !== 200) {
$confimMod.fadeOut();
tip.show(res.message || '网络出了点问题~');
} else {
window.location.href = '/home/orderdetail?order_code=' + orderCode;
}
}).fail(function() {
tip.show('网络出了点问题~');
}).always(function() {
selectId = null;
});
return false;
});