修改店铺介绍不显示问题

@@ -60,15 +60,20 @@ const shop = {
         q.page = q.page || 1;
         q.page = q.page || 1;
 
 
         ShopData.getShopHeadData(domain, uid).then(result => {
         ShopData.getShopHeadData(domain, uid).then(result => {
+
             data.banner = result;
             data.banner = result;
-            q.brand = result.brandId;
-            q.shop_id = result.shopId;
-            nav.push({
-                name: result.name
-            });
+            if (result.brandId) {
+                q.brand = result.brandId;
+                q.shop_id = result.shopId;
+                nav.push({
+                    name: result.name
+                });
+            } else {
+                res.status(404);
+                return Promise.reject('brand not found');
+            }
         }).then(() => {
         }).then(() => {
             return Search.queryProductOfBrand(q).then(result => {
             return Search.queryProductOfBrand(q).then(result => {
-
                 if (result && result.code === 200 && result.data) {
                 if (result && result.code === 200 && result.data) {
                     let ret = camelCase(result.data);
                     let ret = camelCase(result.data);
 
 
@@ -94,7 +99,7 @@ const shop = {
                         order: q.order
                         order: q.order
                     }));
                     }));
                 } else {
                 } else {
-                    return Promise.reject('query product error');
+                    return Promise.reject('query shop index error');
                 }
                 }
             });
             });
         }).catch(next);
         }).catch(next);

-{{# brandBanner}}
+{{# banner}}
     <div class="brand-info-wrapper">
     <div class="brand-info-wrapper">
         <div class="brand-info">
         <div class="brand-info">
             <div class="nano-content">
             <div class="nano-content">
@@ -12,4 +12,4 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-{{/brandBanner}}
+{{/banner}}

@@ -129,6 +129,12 @@
                 }
                 }
             }
             }
         }
         }
+
+        .desc {
+            .name {
+                color: #FFF;
+            }
+        }
     }
     }
 
 
     .floor-header {
     .floor-header {
@@ -210,6 +216,9 @@
         }
         }
 
 
         .brand-info-content {
         .brand-info-content {
+            text-align: left;
+            font-size: 12px;
+            line-height: 20px;
             p {
             p {
                 font-size: 12px;
                 font-size: 12px;
                 line-height: 20px;
                 line-height: 20px;