Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -60,6 +60,7 @@ const _baseShop = (req, res, shopInfo, shopId) => {
 };
 };
 
 
 /**
 /**
+ * TODO TAR 店铺和品牌收藏状态调用新的接口
  * 基础模板收藏
  * 基础模板收藏
  */
  */
 const baseShopFav = (req, res) => {
 const baseShopFav = (req, res) => {
@@ -69,14 +70,17 @@ const baseShopFav = (req, res) => {
     res.setHeader('Access-Control-Allow-Origin', allowOrigin);
     res.setHeader('Access-Control-Allow-Origin', allowOrigin);
     res.setHeader('Access-Control-Allow-Credentials', 'true');
     res.setHeader('Access-Control-Allow-Credentials', 'true');
 
 
-    let isApp = req.query.app_version || req.query.appVersion || false;
     let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let shopId = req.query.shopId;
     let shopId = req.query.shopId;
 
 
-    listModel.getShopData(req, shopId, uid, isApp).then(result => {
+    listModel.getBrandFavStatus({
+        uid: uid,
+        id: shopId,
+        type: 'shop'
+    }).then(result => {
         res.json({
         res.json({
             code: 200,
             code: 200,
-            collect: result.goBrand && result.goBrand.is_favorite === 'Y' ? true : false,
+            collect: result && result.data,
         });
         });
     });
     });
 };
 };
@@ -174,6 +178,7 @@ const shopAppCookie = (req, res) => {
 };
 };
 
 
 /**
 /**
+ * TODO TAR 店铺和品牌收藏状态调用新的接口
  * 前端请求判断shop是否收藏
  * 前端请求判断shop是否收藏
  */
  */
 const shopFav = (req, res) => {
 const shopFav = (req, res) => {
@@ -183,14 +188,17 @@ const shopFav = (req, res) => {
     res.setHeader('Access-Control-Allow-Origin', allowOrigin);
     res.setHeader('Access-Control-Allow-Origin', allowOrigin);
     res.setHeader('Access-Control-Allow-Credentials', 'true');
     res.setHeader('Access-Control-Allow-Credentials', 'true');
 
 
-    let isApp = req.query.app_version || req.query.appVersion || false;
     let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let shopId = req.query.shopId;
     let shopId = req.query.shopId;
 
 
-    listModel.getShopFav(req, shopId, uid, isApp).then(result => {
+    listModel.getBrandFavStatus({
+        uid: uid,
+        id: shopId,
+        type: 'shop',
+    }).then(result => {
         res.json({
         res.json({
             code: 200,
             code: 200,
-            collect: _.get(result, 'is_favorite', '') === 'Y'
+            collect: result && result.data
         });
         });
     });
     });
 };
 };
@@ -304,6 +312,11 @@ const brand = (req, res, next) => {
     }).catch(next);
     }).catch(next);
 };
 };
 
 
+/**
+ * TODO TAR 店铺和品牌收藏状态调用新的接口
+ * @param req
+ * @param res
+ */
 const brandFav = (req, res) => {
 const brandFav = (req, res) => {
     let domain = req.query.domain;
     let domain = req.query.domain;
     let uid = req.user.uid;
     let uid = req.user.uid;
@@ -311,7 +324,11 @@ const brandFav = (req, res) => {
 
 
     listModel.getBrandLogoByDomain(domain).then((result) => {
     listModel.getBrandLogoByDomain(domain).then((result) => {
         brandId = result.id;
         brandId = result.id;
-        listModel.getBrandIntro(brandId, uid).then(result2 => {
+        listModel.getBrandFavStatus({
+            uid: uid,
+            id: brandId,
+            type: 'brand',
+        }).then(result2 => {
             res.json(result2);
             res.json(result2);
         });
         });
     });
     });

@@ -128,9 +128,11 @@ const index = (req, res, next) => {
     return seckillModel.queryActivity().then((resultActivity) => {
     return seckillModel.queryActivity().then((resultActivity) => {
         // console.log(resultActivity)
         // console.log(resultActivity)
         let focusIndex = false;
         let focusIndex = false;
-        let nowTime = Date.now();
-
-        result.currentTime = nowTime;
+        // let nowTime = Date.now();
+        if (!resultActivity.data) {
+            return next(); 
+        }
+        result.currentTime = resultActivity.data.currentTime * 1000;
         if (resultActivity.code !== 200) {
         if (resultActivity.code !== 200) {
             return next();
             return next();
         }
         }
@@ -173,11 +175,11 @@ const index = (req, res, next) => {
             minute = date.getMinutes();
             minute = date.getMinutes();
             activity.time = `${_timeFormat(hour)}:${_timeFormat(minute)}`;
             activity.time = `${_timeFormat(hour)}:${_timeFormat(minute)}`;
 
 
-            if (nowTime > activity.startTime) { // 当前时间大于这个时间段，已经开始和即将开始两种情况
+            if (result.currentTime > activity.startTime) { // 当前时间大于这个时间段，已经开始和即将开始两种情况
                 if (i < result.activitys.length - 1) {
                 if (i < result.activitys.length - 1) {
                     let nextTime = result.activitys[i + 1].startTime * 1000;
                     let nextTime = result.activitys[i + 1].startTime * 1000;
 
 
-                    if (nowTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
+                    if (result.currentTime < nextTime) { // 下一个时间段与当前时间来区别是否正在抢购
                         activity.now = true;
                         activity.now = true;
                         focusIndex || (activity.focus = focusIndex = true);
                         focusIndex || (activity.focus = focusIndex = true);
                     } else {
                     } else {
@@ -221,7 +223,6 @@ const index = (req, res, next) => {
         return fetchProductList(activityInfo, uid).then((resultProducts) => {
         return fetchProductList(activityInfo, uid).then((resultProducts) => {
             result.products = resultProducts;
             result.products = resultProducts;
 
 
-            // console.log(result);
             res.json(result);
             res.json(result);
         });
         });
     });
     });

@@ -175,6 +175,22 @@ const _shopCouponsList = (shopId, uid) => {
 };
 };
 
 
 /**
 /**
+ * TODO TAR 店铺和品牌收藏状态调用新的接口
+ * 调用接口获取品牌或者店铺的收藏状态
+ * @private
+ */
+const getBrandFavStatus = (params) => {
+    return api.get('', {
+        method: 'app.favorite.isFavorite',
+        uid: params.uid || 0,
+        id: params.id,
+        type: params.type
+    }).then(result => {
+        return result;
+    });
+};
+
+/**
  * 用戶領券
  * 用戶領券
  * @param uid
  * @param uid
  * @param couponId
  * @param couponId
@@ -804,5 +820,6 @@ module.exports = {
     getShopCategory,
     getShopCategory,
     receiveCoupon,
     receiveCoupon,
     getShopFav,
     getShopFav,
-    searchProductBySkn
+    searchProductBySkn,
+    getBrandFavStatus
 };
 };

@@ -81,7 +81,7 @@ ellipsis.init();
             },
             },
             dataType: 'json',
             dataType: 'json',
             success: function(data) {
             success: function(data) {
-                if (data.collected) {
+                if (data.data) {
                     $('.brand-header .btn-col').addClass('coled');
                     $('.brand-header .btn-col').addClass('coled');
                 }
                 }
             },
             },