Merge remote-tracking branch 'origin/dev' into dev

components/store/home/CommodityList.vue

@@ -626,6 +626,9 @@
   #goods-list-fragment .brand-code .brand a {
     color: #3c7df5;
   }
+  #goods-list-fragment .brand-code .brand span{
+    color: #3c7df5;
+  }
   #goods-list-fragment .goodslist thead tr{
     background-color: #3b7cf4;
     height: 34px;
@@ -653,7 +656,7 @@
     padding-left: 20px;
   }
   #goodslist-content .goods span{
-    color: #f01010;
+    /*color: #f01010;*/
   }
   #goodslist-content .amount {
     width: 60%;
@@ -662,13 +665,16 @@
     text-align:left;
   }
   #goodslist-content .amount div:last-child{
-    color: #f01010;
+    /*color: #f01010;*/
   }
   #goodslist-content .price {
     width: 40%;
     float:right;
     text-align:left;
   }
+  #goodslist-content .price div:last-child{
+    color: #f01010;
+  }
   #goods-list-fragment .category-content a.selected-node,
   #goods-list-fragment .category-content ul.list-body li a.selected-node {
     color: #5078cb;

components/store/home/EnterpriseInfo.vue

@@ -35,12 +35,14 @@
               </div>-->
             </div>
             <div class="introduce">
-              <div><h4>企业简介</h4><span @click="dialogVisible = true">查看更多 <img src="/images/store/home/angle-right.png"></span></div>
-              <p v-if="storeInfo.enterprise.description">{{storeInfo.enterprise.description}}</p>
+              <div><h4>企业简介</h4></div>
+              <p v-if="storeInfo.enterprise.description">{{storeInfo.enterprise.description}}
+                <span @click="dialogVisible = true">查看更多 <img src="/images/store/home/angle-right.png"></span>
+              </p>
               <p v-else class="empty-introduce">暂无简介</p>
             </div>
             <div class="introduce qualification">
-              <div><h4 class="prof">资质证明</h4><span @click="dialogCertificate = true">查看更多 <img src="/images/store/home/angle-right.png"></span></div>
+              <div><h4 class="prof">资质证明</h4><span @click="dialogCertificate = true">查看 <img src="/images/store/home/angle-right.png"></span></div>
               <!--<qualification-certificate></qualification-certificate>-->
             </div>
             <div class="product-show">
@@ -353,6 +355,11 @@
               color: #333;
               background: #fff;
               border-radius: 5px;
+              p{
+                span {
+                  color: #3c7df5;
+                }
+              }
               div{
                 overflow: hidden;
                 height: 35px;

components/store/home/StoreBanner.vue

@@ -338,7 +338,7 @@ export default {
   }
 	#title-fragment .shop-logo {
 		width: 220px;
-		height: 220px;
+		height: 280px;
 		border: 1px solid #e8e8e8;
 		float: left;
 		text-align: center;
@@ -461,7 +461,7 @@ export default {
 		float: left;
 		position: relative;
 		width: 970px;
-		height: 220px;
+		height: 280px;
 		border: 1px solid #e8e8e8;
 		border-left: none;
 		overflow: hidden;
@@ -469,7 +469,7 @@ export default {
 
 	#title-fragment .shop-banner img {
 		width: 970px;
-		height: 220px;
+		height: 280px;
 	}
 
 	#title-fragment .shop-banner #shop-title {