Merge branch 'release/3.0' of http://git.yoho.cn/fe/yohoblk-wap into release/3.0

@@ -8,7 +8,7 @@
                 <div v-for="(item, index) in block.singleImage.data" :key="index">
                     <img :title="item.title"
                         :alt="item.alt"
-                        v-img-src="{src: item.src, width: 750, height: 469}" 
+                        v-img-src="{src: item.src, width: 750, height: 469}"
                         width="375"/>
                 </div>
             </div>
@@ -88,6 +88,7 @@
             line-height: 43px;
             margin: 0 auto;
             font-size: 24px;
+            margin-bottom: 1px;
         }
 
         .title {

@@ -18,7 +18,7 @@
         </div>
         <div class="show-box" v-if="other && other.length">
             <h2 class="editorial-relate-title">相关推荐</h2>
-            <div class="other-box" v-for="item in other" :key="item.id">
+            <div class="other-box" v-for="(item, index) in other" :key="item.id" :class="{first: index == 0}">
                 <div>
                     <div class="image-box">
                         <a :href="'/editorial/' + item.id + '.html'">
@@ -57,7 +57,7 @@
         }
 
         .editorial-box {
-            padding: 30px;
+            padding: 30px 30px 10px;
             background: $bgcolor;
         }
 
@@ -83,6 +83,10 @@
             padding: 0 30px;
             margin-top: 40px;
 
+            &.first {
+                margin-top: 0;
+            }
+
             .image-box {
                 float: left;
                 max-width: 214px;
@@ -96,10 +100,9 @@
             }
 
             h3 {
-                margin-top: 16px;
-                margin-left: 30px;
                 float: left;
                 width: 420px;
+                margin: 0 0 16px 30px;
                 min-height: 90px;
                 max-height: 90px;
                 font-size: 32px;
@@ -123,7 +126,9 @@
         .status-bar {
             color: #ccc;
             font-size: 24px;
-            margin-top: 30px;
+            margin-top: 25px;
+            line-height: 1;
+
 
             span.icon {
                 margin-right: 12px;
@@ -173,8 +178,9 @@
         font-size: 43px;
         font-weight: bold;
         overflow: hidden;
-        margin-top: 36px;
+        margin-top: 10px;
         margin-bottom: 0;
+        line-height: 1;
     }
 
     .editorial-relate-title {
@@ -292,4 +298,4 @@
             }
         }
     };
-</script>
\ No newline at end of file
+</script>

@@ -38,6 +38,7 @@
             .count {
                 display: inline-block;
                 vertical-align: text-bottom;
+                margin-bottom: -8px;
             }
         }
     }

@@ -2,13 +2,13 @@
     <div class="fav-type" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
         <ul class="fav-article-list">
             <v-touch
-                v-for="(item, index) in articleData" 
+                v-for="(item, index) in articleData"
                  tag="li"
-                :key="item.fav_id" 
-                :id="'li-' + item.fav_id" 
-                :pan-options="{ direction: 'horizontal', threshold: 100}" 
+                :key="item.fav_id"
+                :id="'li-' + item.fav_id"
+                :pan-options="{ direction: 'horizontal', threshold: 100}"
                 @panstart="(evt) => {panstart(item.fav_id, evt)}"
-                @panmove="(evt) => {panmove(item.fav_id, evt)}" 
+                @panmove="(evt) => {panmove(item.fav_id, evt)}"
                 @panend="(evt) => {panend(item.fav_id, evt)}">
                 <div :class="'fav-del-left ' + (editmodel ? 'delshow': '')" @click="showDelBtn(item.fav_id)">
                     <span class="fav-del-span"><span class="icon icon-edit-del"></span></span>
@@ -289,6 +289,13 @@
         .fav-content {
             .fav-type {
                 display: block;
+
+                .fav-null-box {
+                    position: fixed;
+                    top: 40%;
+                    left: 50%;
+                    transform: translate(-50%, -50%);
+                }
             }
 
             .fav-article-list {

@@ -2,12 +2,12 @@
     <div class="fav-type" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
         <ul class="fav-product-list">
             <div v-for="(item, index) in productData" :key="item.fav_id">
-                <v-touch 
+                <v-touch
                     tag="li"
-                    :id="'li-' + item.fav_id" 
-                    :pan-options="{ direction: 'horizontal', threshold: 100}" 
+                    :id="'li-' + item.fav_id"
+                    :pan-options="{ direction: 'horizontal', threshold: 100}"
                     @panstart="(evt) => {panstart(item.fav_id, evt)}"
-                    @panmove="(evt) => {panmove(item.fav_id, evt)}" 
+                    @panmove="(evt) => {panmove(item.fav_id, evt)}"
                     @panend="(evt) => {panend(item.fav_id, evt)}">
                     <div :class="'fav-del-left ' + (editmodel ? 'delshow': '')" @click="showDelBtn(item.fav_id)">
                         <span class="fav-del-span"><span class="icon icon-edit-del"></span></span>
@@ -291,6 +291,13 @@
         .fav-content {
             .fav-type {
                 display: block;
+
+                .fav-null-box {
+                    position: fixed;
+                    top: 40%;
+                    left: 50%;
+                    transform: translate(-50%, -50%);
+                }
             }
 
             .fav-product-list {