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

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

@@ -52,7 +52,7 @@
                         </div>
                         <div class="text">
                             <h2>工作认证</h2>
-                            <p>IT/金融/体制内等职场单身聚集地</p>
+                            <p>南宁8090大专起单身聚集地</p>
                             <span v-if="memberInfo.position_check==1">审核中</span>
                             <span v-else-if="memberInfo.position_check==2">更新认证</span>
                             <span v-else-if="memberInfo.position_check==3">未通过</span>
@@ -71,7 +71,7 @@
                         </div>
                         <div class="text">
                             <h2>学历认证</h2>
-                            <p>优秀扽学历人群都在这啦</p>
+                            <p>优秀的学历人群都在这啦</p>
                             <span v-if="memberInfo.education_check==1">审核中</span>
                             <span v-else-if="memberInfo.education_check==2">更新认证</span>
                             <span v-else-if="memberInfo.education_check==3">未通过</span>
@@ -80,7 +80,7 @@
                     </div>
                 </div>
             </a>
-            <div class="tis">确保信息真实才可在平台交友，与官方数据联网对比，承诺保障信息安全，已有大量用户认证。</div>
+            <div class="tis">确保信息真实才可在平台相亲，与官方数据联网对比，承诺保障信息安全，已有2万+用户认证。</div>
             <div class="custom">
                 <a href="/weixin/page/custom?type=3"><img src="__TMPL__/weixin/public/assets/img/custom.png" width="36">联系客服</a>
             </div>

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

@@ -13,7 +13,7 @@ var app = new Vue({
             height: '',
             education: 0,
             married: 0,
-            pageSize: 3,
+            pageSize: 50,
             type: 1,
             lat: '',
             lng: '',
@@ -226,15 +226,15 @@ var app = new Vue({
                 _this.tipsTimerId = setInterval(function(){
                     //console.log(left+'++'+index)
                     if(left>=100){
-                       left = -100;
-                       content = '';
-                       index = index+1>=num? 0 : index+1;
-                       $(".tips").hide();
-                       $(".tips").css({right:left+'%'});
-                       $(".tips a span ").html(content);
-                       _this.initTips(index)
-                       return false;
-                   }
+                        left = -100;
+                        content = '';
+                        index = index+1>=num? 0 : index+1;
+                        $(".tips").hide();
+                        $(".tips").css({right:left+'%'});
+                        $(".tips a span ").html(content);
+                        _this.initTips(index)
+                        return false;
+                    }
 
                     left += 0.25;
                     $(".tips").css({width:width+'px'});
@@ -442,10 +442,10 @@ var app = new Vue({
                 _this.swiper = new Swiper('.hearts', {
                     loop: false, // 循环模式选项
                     autoplay: false,
-                    speed: 200,
+                    speed: 100,
                     direction : 'vertical',
                     initialSlide: _this.slideIndex,// 默认显示
-                    // freeMode : true,//是否滑动
+                    freeMode : true,//是否滑动
                     observer: true,//修改swiper自己或子元素时，自动初始化swiper
                     observeParents: true,//修改swiper的父元素时，自动初始化swiper
                     slidesPerView: 'auto',
@@ -551,12 +551,12 @@ var app = new Vue({
                 close: true,
                 title: "认证信息",
                 text: "<div class='authInfo'><span class='close'>x</span><p class='avatar'><img src='"+data.avatar+"' alt=''>"+vip+"</p>" +
-                "<p class='info'>" +
-                "<span class='"+idcard+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/idcard.png' alt=''></span><span>实名</span></span>" +
-                "<span class='"+position+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/position.png' alt=''></span><span>工作</span></span>" +
-                "<span class='"+education+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/education.png' alt=''></span><span>学历</span></span>" +
-                "</p>" +
-                "</div>",
+                    "<p class='info'>" +
+                    "<span class='"+idcard+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/idcard.png' alt=''></span><span>实名</span></span>" +
+                    "<span class='"+position+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/position.png' alt=''></span><span>工作</span></span>" +
+                    "<span class='"+education+"'><span class='icon'><img src='/themes/default/weixin/public/assets/img/auth/education.png' alt=''></span><span>学历</span></span>" +
+                    "</p>" +
+                    "</div>",
                 buttons: [
                     {
                         text: "关闭", className: "default", onClick: function () {
@@ -586,7 +586,7 @@ var app = new Vue({
                             return false;
                         }
                     }
-                    ]
+                ]
             });
         },
         // 延迟加载