wesmiler 更新第5期更新代码合并

public/themes/default/weixin/match/index.html

@@ -2,8 +2,8 @@
 <title>推荐</title>
 <link rel="stylesheet" href="__TMPL__/weixin/public/assets/css/swiper.min.css?v={$version}">
 <link rel="stylesheet" href="__TMPL__/weixin/public/assets/css/match.css?v={$version}">
-<div id="app" v-cloak>
-    <div :class="!hasFollow? 'top_lieb top_box hasFollow' : 'top_lieb'">
+<div id="app" v-cloak v-if="memberInfo.id">
+    <div :class="!hasFollow? 'top_lieb top_box hasFollow' : 'top_lieb top_box'">
         <div class="head">
             <p><em></em><span class="label">首页推广</span> <a class="top" href="/weixin/activity/top?id=16">我要上首页</a></p>
         </div>

public/themes/default/weixin/public/assets/js/activity.js

@@ -39,7 +39,7 @@ var app = new Vue({
             var scrollHeight = $(this).scrollTop();
             var height = $('body')[0].scrollHeight;
             var docHeight = $(this).outerHeight();
-            if(docHeight+scrollHeight >= height){
+            if(docHeight+scrollHeight >= height-5){
                 if(_this.status.loading || _this.status.loaded){
                     return false;
                 }

public/themes/default/weixin/public/assets/js/match.js

@@ -18,7 +18,7 @@ var app = new Vue({
             lat: '',
             lng: '',
         },
-        hasFollow: 0,
+        hasFollow: 1,
         // 数据列表
         dataList: [],
         // 怦然心动
@@ -105,6 +105,9 @@ var app = new Vue({
             this.total = typeof (total) != 'undefined' && total>0? total : dataList.length
             this.params.page = Math.ceil(dataList.length/this.params.pageSize);
             this.dataList = dataList;
+            _this.getMeal();
+            _this.getInfo();
+            _this.getTopList();
             // this.initSwiper()
         }else{
             this.slideIndex = 0;