bug

@@ -41,21 +41,25 @@ const delOrder = (req, res, next) => {
 
 
 // 再次购买
 // 再次购买
 const readdData = (req, res, next) => {
 const readdData = (req, res, next) => {
-    let orderCode = req.query.order_code;
+    let orderCode = req.query.orderCode;
     let uid = req.user.uid;
     let uid = req.user.uid;
 
 
     orderDetailModel.readdData(orderCode, uid).then((result) => {
     orderDetailModel.readdData(orderCode, uid).then((result) => {
+        console.log(result)
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);
 };
 };
 
 
 // 取消订单
 // 取消订单
 const cancelOrder = (req, res, next) => {
 const cancelOrder = (req, res, next) => {
-    let orderCode = req.query.order_code;
+    let orderCode = req.query.id;
     let uid = req.user.uid;
     let uid = req.user.uid;
-    let reasonId = 1;
+    let reasonId = req.query.reasonId || 1;
+    let gender = req.query.gender || '1,3';
+    let channel = req.query.channel || 1;
+    let reason = req.query.reason;
 
 
-    orderDetailModel.cancelOrder(orderCode, uid, reasonId).then((result) => {
+    orderDetailModel.cancelOrder(orderCode, uid, reasonId, gender, channel, reason).then((result) => {
         res.json(result);
         res.json(result);
     }).catch(next);
     }).catch(next);
 };
 };

@@ -166,7 +166,8 @@ const favfavBrand = (uid, page, limit) => {
                         brandName: val.brandName,
                         brandName: val.brandName,
                         updata: val.newProductNum,
                         updata: val.newProductNum,
                         discount: val.productDiscountNum,
                         discount: val.productDiscountNum,
-                        brandImg: val.brandIco
+                        brandImg: val.brandIco,
+                        update: val.newProductNum
                     });
                     });
 
 
                     _.forEach(val.newProduct, function(data) {
                     _.forEach(val.newProduct, function(data) {

@@ -317,16 +317,32 @@ const readdData = (orderCode, uid) => {
         method: 'app.Shopping.readd',
         method: 'app.Shopping.readd',
         uid: uid,
         uid: uid,
         order_code: orderCode
         order_code: orderCode
+    }).then((result) => {
+        if(result && result.code === 200) {
+            result.message = '商品已重新加入购物车' ;
+        }else if (result.code === '400') {
+            result.message = '缺失参数' ;
+        } else {
+            result.message = '商品加入购物车失败';
+            result.datat = {};
+        }
+
+        return result;
     });
     });
 };
 };
 
 
 // 取消订单
 // 取消订单
-const cancelOrder = (orderCode, uid, reasonId) => {
+const cancelOrder = (orderCode, uid, reasonId, gender, channel, reason) => {
+
+
     return api.get('', {
     return api.get('', {
         method: 'app.SpaceOrders.close',
         method: 'app.SpaceOrders.close',
         uid: uid,
         uid: uid,
         order_code: orderCode,
         order_code: orderCode,
-        reasonId: reasonId
+        reasonId: reasonId,
+        reasons: reason,
+        gender: gender,
+        yh_channel: channel
     });
     });
 };
 };
 
 

@@ -9,10 +9,10 @@ const mayLikeModel = require('../models/recom');
 */
 */
 
 
 const mayLike = (req, res, next) => {
 const mayLike = (req, res, next) => {
-    let uid = req.user.uid || 8039759;
+    let uid = req.user.uid;
     let page = req.query.page || 1;
     let page = req.query.page || 1;
     let limit = 50;
     let limit = 50;
-    let gender = req.query.gender || '2,3';
+    let gender = req.query.gender;
     let udid = req.sessionID || 'yoho';
     let udid = req.sessionID || 'yoho';
     let recPos = 100009;
     let recPos = 100009;
     let channel = req.query.channel || 1;
     let channel = req.query.channel || 1;

@@ -16,8 +16,8 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',
     domains: {
     domains: {
-        api: 'http://api-test1.yohops.com:9999/',
-        service: 'http://service-test1.yohops.com:9999/',
+        api: 'http://api.yoho.yohoops.org/',
+        service: 'http://service.yoho.yohoops.org/',
         liveApi: 'http://testapi.live.yohops.com:9999/',
         liveApi: 'http://testapi.live.yohops.com:9999/',
         singleApi: 'http://api-test1.yohops.com:9999/'
         singleApi: 'http://api-test1.yohops.com:9999/'
     },
     },