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

# Conflicts:
#	package.json

@@ -171,10 +171,11 @@ export default {
       });
     },
     updateHeight() {
-      this.$nextTick(() => {
-        this.introHeight = get(this.$refs, 'introPool.scrollHeight', 0) + 22;
-        this.introCollapseHeight = get(this.$refs, 'intro.offsetHeight', 0);
-      });
+      // this.$nextTick(() => {
+      this.introHeight = get(this.$refs, 'introPool.scrollHeight', 0) + 22;
+      this.introCollapseHeight = get(this.$refs, 'intro.offsetHeight', 0);
+
+      // });
     },
     onExpanding() {
       if (!this.isIntroEllipsis || (this.isIntroExpand && !this.canRetract)) {
@@ -236,7 +237,7 @@ export default {
   .intro-pool {
     position: absolute;
     width: 100%;
-    top: -1000px;
+    top: -2000px;
     visibility: hidden;
   }
 

@@ -113,7 +113,7 @@ export default {
 <style lang="scss">
   .wf-item {
     width: 100%;
-    padding: 5px;
+    padding: 10px 5px 0 5px;
     font-size: 24px;
     position: relative;
 

@@ -29,21 +29,21 @@
                 <ul class="author-fans">
                   <li v-for="item in fansList" :key="item.key">
                     <div class="click-wrap" @click="toPage(item.type)"></div>
-                    <span class="num">{{authorBaseData[item.key] || 0}}</span>
-                    <p class="name"><span>{{item.name}}</span></p>
+                    <span class="num" :class="{active: item.key === 'fansCount'}">{{authorBaseData[item.key] || 0}}</span>
+                    <span class="name" :class="{active: item.key === 'fansCount'}">{{item.name}}</span>
                   </li>
                 </ul>
               </div>
             </div>
           </div>
-
-          <div class="operate-wrap">
-            <a v-if="isOwner" class="operate-btn btn-user-edit" :href="mineInfoUrl">编辑个人资料</a>
-            <WidgetFollow v-if="!isOwner" class="operate-btn" :author-uid="authorInfo.authorUid" :author-type="authorInfo.authorType" :follow="isAttention" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
+          <div class="backchg-img">
+            <div class="operate-wrap">
+              <a v-if="isOwner" class="btn-user-edit" :href="mineInfoUrl">编辑个人资料</a>
+              <WidgetFollow v-if="!isOwner" class="operate-btn" :class="{active: isAttention !== 'N'}" :author-uid="authorInfo.authorUid" :author-type="authorInfo.authorType" :follow="isAttention" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
+            </div>
           </div>
         </div>
       </div>
-
       <div ref="tabBlock" class="tab-block">
         <FavTabBlock :active-index="activeIndex" @change="changeTab"></FavTabBlock>
       </div>
@@ -147,6 +147,10 @@ export default {
       });
     }
 
+    this.SET_STATUS_BAR_COLOR({
+      color: this.headerAnimateStep > 55 ? 'black' : 'white'
+    });
+
     this.beforeRouteEnter = this.beforeRouteUpdate;
   },
   computed: {
@@ -216,6 +220,9 @@ export default {
     },
     detailTitle() {
       return [this.authorBaseData.nickName, '收藏'][this.activeIndex];
+    },
+    headerBgOpacity() {
+      return this.headerAnimateStep / 100;
     }
   },
   methods: {
@@ -243,6 +250,7 @@ export default {
       this.emptyTip = '';
       this.shareData = {};
       this.titleName = '';
+      this.headerAnimateStep = 0;
 
       if (this.scrollY > 0) {
         if (this._animeEl) {
@@ -714,9 +722,8 @@ export default {
 
     .back-img {
       display: flex;
-      width: 100%;
       background-repeat: no-repeat;
-      background-size: contain;
+      background-size: 100% 100%;
       background-image: url("~statics/image/article/author_back@3x.png");
     }
 
@@ -734,6 +741,8 @@ export default {
     .avatar-box {
       width: 150px;
       height: 150px;
+      border-radius: 50%;
+      border: 4px solid #fff;
       margin-top: -75px;
       opacity: 0;
       transition: opacity 300ms ease-in-out;
@@ -833,14 +842,14 @@ export default {
     display: flex;
     flex-direction: column;
     margin-top: 46px;
-    padding-bottom: 2.15rem;
+    padding-bottom: 76px;
   }
 
   .author-fans {
     display: flex;
     justify-content: space-between;
-    margin-left: 48px;
-    margin-right: 48px;
+    margin-left: 60px;
+    margin-right: 50px;
 
     li {
       position: relative;
@@ -859,33 +868,41 @@ export default {
         min-width: 30px;
         font-size: 40px;
         font-weight: 500;
-        padding: 0 0 6px 10px;
+        padding: 0 0 6px 0;
         display: block;
         text-align: center;
         color: #222;
+
+        &.active {
+          padding-left: 60px;
+        }
       }
 
       .name {
-        position: absolute;
-        left: -50px;
-        right: -50px;
-        bottom: -30px;
         font-size: 24px;
-        font-weight: 300;
         color: #b0b0b0;
         text-align: center;
         word-break: keep-all;
         white-space: nowrap;
-        padding: 0 0 0 10px;
+
+        &.active {
+          padding-left: 60px;
+        }
       }
     }
   }
 
+  .backchg-img {
+    display: flex;
+    background-size: 100% 100%;
+    background-image: url("~statics/image/article/rectangle@3x.png");
+  }
+
   .operate-wrap {
     position: relative;
     width: 400px;
     margin-top: -35px;
-    margin-bottom: 20px;
+    margin-bottom: 40px;
     margin-left: calc(50% - 200px);
 
     .operate-btn {
@@ -899,9 +916,23 @@ export default {
       background-color: #222;
       color: white;
       text-align: center;
+
+      &.active {
+        background-color: #fff;
+        color: black;
+        border: 2px solid #e0e0e0;
+        text-align: center;
+        border-radius: 10px;
+        box-sizing: border-box;
+      }
     }
 
     .btn-user-edit {
+      width: 400px;
+      height: 70px;
+      font-size: 24px;
+      line-height: 70px;
+      display: inline-block;
       background-color: #222;
       color: white;
       text-align: center;
@@ -953,7 +984,7 @@ export default {
   }
 
   .pannel-wrap {
-    background-color: white;
+    background-color: #f0f0f0;
   }
 
   .loading {

@@ -81,7 +81,7 @@ export default {
     li {
       font-size: 24px;
       color: #b0b0b0;
-      padding: 20px 40px 20px 0;
+      padding: 30px 40px 30px 0;
     }
 
     .sub-tabs-item {

@@ -79,6 +79,7 @@ export default {
 
       .active {
         color: #444;
+        font-weight: 500;
         position: relative;
       }
     }

@@ -187,7 +187,7 @@ export default {
 
 <style lang="css">
   .sr-list {
-    padding: 5px;
+    padding: 0 5px 0 5px;
     display: flex;
     align-items: flex-start;
 

 {
   "name": "yoho-community-web",
-  "version": "6.9.11-beta12",
+  "version": "6.9.11-beta14",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {