...
|
...
|
@@ -75,7 +75,7 @@ const baseShopFav = (req, res) => { |
|
|
res.setHeader('Access-Control-Allow-Origin', allowOrigin);
|
|
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
|
|
|
|
let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
|
|
|
let uid = req.user.uid || req.query.uid || _getUidFromUserAgent(req);
|
|
|
let shopId = req.query.shopId;
|
|
|
|
|
|
listModel.getBrandFavStatus({
|
...
|
...
|
@@ -98,7 +98,7 @@ const baseShopFav = (req, res) => { |
|
|
const _shop = (req, res, shopId) => {
|
|
|
let isApp = req.query.app_version || req.query.appVersion || false;
|
|
|
let pageHeader = {};
|
|
|
let uid = req.user.uid;
|
|
|
let uid = req.user.uid || req.query.uid;
|
|
|
|
|
|
// pagecache前端判断
|
|
|
if (!isApp) {
|
...
|
...
|
@@ -114,13 +114,6 @@ const _shop = (req, res, shopId) => { |
|
|
navTitle: false
|
|
|
}))
|
|
|
};
|
|
|
} else {
|
|
|
uid = req.query.uid;
|
|
|
req.session.appUid = uid;
|
|
|
res.cookie('appUid', uid, {
|
|
|
domain: 'yohobuy.com',
|
|
|
expires: new Date(Date.now() + 2592000000) // 有效期一年
|
|
|
});
|
|
|
}
|
|
|
|
|
|
listModel.getShopData(req, shopId, uid, isApp).then(result => {
|
...
|
...
|
@@ -169,13 +162,6 @@ const shopAppCookie = (req, res) => { |
|
|
res.setHeader('Access-Control-Allow-Origin', allowOrigin);
|
|
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
|
|
|
|
let uid = req.query.uid;
|
|
|
|
|
|
req.session.appUid = uid;
|
|
|
res.cookie('appUid', uid, {
|
|
|
domain: 'yohobuy.com',
|
|
|
expires: new Date(Date.now() + 2592000000) // 有效期一年
|
|
|
});
|
|
|
res.json({
|
|
|
code: 200,
|
|
|
msg: 'app cookie set',
|
...
|
...
|
@@ -425,7 +411,7 @@ const favoriteBrand = (req, res, next) => { |
|
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
|
|
|
|
let id = req.query.id;
|
|
|
let uid = req.user.uid;
|
|
|
let uid = req.user.uid || req.query.uid;
|
|
|
let opt = req.query.opt || 'ok';
|
|
|
let type = req.query.type || 'product';
|
|
|
let appVersion = req.query.appVersion || false;
|
...
|
...
|
@@ -435,17 +421,6 @@ const favoriteBrand = (req, res, next) => { |
|
|
|
|
|
|
|
|
if (appVersion && appVersion !== 'false') {
|
|
|
if (req.query.uid) {
|
|
|
try {
|
|
|
uid = crypto.decrypt('', req.query.uid);
|
|
|
} catch (err) {
|
|
|
uid = req.query.uid;
|
|
|
}
|
|
|
} else {
|
|
|
uid = req.cookies.appUid;
|
|
|
}
|
|
|
uid = parseInt(uid, 10);
|
|
|
|
|
|
if (!uid || uid === 'undefined') {
|
|
|
uid = _getUidFromUserAgent(req);
|
|
|
}
|
...
|
...
|
@@ -568,7 +543,7 @@ const getShopCouponsList = (req, res, next) => { |
|
|
res.setHeader('Access-Control-Allow-Origin', allowOrigin);
|
|
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
|
|
|
|
let uid = req.query.uid || req.user.uid;
|
|
|
let uid = req.user.uid || req.query.uid;
|
|
|
let shopId = parseInt(req.query.shopId, 10);
|
|
|
let param = {};
|
|
|
|
...
|
...
|
@@ -600,7 +575,7 @@ const getBrandCouponsList = (req, res, next) => { |
|
|
res.setHeader('Access-Control-Allow-Origin', allowOrigin);
|
|
|
res.setHeader('Access-Control-Allow-Credentials', 'true');
|
|
|
|
|
|
let uid = req.query.uid || req.user.uid;
|
|
|
let uid = req.user.uid || req.query.uid;
|
|
|
let brandId = parseInt(req.query.brandId, 10);
|
|
|
let param = {};
|
|
|
|
...
|
...
|
|