Authored by zzzzzzz

Merge branch 'release/usercenter' of git.yoho.cn:fe/yohobuywap-node into release/usercenter

... ... @@ -27,7 +27,7 @@ const favorite = (req, res) => {
};
let favProduct = (req, res, next) => {
let uid = req.user.uid || 5987341;
let uid = req.user.uid;
let page = req.query.page || 1;
let limit = 10;
... ... @@ -45,7 +45,7 @@ let favProduct = (req, res, next) => {
};
let favfavBrand = (req, res, next) => {
let uid = req.user.uid || 8039759;
let uid = req.user.uid;
let page = req.query.page || 1;
let limit = 10;
... ...
... ... @@ -11,7 +11,7 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
const _ = require('lodash');
const myCurrency = (req, res, next) => {
let uid = req.user.uid || 8039759;
let uid = req.user.uid;
let contentCode = '05afedf76886d732573f10f7451a1703';
myCurrencyModel.myCurrency(uid, contentCode).then(result => {
... ... @@ -34,7 +34,7 @@ const myCurrency = (req, res, next) => {
};
const currencyDetail = (req, res, next) => {
let uid = req.user.uid || 8039759;
let uid = req.user.uid;
let page = 1;
let limit = 10;
... ... @@ -57,7 +57,7 @@ const currencyDetail = (req, res, next) => {
};
let ajaxCurrencyDetail = (req, res, next) => {
let uid = req.user.uid || 8039759;
let uid = req.user.uid;
let page = req.body.page || 1;
let limit = 10;
... ...
... ... @@ -10,8 +10,8 @@ const headerModel = require('../../../doraemon/models/header'); // 头部model
const orderDetailModel = require('../models/orderDetail');
const orderDetailData = (req, res, next) => {
let uid = req.user.uid || 8039759;
let orderCode = req.query.order_code || 1618346759;
let uid = req.user.uid;
let orderCode = req.query.order_code;
orderDetailModel.orderDetailData(uid, orderCode).then(result => {
... ... @@ -31,8 +31,8 @@ const orderDetailData = (req, res, next) => {
// 删除订单
const delOrder = (req, res, next) => {
let orderCode = req.query.order_code || 1612441404;
let uid = req.user.uid || 8039759;
let orderCode = req.query.order_code;
let uid = req.user.uid;
orderDetailModel.delOrder(orderCode, uid).then((result) => {
res.json(result);
... ... @@ -41,8 +41,8 @@ const delOrder = (req, res, next) => {
// 再次购买
const readdData = (req, res, next) => {
let orderCode = req.query.order_code || 1606343171;
let uid = req.user.uid || 8039759;
let orderCode = req.query.order_code;
let uid = req.user.uid;
orderDetailModel.readdData(orderCode, uid).then((result) => {
res.json(result);
... ... @@ -51,8 +51,8 @@ const readdData = (req, res, next) => {
// 取消订单
const cancelOrder = (req, res, next) => {
let orderCode = req.query.order_code || 1606343171;
let uid = req.user.uid || 8039759;
let orderCode = req.query.order_code;
let uid = req.user.uid;
let reasonId = 1;
orderDetailModel.cancelOrder(orderCode, uid, reasonId).then((result) => {
... ...
... ... @@ -33,8 +33,8 @@ const suggestData = (req, res, next) => {
};
const upAndDown = (req, res, next) => {
let uid = req.user.uid || 8039759;
let udid = req.sessionID || 'yoho';
let uid = req.user.uid;
let udid = req.sessionID;
let reliable = req.body.reliable || 1;
let suggestId = req.body.suggest_id;
... ... @@ -60,7 +60,7 @@ const suggestSub = (req, res) => {
};
const saveSuggest = (req, res, next) => {
let uid = req.user.uid || 8039759;
let uid = req.user.uid;
let content = req.body.content;
let image = req.body.image;
let suggestType = req.body.suggest_type || 2;
... ...