Merge remote-tracking branch 'origin/release/2.0' into release/2.0

@@ -3,7 +3,7 @@
         <div class="blk-header">
             <div class="blk-header-left">
                 <slot name="left">
-                    <i class="icon icon-left go-back-btn" @click="goBack"></i>
+                    <i class="icon icon-back go-back-btn" @click="goBack"></i>
                 </slot>
             </div>
             <div class="blk-header-right">

@@ -17,23 +17,23 @@
         </a>
         <div class="order-type clearfix">
             <a class="type-item auth" href="/me/order?type=2">
-                <span class="icon icon-wait-pay"></span>
-                <br>待付款
+                <span class="icon icon-card"></span>
+                <span class="item-name">待付款</span>
                 <span class="num" v-if="data.wait_pay_num">{{data.wait_pay_num}}</span>
             </a>
             <a class="type-item auth" href='/me/order?type=3'>
-                <span class="icon icon-wait-cargo"></span>
-                <br>待发货
+                <span class="icon icon-bag2"></span>
+                <span class="item-name">待发货</span>
                 <span class="num" v-if="data.wait_cargo_num">{{data.wait_cargo_num}}</span>
             </a>
             <a class="type-item auth" href="/me/order?type=4">
-                <span class="icon icon-send-cargo"></span>
-                <br>待收货
+                <span class="icon icon-logistics"></span>
+                <span class="item-name">待收货</span>
                 <span class="num" v-if="data.send_cargo_num">{{data.send_cargo_num}}</span>
             </a>
             <a class="type-item auth" href="/me/return">
-                <span class="icon icon-refund-exchange"></span>
-                <br>退换货
+                <span class="icon icon-money"></span>
+                <span class="item-name">退换货</span>
                 <span class="num" v-if="data.refund_exchange_num">{{data.refund_exchange_num}}</span>
             </a>
         </div>
@@ -330,6 +330,8 @@
 
                 .icon {
                     font-size: 45px;
+                    margin-bottom: 10px;
+                    display: block;
                 }
 
                 .type-item {

@@ -159,18 +159,20 @@
     </show-box>
 
     <show-box class="brand-detail-desc">
-        <h2>品牌介绍</h2>
-        <i>DETAILS</i>
-
+        <div class="brand-detail-header">
+            <h2>品牌介绍</h2>
+            <i>DETAILS</i>
+        </div>
         <p v-if="brand && brand.brand_intro" v-lazy-html="brand.brand_intro">
         </p>
 
     </show-box>
 
     <show-box class="product-detail-desc" :is-last="true">
-        <h2>商品详情</h2>
-        <i>DETAILS</i>
-
+        <div class="product-detail-header">
+            <h2>商品详情</h2>
+            <i>DETAILS</i>
+        </div>
         <p v-if="intro && intro.productIntroBo" v-lazy-html="intro.productIntroBo.productIntro">
         </p>
 
@@ -183,13 +185,13 @@
     <div class="control-box" v-if="isApp && isReady">
         <button class="button control-button">
             <span @click="yoho.goShopingCart()" style="position: relative;">
-                <i class="icon icon-bold-shopbag"></i>
+                <i class="icon icon-shopbag"></i>
                 <span v-if="isApp && cartCount > 0" class="badge badge-tr">{{cartCount >= 100 ? '99+': cartCount}}</span>
             </span>
         </button>
         <button class="button control-button" @click="toggleFavorite()">
             <span v-if="entity.is_collect === 'Y' " class="icon icon-focused"></span>
-            <span v-else class="icon icon-focus"></span>
+            <span v-else class="icon icon-focus2"></span>
         </button>
         <button class="button button-solid add-to-cart"
                 @click="showAddToCart()"
@@ -278,7 +280,25 @@
         }
     }
 
+    .brand-detail-desc {
+        padding-top: 0 !important;
+
+        .brand-detail-header {
+            width: 100%;
+            height: 80px;
+            line-height: 80px;
+        }
+    }
+
     .product-detail-desc {
+        padding-top: 0 !important;
+
+        .product-detail-header {
+            width: 100%;
+            height: 80px;
+            line-height: 80px;
+        }
+
         /* 覆盖 img width，height 属性 */
         img {
             width: 100% !important;
@@ -318,8 +338,9 @@
 
         i.price {
             color: #b0b0b0;
-            font-size: 32px;
+            font-size: 34px;
             font-style: normal;
+            font-family: "BrownStd-Regular";
 
             &.strike-through {
                 text-decoration: line-through;
@@ -428,6 +449,7 @@
         line-height: 32px;
         font-size: 18px;
         padding: 0;
+        background-color: #000;
     }
 </style>
 <script>