shop-entry

郭成尧
Commit cdb4f1e340efffdf48fc4f3f7cca8a131edf61be 1 parent e93a1a16
Showing 12 changed files with 15 additions and 15 deletions
apps/activity/models/feature.js
apps/activity/models/shopCollect.js
apps/channel/models/brand.js
apps/home/models/favorite.js
apps/product/models/detail.js
apps/product/models/list.js
apps/product/models/search.js
config/cache.js
doraemon/middleware/sub-domain.js
doraemon/views/partial/product/brands.hbs
utils/detail-process.js
utils/product-process.js
--- a/apps/activity/models/feature.js
View file @cdb4f1e
+++ b/apps/activity/models/feature.js
View file @cdb4f1e
@@ -22,9 +22,9 @@ const _getProductBySkns = function(productObj) {
                 };
                 if (val.shop_id) {
-                    obj.brandurl = `//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.shop","params":{"shop_id":${val.shop_id},"shop_template_type":${val.shop_template_type}}}`; // eslint-disable-line
+                    obj.brandurl = `//m.yohobuy.com/product/shop?domain=${val.brand_domain}&openby:yohobuy={"action":"go.shop","params":{"shop_id":${val.shop_id},"shop_template_type":${val.shop_template_type}}}`; // eslint-disable-line
                 } else {
-                    obj.brandurl = `//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
+                    obj.brandurl = `//m.yohobuy.com/product/shop?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
                 }
                 productObj.defaultPros.push(obj);
--- a/apps/activity/models/shopCollect.js
View file @cdb4f1e
+++ b/apps/activity/models/shopCollect.js
View file @cdb4f1e
@@ -31,7 +31,7 @@ const shopList = (uid, tabName, channelId) => {
     }).then((result) => {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {
-                let href = '//m.yohobuy.com/product/index/brand?shop_id=' +
+                let href = '//m.yohobuy.com/product/shop?shop_id=' +
                     data.shopsId + '&openby:yohobuy={"action":"go.shop","params":{"shop_id":"' +
                 data.shopsId + '","shop_template_type":"' +
                     data.shopTemplateType + '","shop_name":"' + data.shopName + '"}}';
--- a/apps/channel/models/brand.js
View file @cdb4f1e
+++ b/apps/channel/models/brand.js
View file @cdb4f1e
@@ -149,7 +149,7 @@ const _urlJump = (key, row) => {
     return {
         1: helpers.urlFormat('', {from: 'search', query: row.brand_name}, 'search'),
-        2: helpers.urlFormat('/product/index/brand', {domain: row.brand_domain}),
+        2: helpers.urlFormat('/product/shop', {domain: row.brand_domain}),
         3: helpers.urlFormat('/product/global/list/', {brand: row.global_brand_id})
     }[key];
 };
--- a/apps/home/models/favorite.js
View file @cdb4f1e
+++ b/apps/home/models/favorite.js
View file @cdb4f1e
@@ -153,7 +153,7 @@ const favfavBrand = (uid, page, limit) => {
                     // }
                     if (val.brandOrShopType === 'brandOrShopType') {
                         obj = _.assign(obj, {
-                            link: helpers.urlFormat('/product/index/brand', {
+                            link: helpers.urlFormat('/product/shop', {
                                 shop_id: val.shopId
                             })
                         });
--- a/apps/product/models/detail.js
View file @cdb4f1e
+++ b/apps/product/models/detail.js
View file @cdb4f1e
@@ -56,7 +56,7 @@ const _processShopsInfo = (data) => {
         };
         if (value.shop_id) {
-            shopInfo.url = helpers.urlFormat('/product/index/brand', {
+            shopInfo.url = helpers.urlFormat('/product/shop', {
                 shop_id: value.shop_id
             });
         } else {
@@ -540,7 +540,7 @@ const _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
         let storeUrl = '';
         if (origin.shop_id) {
-            storeUrl = helpers.urlFormat('/product/index/brand', {
+            storeUrl = helpers.urlFormat('/product/shop', {
                 shop_id: origin.shop_id
             });
         }
--- a/apps/product/models/list.js
View file @cdb4f1e
+++ b/apps/product/models/list.js
View file @cdb4f1e
@@ -31,7 +31,7 @@ const _processBrandShops = (list) => {
     _.forEach(list, item => {
         if (item.shop_type === 'yoho_shop') {
             formatDat.push({
-                url: helpers.urlFormat('/product/index/brand/', {
+                url: helpers.urlFormat('/product/shop', {
                     shop_id: item.shop_id
                 }),
                 thumb: helpers.image(item.shop_logo, 126, 80),
--- a/apps/product/models/search.js
View file @cdb4f1e
+++ b/apps/product/models/search.js
View file @cdb4f1e
@@ -207,7 +207,7 @@ const _processBrandShops = (list) => {
     _.forEach(list, item => {
         if (item.shop_type === 'yoho_shop') {
             formatDat.push({
-                url: helpers.urlFormat('/product/index/brand/', {
+                url: helpers.urlFormat('/product/shop', {
                     shop_id: item.shop_id
                 }),
                 thumb: helpers.image(item.shop_logo, 126, 80),
@@ -269,7 +269,7 @@ const getSearchData = (params) => {
                 for (let i = 0; i < result.data.rec_shop_list.length; i++) {
                     if (parseInt(result.data.rec_shop_list[i].show_type, 10) === 1) {
                         result.data.rec_shop_list[i].is_shop = true;
-                        result.data.rec_shop_list[i].shopUrl = '//m.yohobuy.com/product/index/brand?domain=' +
+                        result.data.rec_shop_list[i].shopUrl = '//m.yohobuy.com/product/shop?domain=' +
                             result.data.rec_shop_list[i].shop_domain;
                         newList.list.splice(parseInt(result.data.rec_shop_list[i].insert_index, 10) - 1, 0,
                             result.data.rec_shop_list[i]);
--- a/config/cache.js
View file @cdb4f1e
+++ b/config/cache.js
View file @cdb4f1e
@@ -61,7 +61,7 @@ const cachePage = {
     /* 筛选默认须要添加uid参数
     '/product/list/index': 1 * MINUTE,
     '/product/index/index': 1 * MINUTE,
-    '/product/index/brand': 1 * MINUTE,
+    '/product/shop': 1 * MINUTE,
     '/product/search/search': 1 * MINUTE,
     */
--- a/doraemon/middleware/sub-domain.js
View file @cdb4f1e
+++ b/doraemon/middleware/sub-domain.js
View file @cdb4f1e
@@ -80,7 +80,7 @@ module.exports = () => {
                         req.query = Object.assign(req.query, {
                             domain: req.subdomains[0]
                         });
-                        req.url = `/product/index/brand?${querystring.stringify(req.query)}`;
+                        req.url = `/product/shop?${querystring.stringify(req.query)}`;
                     }
                     break;
             }
--- a/doraemon/views/partial/product/brands.hbs
View file @cdb4f1e
+++ b/doraemon/views/partial/product/brands.hbs
View file @cdb4f1e
@@ -9,6 +9,6 @@
         <h5>{{shop_name}}</h5>
     </div>
     <div class="count">上新{{new_product_num}}款<i class="iconfont">&#xe604;</i></div>
-    <a class="link" href="http://m.yohobuy.com/product/index/brand?domain={{shop_domain}}"></a>
+    <a class="link" href="http://m.yohobuy.com/product/shop?domain={{shop_domain}}"></a>
 </div>
 {{/each}}
--- a/utils/detail-process.js
View file @cdb4f1e
+++ b/utils/detail-process.js
View file @cdb4f1e
@@ -149,7 +149,7 @@ class DetailProcess {
             };
             if (value.shop_id) {
-                shopInfo.url = helpers.urlFormat('/product/index/brand', {
+                shopInfo.url = helpers.urlFormat('/product/shop', {
                     shop_id: value.shop_id
                 });
             } else {
--- a/utils/product-process.js
View file @cdb4f1e
+++ b/utils/product-process.js
View file @cdb4f1e
@@ -130,7 +130,7 @@ exports.processProductList = (list, options) => {
                 if (extraAttr === '_isHotShop' && parseInt(product.data.show_type, 10) === 1) {
                     product.reShop = true;
-                    product.data.shopUrl = '//m.yohobuy.com/product/index/brand?domain=' + product.data.shop_domain;
+                    product.data.shopUrl = '//m.yohobuy.com/product/shop?domain=' + product.data.shop_domain;
                 }
                 pruductList.push(product);