Merge branch 'develop' into release/1.0

@@ -26,7 +26,7 @@
 }
 
 .icon-bag:before {
-    content: "\e601";
+    content: "\e910";
 }
 
 .icon-down:before {

@@ -33,14 +33,12 @@ body {
     }
 
     .order-code {
-        padding: 20px 30px;
+        padding: 22px 30px;
         margin-bottom: 20px;
-        border-top: 1px solid #eee;
-        border-bottom: 1px solid #eee;
 
         p:first-of-type {
             font-size: 34px;
-            font-weight: 700;
+            font-weight: 600;
         }
 
         p:last-of-type {
@@ -53,12 +51,11 @@ body {
         position: relative;
         padding: 20px 30px 27px;
         margin-bottom: 20px;
-        border-top: 1px solid #eee;
         word-wrap: break-word;
 
         p:first-of-type {
             font-size: 32px;
-            font-weight: 700;
+            font-weight: 600;
 
             span {
                 margin-right: 40px;
@@ -84,7 +81,6 @@ body {
 
     .order-goods {
         padding-top: 20px;
-        border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
 
         .goods-info {
@@ -178,7 +174,7 @@ body {
     }
 
     .order-amount {
-        padding: 30px 20px;
+        padding: 26px 30px;
         margin-bottom: 20px;
         border-bottom: 1px solid #eee;
         text-align: right;
@@ -224,6 +220,7 @@ body {
         text-align: right;
 
         a {
+            display: inline-block;
             padding: 0 20px;
             height: 68px;
             line-height: 68px;
@@ -234,6 +231,7 @@ body {
             background: $white;
             font-size: 28px;
             margin-right: 10px;
+            width: 192px;
         }
 
         button {
@@ -260,7 +258,7 @@ body {
             }
 
             &.normal {
-                width: 188px;
+                width: 192px;
                 padding: 0;
                 border: 1px solid $black;
                 color: $black;

@@ -8,7 +8,7 @@
                 </a>
                 <!--暂时隐藏收藏入口，下个版本使用-->
                 <!--<a class="right-button no-intercept" href="javascript:void(0);" @click="favorite()">-->
-                    <!--<span class="icon" :class="{ 'icon-love': !isFavorite, 'icon-love-solid': isFavorite}"></span>-->
+                    <!--<span class="icon" :class="{ 'icon-focus': !isFavorite, 'icon-focused': isFavorite}"></span>-->
                 <!--</a>-->
 
                 <a class="right-button no-intercept" href="javascript:void(0);" @click="share()">

@@ -168,8 +168,8 @@
             </span>
         </button>
         <button class="button control-button" @click="toggleFavorite()">
-            <span v-if="entity.isCollect === 'Y' " class="icon icon-love-solid"></span>
-            <span v-else class="icon icon-love"></span>
+            <span v-if="entity.isCollect === 'Y' " class="icon icon-focused"></span>
+            <span v-else class="icon icon-focus"></span>
         </button>
         <button class="button button-solid add-to-cart"
                 @click="showAddToCart()"
@@ -223,6 +223,10 @@
             line-height: $lh;
             color: #b0b0b0;
         }
+
+        .icon-right {
+            margin-left: 30px;
+        }
     }
 
     .product-detail-desc {