Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

@@ -22,7 +22,7 @@ app端店铺模板css
 /*------------------------banner--------------------------*/
 .contentpanel-app .model-banner{
     width: 100%;
-    height: 100px;
+    height: 150px;
     position: relative;
     overflow: hidden;
 }
@@ -44,14 +44,15 @@ app端店铺模板css
 .contentpanel-app .model-nav ul li{
     float: left;
     width: 25%;
-    line-height: 20px;
-    padding: 0 10px;
-    font-size: 14px;
+    height: 30px;
+    line-height: 28px;
+    padding: 1px 10px;
+    font-size: 28px;
     border-right: 2px solid #ccc;
-    margin: 10px 0;
+    margin: 30px 0;
     text-align: center;
 }
-.contentpanel-app .model-nav ul li a{color: #ccc; font-weight: bold}
+.contentpanel-app .model-nav ul li a{color: #ccc}
 .contentpanel-app .model-nav ul li.active a{color: #585858}
 
 /*------------------------main--------------------------*/
@@ -59,66 +60,65 @@ app端店铺模板css
     clear: both;
     width: 100%;
     background: #f5f7f6;
-    padding-bottom: 10px;
 }
 
 /*------------------------品牌一览（多品牌商铺专有）--------------------------*/
 .contentpanel-app .brand-list{
     text-align: center;
-    margin-bottom: 5px;
 }
 .contentpanel-app .brand-list span{
     display: block;
-    padding: 10px 0;
-    font-size: 16px;
-    font-weight: bold;
+    line-height: 60px;
+    height: 60px;
+    font-size: 28px;
 }
 .contentpanel-app .brand-list ul{
     border: solid #ccc;
     border-width:1px 0 0px 0 ;
+    padding: 0 4px;
 }
 .contentpanel-app .brand-list ul li{
     float: left;
     width: 25%;
-    padding: 5px;
+    padding: 20px 4px;
 }
 .contentpanel-app .brand-list ul li a{
     display: block;
     width: 100%;
-    height: 60px;
+    height: 100px;
 }
 .contentpanel-app .brand-list ul li img{
     width: 100%;
-    height: 60px;
+    height: 100px;
 }
 
 /*------------------------大图--------------------------*/
 .contentpanel-app .largePic img{
     width: 100%;
-    height: 100px;
+    height: 180px;
 }
 
 /*------------------------小图--------------------------*/
 .contentpanel-app .model-smallPic{
-    width: 90%;
-    height: 80px;
-    margin: 10px auto;
+    width: 580px;
+    height: 150px;
+    margin: 20px auto;
     background: #fff;
 }
 .contentpanel-app .model-smallPic ul li{
     float: left;
     width: 50%;
-    height: 80px;
+    height: 150px;
 }
 .contentpanel-app .model-smallPic ul li:first-of-type{
-    padding-right: 5px;
+    padding-right: 15px;
 }
 .contentpanel-app .model-smallPic ul li:last-of-type{
-    padding-left: 5px;
+    padding-left: 15px;
 }
 .contentpanel-app .model-smallPic img{
-    width: 100%;
-    height: 100%;
+    width: 275px;
+    height: 150px;
     border:0px solid #000;
 }
 
@@ -129,19 +129,19 @@ app端店铺模板css
 .contentpanel-app .sortList span{
     display: block;
     text-align: center;
-    padding: 10px;
-    width: 90%;
+    height: 60px;
+    line-height: 60px;
+    width: 580px;
     background: #fff;
     margin: 0 auto;
-    font-size: 16px;
+    font-size: 28px;
     color: #999;
-    font-weight: bold;
 }
 .contentpanel-app .sortList .sortListDetail{
     border-top: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
     position: relative;
-    padding: 10px 10px 0;
+    padding: 20px 4px 10px;
 }
 .contentpanel-app .sortList .sortListDetail ul li{
     float: left;
@@ -149,18 +149,19 @@ app端店铺模板css
 }
 .contentpanel-app .sortList .sortListDetail ul li img{
     display: block;
-    width: 100%;
-    height: 100px;
-    padding: 0 5px;
+    width: 150px;
+    height: 120px;
+    margin: 0 4px;
 }
 .contentpanel-app .sortList .sortListDetail ul li a{
     display: block;
     width: 100%;
     text-align: center;
-    padding: 5px 0;
+    padding: 10px 0;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    font-size: 16px;
 }
 
 /*------------------------人气单品--------------------------*/
@@ -171,16 +172,15 @@ app端店铺模板css
 
 .contentpanel-app .showTitle{
     width: 100%;
-    height: 50px;
-    line-height: 50px;
+    height: 98px;
+    line-height: 98px;
     text-align: center;
     position: relative;
     box-sizing: content-box;
     border-bottom: 1px solid #ccc;
 }
 .contentpanel-app .showTitle span{
-    font-size: 16px;
-    font-weight: bold;
+    font-size: 28px;
     color: #585858;
 }
 .contentpanel-app .showTitle a{
@@ -192,35 +192,36 @@ app端店铺模板css
 
 /*------------------------人气单品详情--------------------------*/
 .contentpanel-app .model-showDetail{
-    padding: 10px 5px;
+    padding: 50px 25px;
 }
 .contentpanel-app .model-showDetail ul li{
     float: left;
     width: 50%;
-    padding: 0 5px;
     position: relative;
-    margin-bottom: 5px;
+    margin-bottom:10px;
+    padding: 0 5px;
 }
 .contentpanel-app .model-showDetail ul li img{
     width: 100%;
-    height: 150px;
+    height: 300px;
     display: block;
 }
 .contentpanel-app .shadow{
     width: 100%;
     background: #666;
     opacity: 0.5;
-    padding: 0 5px;
+    padding: 5px 10px;
 }
 .contentpanel-app .model-showDetail ul li a{
     display: block;
-    font-size: 14px;
+    font-size: 22px;
     color: #fff;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
 .contentpanel-app .model-showDetail ul li b{
+    font-size: 22px;
     display: block;
     color: #fff;
 }