mip

@@ -29,16 +29,11 @@ const shop = {
      */
     entry(req, res, next) {
         const shopId = _.parseInt(stringProcess.paramsFilter(req.params.shop_id || req.query.shop_id));
-        const brandId = _.parseInt(stringProcess.paramsFilter(req.query.brand_id));
         const domain = req.params.domain || req.query.domain;
         const uid = req.user.uid;
 
         req.shopInfo = {};
 
-        if (brandId) {
-            return shop.brand(req, res, next); // 品牌列表，有品牌ID就直接展示为品牌
-        }
-
         return co(function* () {
             if (shopId) {
                 let shopInfoApi = (yield req.ctx(shopModel).getShopInfo(shopId, uid)) || {};
@@ -194,6 +189,7 @@ const shop = {
                     })
                 },
                 title: `${shopInfo.shop_name}_${shopInfo.shop_name}品牌官方旗舰店-YOHO!BUY 有货官网`,
+                pageTitle: shopInfo.shop_name || '',
                 allGoodsUrl: helpers.urlFormat('', {
                     shop_id: shopId,
                     title: '全部商品',

@@ -565,4 +565,5 @@
     border-bottom: 1px solid #e0e0e0;
     float: left;
     margin-top: 20px;
+    font-size: 12px;
 }
\ No newline at end of file

@@ -173,6 +173,7 @@ ol, ul {
 .mip-footer .option {
     background-color: #fff;
     font-size: 0;
+    overflow: hidden;
 }
 
 .mip-footer .option a {
@@ -371,7 +372,18 @@ ol, ul {
     color: #fff;
     float: right;
     font-weight: normal;
-    padding-right: 60px;
+    position: absolute;
+    right: 60px;
+}
+
+.page-header .head-title {
+    max-width: 39%;
+    height: 40px;
+    overflow: hidden;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
 }
 /*header*/
 

@@ -160,4 +160,5 @@
     border-top: 1px solid #e0e0e0;
     float: left;
     width: 100%;
+    font-size: 12px;
 }
\ No newline at end of file

@@ -10,7 +10,6 @@
 
 .reds-shop .branner-top {
     width: 100%;
-    height: 117px;
     position: relative;
     overflow: hidden;
     background-size: 100%;
@@ -26,6 +25,8 @@
 .reds-shop .branner-top .shop-back-img img {
     z-index: -1;
     position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 .reds-shop .logo {
@@ -389,6 +390,7 @@
     border-top: 1px solid #e0e0e0;
     float: left;
     width: 100%;
+    font-size: 12px;
 }
 
 .shop-foot-wrapper {

 <div class="page-header">
     {{#if pageHead}}
+        <span class="head-title">{{pageTitle}}</span>
         <a href="{{pageHead.url}}" class="head-a">{{pageHead.text}}</a>
     {{else}}
         {{pageTitle}}