fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 9fb9a6aceb3d3a740f69c1244d8cb9c8a88ae70e 1 parent 1dd90418

'handle-todo'

Inline Side-by-side
Showing 3 changed files with 28 additions and 26 deletions
@@ -9,8 +9,7 @@ @@ -9,8 +9,7 @@
9 const mRoot = '../models'; 9 const mRoot = '../models';
10 const headerModel = require('../../../doraemon/models/header'); // 头部model 10 const headerModel = require('../../../doraemon/models/header'); // 头部model
11 const addressModel = require(`${mRoot}/address`); // 地址管理 MODEL 11 const addressModel = require(`${mRoot}/address`); // 地址管理 MODEL
12 -// const helpers = global.yoho.helpers;  
13 - 12 +const helpers = global.yoho.helpers;
14 /** 13 /**
15 * 地址管理页面 14 * 地址管理页面
16 * @param req 15 * @param req
@@ -28,7 +27,7 @@ exports.address = (req, res, next) => { @@ -28,7 +27,7 @@ exports.address = (req, res, next) => {
28 }; 27 };
29 28
30 addressModel.address({ 29 addressModel.address({
31 - uid: req.user.uid || 8039759 // TODO 待删除 30 + uid: req.user.uid
32 }).then(result => { 31 }).then(result => {
33 res.render('address/index', Object.assign(responseData, result)); 32 res.render('address/index', Object.assign(responseData, result));
34 }).catch(next); 33 }).catch(next);
@@ -44,7 +43,7 @@ exports.address = (req, res, next) => { @@ -44,7 +43,7 @@ exports.address = (req, res, next) => {
44 exports.addressAct = (req, res, next) => { 43 exports.addressAct = (req, res, next) => {
45 addressModel.address({ 44 addressModel.address({
46 id: req.params.id, 45 id: req.params.id,
47 - uid: req.user.uid || 8039759 // TODO 待删除 46 + uid: req.user.uid
48 }).then(result => { 47 }).then(result => {
49 let responseData = { 48 let responseData = {
50 module: 'home', 49 module: 'home',
@@ -67,14 +66,15 @@ exports.addressAct = (req, res, next) => { @@ -67,14 +66,15 @@ exports.addressAct = (req, res, next) => {
67 */ 66 */
68 exports.saveAddress = (req, res, next) => { 67 exports.saveAddress = (req, res, next) => {
69 68
70 - // TODO 开发完成后放开  
71 - // if (!req.body.uid) {  
72 - // res.json({  
73 - // code: 400,  
74 - // message: '用户不可用'  
75 - // });  
76 - // } 69 + /* 没有用户，返回 */
  70 + if (!req.body.uid) {
  71 + res.json({
  72 + code: 400,
  73 + message: '用户不可用'
  74 + });
  75 + }
77 76
  77 + /* 没有地址信息，返回 */
78 if (!req.body.address) { 78 if (!req.body.address) {
79 res.json({ 79 res.json({
80 code: 401, 80 code: 401,
@@ -82,6 +82,7 @@ exports.saveAddress = (req, res, next) => { @@ -82,6 +82,7 @@ exports.saveAddress = (req, res, next) => {
82 }); 82 });
83 } 83 }
84 84
  85 + /* 没有地区码，返回 */
85 if (!req.body.area_code) { 86 if (!req.body.area_code) {
86 res.json({ 87 res.json({
87 code: 402, 88 code: 402,
@@ -89,6 +90,7 @@ exports.saveAddress = (req, res, next) => { @@ -89,6 +90,7 @@ exports.saveAddress = (req, res, next) => {
89 }); 90 });
90 } 91 }
91 92
  93 + /* 没有收件人姓名，返回 */
92 if (!req.body.consignee) { 94 if (!req.body.consignee) {
93 res.json({ 95 res.json({
94 code: 403, 96 code: 403,
@@ -96,16 +98,16 @@ exports.saveAddress = (req, res, next) => { @@ -96,16 +98,16 @@ exports.saveAddress = (req, res, next) => {
96 }); 98 });
97 } 99 }
98 100
99 - // TODO 开发完成后放开  
100 - // if (!req.body.email || !helpers.verifyEmail(req.body.email)) {  
101 - // res.json({  
102 - // code: 404,  
103 - // message: '输入的邮箱地址格式不正确'  
104 - // });  
105 - // } 101 + /* 邮箱地址校验不通过，返回 */
  102 + if (!req.body.email || !helpers.verifyEmail(req.body.email)) {
  103 + res.json({
  104 + code: 404,
  105 + message: '输入的邮箱地址格式不正确'
  106 + });
  107 + }
106 108
107 addressModel.saveAddress({ 109 addressModel.saveAddress({
108 - uid: req.user.uid || 8039759, // TODO 待删除 110 + uid: req.user.uid,
109 address: req.body.address, 111 address: req.body.address,
110 area_code: req.body.area_code, 112 area_code: req.body.area_code,
111 consignee: req.body.consignee, 113 consignee: req.body.consignee,
@@ -127,7 +129,7 @@ exports.saveAddress = (req, res, next) => { @@ -127,7 +129,7 @@ exports.saveAddress = (req, res, next) => {
127 exports.delAddress = (req, res, next) => { 129 exports.delAddress = (req, res, next) => {
128 addressModel.delAddress({ 130 addressModel.delAddress({
129 id: req.body.id, 131 id: req.body.id,
130 - uid: req.user.uid || 8039759 // TODO 待删除 132 + uid: req.user.uid
131 }).then(result => { 133 }).then(result => {
132 res.json(result); 134 res.json(result);
133 }).catch(next); 135 }).catch(next);
@@ -141,7 +143,7 @@ exports.delAddress = (req, res, next) => { @@ -141,7 +143,7 @@ exports.delAddress = (req, res, next) => {
141 */ 143 */
142 exports.defaultAddress = (req, res, next) => { 144 exports.defaultAddress = (req, res, next) => {
143 addressModel.setDefaultAddress({ 145 addressModel.setDefaultAddress({
144 - uid: req.user.uid || 8039759, // TODO 待删除 146 + uid: req.user.uid,
145 id: req.body.id 147 id: req.body.id
146 }).then(result => { 148 }).then(result => {
147 res.json(result); 149 res.json(result);
@@ -165,7 +167,7 @@ exports.addressModify = (req, res, next) => { @@ -165,7 +167,7 @@ exports.addressModify = (req, res, next) => {
165 }; 167 };
166 168
167 addressModel.address({ 169 addressModel.address({
168 - uid: req.user.uid || 8039759 // TODO 待删除 170 + uid: req.user.uid
169 }).then(result => { 171 }).then(result => {
170 res.render('address/address-modify', Object.assign(responseData, result, { 172 res.render('address/address-modify', Object.assign(responseData, result, {
171 showAddBtn: (result.address.length <= 5), 173 showAddBtn: (result.address.length <= 5),
@@ -183,7 +185,7 @@ exports.addressModify = (req, res, next) => { @@ -183,7 +185,7 @@ exports.addressModify = (req, res, next) => {
183 */ 185 */
184 exports.locationList = (req, res, next) => { 186 exports.locationList = (req, res, next) => {
185 addressModel.locationList({ 187 addressModel.locationList({
186 - uid: req.user.uid || 8039759 // TODO 待删除 188 + uid: req.user.uid
187 }).then(result => { 189 }).then(result => {
188 res.render('address/location-list', result); 190 res.render('address/location-list', result);
189 }).catch(next); 191 }).catch(next);
@@ -21,7 +21,7 @@ exports.order = (req, res, next) => { @@ -21,7 +21,7 @@ exports.order = (req, res, next) => {
21 page: req.query.page || 1, 21 page: req.query.page || 1,
22 gender: req.query.gender || '1,3', 22 gender: req.query.gender || '1,3',
23 yh_channel: req.query.channel || 1, 23 yh_channel: req.query.channel || 1,
24 - uid: req.user.uid || 8039759 // TODO 待删除 24 + uid: req.user.uid
25 }; 25 };
26 26
27 orderModel.order(params).then(result => { 27 orderModel.order(params).then(result => {
@@ -49,7 +49,7 @@ exports.getOrders = (req, res, next) => { @@ -49,7 +49,7 @@ exports.getOrders = (req, res, next) => {
49 page: req.query.page || 1, 49 page: req.query.page || 1,
50 gender: req.query.gender || '1,3', 50 gender: req.query.gender || '1,3',
51 yh_channel: req.query.channel || 1, 51 yh_channel: req.query.channel || 1,
52 - uid: req.user.uid || 8039759 // TODO 待删除 52 + uid: req.user.uid
53 }).then(result => { 53 }).then(result => {
54 res.render('order-content', { 54 res.render('order-content', {
55 layout: false, 55 layout: false,
@@ -23,7 +23,7 @@ let orderDetail = (req, res, next) => { @@ -23,7 +23,7 @@ let orderDetail = (req, res, next) => {
23 }; 23 };
24 24
25 orderDetailModel.orderDetail({ 25 orderDetailModel.orderDetail({
26 - uid: req.user.uid || 8039759, // TODO 待删除 26 + uid: req.user.uid,
27 order_code: req.query.order_code 27 order_code: req.query.order_code
28 }).then(result => { 28 }).then(result => {
29 if (result) { 29 if (result) {