Merge remote-tracking branch 'origin/master'

@@ -612,6 +612,17 @@ const yoho = {
     } else {
     } else {
       // tip(tipInfo);
       // tip(tipInfo);
     }
     }
+  },
+
+  setWebview(args, success, fail) {
+    if (this.isYohoBuy && window.yohoInterface) {
+      window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
+        method: 'set.webview',
+        arguments: args
+      });
+    } else {
+      // tip(tipInfo);
+    }
   }
   }
 };
 };
 
 

@@ -53,6 +53,7 @@ export default {
         }
         }
       }
       }
       return (src || '')
       return (src || '')
+        .replace('http://', '//')
         .replace('{mode}', this.mode)
         .replace('{mode}', this.mode)
         .replace('{width}', this.width)
         .replace('{width}', this.width)
         .replace('{height}', this.height);
         .replace('{height}', this.height);

@@ -25,7 +25,7 @@ export default {
   },
   },
   computed: {
   computed: {
     imageSrc() {
     imageSrc() {
-      return this.src || '//img10.static.yhbimg.com/headimg/2013/11/28/09/01cae078abe5fe320c88cdf4c220212688.gif??imageView/2/w/{width}/h/{height}';
+      return this.src || '//img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
     }
     }
   }
   }
 };
 };

@@ -25,9 +25,10 @@
       class="main-container"
       class="main-container"
       ref="scroll"
       ref="scroll"
       :options="scrollOpts"
       :options="scrollOpts"
-      :scroll-events="['scroll', 'scroll-end']"
+      :scroll-events="['scroll', 'scroll-end', 'before-scroll-start']"
       @scroll="onScrollHandle"
       @scroll="onScrollHandle"
-      @scroll-end="onScrollEndHandle">
+      @scroll-end="onScrollEndHandle"
+      @before-scroll-start="beforeScrollStartHandle">
       <div ref="authorProfile" class="author-profile">
       <div ref="authorProfile" class="author-profile">
         <span class="avatar-box">
         <span class="avatar-box">
           <WidgetAvatar :src="authorBaseData.headIco" :width="100" :height="100"></WidgetAvatar>
           <WidgetAvatar :src="authorBaseData.headIco" :width="100" :height="100"></WidgetAvatar>
@@ -50,7 +51,7 @@
         <FavTabBlock :tabs-num="tabsNum" :active-index="activeIndex" @change="changeTab"></FavTabBlock>
         <FavTabBlock :tabs-num="tabsNum" :active-index="activeIndex" @change="changeTab"></FavTabBlock>
       </div>
       </div>
       <div ref="contantList" class="contant-list" :style="`min-height: ${listMinHeight}px;`">
       <div ref="contantList" class="contant-list" :style="`min-height: ${listMinHeight}px;`">
-        <p v-if="emptyTip" class="empty-tip" :height="emptyTipHeight">{{emptyTip}}</p>
+        <p v-if="emptyTip" class="empty-tip">{{emptyTip}}</p>
         <WaterFall class="pannel-wrap" :list="list" :params="params"></WaterFall>
         <WaterFall class="pannel-wrap" :list="list" :params="params"></WaterFall>
         <div v-if="loadStatus && !emptyTip" class="loading">
         <div v-if="loadStatus && !emptyTip" class="loading">
           <Loading v-if="loadStatus === 1" class="load-icon" :size="20"></Loading>
           <Loading v-if="loadStatus === 1" class="load-icon" :size="20"></Loading>
@@ -59,7 +60,7 @@
       </div>
       </div>
     </cube-scroll>
     </cube-scroll>
 
 
-    <a v-if="isOwner" class="publish hover-opacity" :href="publishUrl"></a>
+    <a v-if="isOwner" class="publish hover-opacity" :class="{'scroll-opacity': scrolling}" :href="publishUrl"></a>
   </Layout>
   </Layout>
 </template>
 </template>
 
 
@@ -78,6 +79,7 @@
     data() {
     data() {
       return {
       return {
         scrollY: 0,
         scrollY: 0,
+        scrolling: false,
         mineInfoUrl: '//m.yohobuy.com/home/mydetails?openby:yohobuy＝{"action":"go.mineinfo"}',
         mineInfoUrl: '//m.yohobuy.com/home/mydetails?openby:yohobuy＝{"action":"go.mineinfo"}',
         publishUrl: '?openby:yohobuy＝{"action":"go.grasspublish"}',
         publishUrl: '?openby:yohobuy＝{"action":"go.grasspublish"}',
         autherInfo: {},
         autherInfo: {},
@@ -92,7 +94,6 @@
         listMinHeight: 0,
         listMinHeight: 0,
         fetchInfo: {},
         fetchInfo: {},
         loadStatus: '',
         loadStatus: '',
-        emptyTipHeight: '',
         emptyTip: '',
         emptyTip: '',
         scrollOpts: {
         scrollOpts: {
           bounce: false
           bounce: false
@@ -109,7 +110,6 @@
       this.init(this.$route.params);
       this.init(this.$route.params);
 
 
       this.listMinHeight = this.$el.offsetHeight - this.$refs.tabBlock.offsetHeight - $dom.offsetHeight;
       this.listMinHeight = this.$el.offsetHeight - this.$refs.tabBlock.offsetHeight - $dom.offsetHeight;
-      this.emptyTipHeight = this.$el.offsetHeight - this.$refs.contantList.offsetTop - $dom.offsetHeight - 40;
 
 
       if ($dom.offsetHeight) {
       if ($dom.offsetHeight) {
         this._animeDuration = 300;
         this._animeDuration = 300;
@@ -238,6 +238,7 @@
         this._animePlayed = animePlayed;
         this._animePlayed = animePlayed;
       },
       },
       onScrollEndHandle(scroll) {
       onScrollEndHandle(scroll) {
+        this.scrolling = false;
         if (1000 - scroll.y > this.$refs.contantList.offsetHeight) {
         if (1000 - scroll.y > this.$refs.contantList.offsetHeight) {
           this._listTimer && clearTimeout(this._listTimer);
           this._listTimer && clearTimeout(this._listTimer);
           this._listTimer = setTimeout(() => {
           this._listTimer = setTimeout(() => {
@@ -245,6 +246,9 @@
           }, 50);
           }, 50);
         }
         }
       },
       },
+      beforeScrollStartHandle() {
+        this.scrolling = true;
+      },
       changeTab(index) {
       changeTab(index) {
         if (this.activeIndex !== index) {
         if (this.activeIndex !== index) {
           this.activeIndex = index;
           this.activeIndex = index;
@@ -550,13 +554,20 @@
     white-space: nowrap;
     white-space: nowrap;
   }
   }
 
 
+  .contant-list {
+    position: relative;
+  }
+
   .empty-tip {
   .empty-tip {
+    width: 100%;
     display: flex;
     display: flex;
     justify-content: center;
     justify-content: center;
     align-items: center;
     align-items: center;
-    height: 1000px;
     font-size: 28px;
     font-size: 28px;
     color: #ddd;
     color: #ddd;
+    position: absolute;
+    top: 0;
+    bottom: 240px;
   }
   }
 
 
   .loading {
   .loading {
@@ -580,5 +591,10 @@
     background-image: url('../../statics/image/userpage/publish.png');
     background-image: url('../../statics/image/userpage/publish.png');
     background-size: 100% 100%;
     background-size: 100% 100%;
     z-index: 10;
     z-index: 10;
+    transition: all 600ms ease-in-out;
+
+    &.scroll-opacity {
+      opacity: 0.3;
+    }
   }
   }
 </style>
 </style>

@@ -38,6 +38,7 @@ export default {
                 props: {
                 props: {
                   src: this.img,
                   src: this.img,
                   lazy: false,
                   lazy: false,
+                  mode: 1,
                   width: 100,
                   width: 100,
                   height: 100
                   height: 100
                 }
                 }

@@ -48,4 +48,10 @@ export default store => {
       store.commit('SET_LOGIN_INFO', user);
       store.commit('SET_LOGIN_INFO', user);
     }
     }
   });
   });
+
+  Vue.$yoho.ready(() => {
+    Vue.$yoho.setWebview({
+      bounces: false
+    });
+  });
 };
 };