'shop-id-no-domain'

@@ -56,7 +56,7 @@ const _baseShop = (req, res, data) => {
 };
 };
 
 
 /**
 /**
- * 店铺首页 || 若店铺使用基础模板跳转品牌页
+ * 店铺首页 || 若店铺使用基础模板就使用基础模板
  * @return int
  * @return int
  */
  */
 const _shop = (req, res, shopId) => {
 const _shop = (req, res, shopId) => {
@@ -125,12 +125,18 @@ const category = (req, res) => {
 // 品牌|店铺落地页
 // 品牌|店铺落地页
 const brand = (req, res, next) => {
 const brand = (req, res, next) => {
     let params = Object.assign({}, req.query);
     let params = Object.assign({}, req.query);
-    let domain = req.query.domain || 'colormad';
+    let domain = req.query.domain;
     let uid = req.user.uid;
     let uid = req.user.uid;
     let brandId = 0;
     let brandId = 0;
     let brandLogo = {};
     let brandLogo = {};
     let title = '';
     let title = '';
 
 
+    /* tar add 160909 如果有 shop_id 直接跳转 */
+    if (req.query.shop_id) {
+        _shop(req, res, req.query.shop_id);
+        return;
+    }
+
     if (!domain) {
     if (!domain) {
         res.redirect('/?go=1');
         res.redirect('/?go=1');
     }
     }

@@ -57,6 +57,35 @@
         </div>
         </div>
     {{/ brandHome}}
     {{/ brandHome}}
 
 
+    <!-- 基础店铺页面 -->
+    {{# baseShopHome}}
+        <div id="brand-header" class="brand-header" data-id={{id}} data-isbaseshop="{{isBaseShop}}">
+            <img class="lazy" data-original={{banner}}>
+            <a class="btn-intro" href="javascript:void(0);">
+                店铺介绍
+            </a>
+            <a class="btn-col{{#if collected}} coled{{/if}}" href="javascript:void(0);">
+                <span class="iconfont">&#xe622;</span>
+                <span class="txt"></span>
+            </a>
+        </div>
+        <div id="intro-box" class="brand-intro-box hide">
+            <div id="brand-intro" class="brand-intro">
+                <h2>店铺介绍</h2>
+                <div class="con">
+                    {{{intro}}}
+                </div>
+                <p class="fo">
+                    <span class="iconfont">&#xe629;</span>
+                    100%品牌授权正品
+                </p>
+                <span class="iconfont close-intro">&#xe623;</span>
+            </div>
+        </div>
+        <input type="hidden" name="app_version" value="{{appVersion}}">
+    {{/ baseShopHome}}
+    <!-- /基础店铺页面 -->
+
     <ul id="list-nav" class="list-nav clearfix">
     <ul id="list-nav" class="list-nav clearfix">
         {{#if isSearch}}
         {{#if isSearch}}
         <li class="new active buriedpoint" data-bp-id="">
         <li class="new active buriedpoint" data-bp-id="">