wesmiler 更新第5期升级

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

@@ -52,35 +52,35 @@
             <ul>
                 <a href="/weixin/market/team">
                     <li><img src="__TMPL__/weixin/public/assets/img/team.png">
-                        <p>我的团队</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3>团队作战，收益多多</h3></li>
+                        <span>我的团队</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3>团队作战，收益多多</h3></li>
                 </a>
                 <a href="/weixin/market/teamInvite">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-invite.png">
-                        <p>团队邀请</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3>团队邀请码，扩充团队成员</h3></li>
+                        <span>团队邀请</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3>团队邀请码，扩充团队成员</h3></li>
                 </a>
                 <a href="/weixin/market/rank" v-if="memberInfo.rank_count>=10">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-rank.png">
-                        <p>收益排行榜</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>收益排行榜</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/market/income" >
                     <li><img src="__TMPL__/weixin/public/assets/img/income.png">
-                        <p>收益明细</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>收益明细</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/account/withdrawLog">
                     <li><img src="__TMPL__/weixin/public/assets/img/withdraw.png">
-                        <p>提现记录</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>提现记录</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/custom?type=2">
                     <li><img src="__TMPL__/weixin/public/assets/img/custom.png">
-                        <p>我的客服</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>我的客服</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/marketAgree">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-rule.png">
-                        <p>奖励规则</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>奖励规则</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/about">
                     <li class="bangd_s"><img src="__TMPL__/weixin/public/assets/img/about.png">
-                        <p>关于拾光</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>关于拾光</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
             </ul>
         </div>

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

@@ -13,7 +13,7 @@
     <div class="followTips" v-if="hasFollow==0">关注拾光公众号，接收微信申请和结果反馈<a @click="showFollow()">立即关注</a><span @click="hasFollow=true">x</span></div>
     <div :class="'box'+(!hasFollow? ' has' : '')">
         <div id="recommends" class="recommend-box">
-            <div class="tips" v-if="tipsArr.length>0" :style="'width:'+(tips.width)+'px;right: '+tips.left+'%;'">
+            <div class="tips" v-if="tipsArr.length>0">
                 <a href="/weixin/member/complain"><span></span></a>
             </div>
             <div class="join"><a href="/weixin/activity/book?id=15">我要推荐</a></div>

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

@@ -50,52 +50,52 @@
             <ul>
                 <a href="/weixin/auth/vip">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-vip.png">
-                        <p>会员中心</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h2 class="expire" v-if="memberInfo.vip_expire_near">即将到期请及时续费</h2></li>
+                        <span>会员中心</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h2 class="expire" v-if="memberInfo.vip_expire_near">即将到期请及时续费</h2></li>
                 </a>
                 <a href="/weixin/auth/index">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-auth.png">
-                        <p>我的认证</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"/><h2 v-if="memberInfo.id" :class="memberInfo.is_auth?'auth' : 'no'"><span v-if="memberInfo.is_auth"><img src="__TMPL__/weixin/public/assets/img/auth.png" width="130" height="36"/></span><span v-else>去认证</span></h2></li>
+                        <span>我的认证</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"/><h2 v-if="memberInfo.id" :class="memberInfo.is_auth?'auth' : 'no'"><span v-if="memberInfo.is_auth"><img src="__TMPL__/weixin/public/assets/img/auth.png" width="130" height="36"/></span><span v-else>去认证</span></h2></li>
 
                 </a>
                 <a href="/weixin/member/activity">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-activity.png">
-                        <p>我的活动</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>我的活动</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/member/heartbeat">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-heart.png">
-                        <p>怦然心动</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>怦然心动</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <!--<a href="/weixin/account/index">
                     <li><img src="__TMPL__/weixin/public/assets/img/tubiao43.png">
-                        <p>充值记录</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3 v-text="memberInfo.rechargeCount" v-if="memberInfo.rechargeCount">0</h3></li>
+                        <span>充值记录</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"><h3 v-text="memberInfo.rechargeCount" v-if="memberInfo.rechargeCount">0</h3></li>
                 </a>-->
                 <a href="/weixin/auth/hand">
                     <li><img src="__TMPL__/weixin/public/assets/img/new-hand.png" >
-                        <p>人工牵线</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>人工牵线</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/custom?type=1">
                     <li><img src="__TMPL__/weixin/public/assets/img/custom.png">
-                        <p>我的客服</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>我的客服</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/member/privacy" >
                     <li><img src="__TMPL__/weixin/public/assets/img/new-privacy.png">
-                        <p>隐私设置</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>隐私设置</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/rule">
                     <li><img  src="__TMPL__/weixin/public/assets/img/new-rule.png">
-                        <p>违规处罚</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>违规处罚</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/member/complain">
                     <li><img  src="__TMPL__/weixin/public/assets/img/user_black.png">
-                        <p>举报用户</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>举报用户</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/member/advice">
                     <li><img  src="__TMPL__/weixin/public/assets/img/advice.png">
-                        <p>反馈建议</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>反馈建议</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
                 <a href="/weixin/page/about">
                     <li class="bangd_s"><img src="__TMPL__/weixin/public/assets/img/new-about.png">
-                        <p>关于拾光</p><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
+                        <span>关于拾光</span><img class="rjiant" src="__TMPL__/weixin/public/assets/img/tubiao10.png"></li>
                 </a>
             </ul>
         </div>

public/themes/default/weixin/public/assets/css/market.css

@@ -33,9 +33,15 @@
     margin-bottom: 60px;
 }
 .liebr_box{width: 100%;overflow: hidden;margin-top: 10px;}
+.liebr_box a {
+    display: block;
+    overflow: hidden;
+    height: 44px;
+}
 .liebr_box li{display: block;width: 100%;height: 44px;background: #fff;border-bottom: 1px solid #efefef;}
-.liebr_box li img{width: 28px;float: left;margin-left: 12px;margin-top: 8px;}
+.liebr_box li img{width: 28px;float: left;margin-left: 12px;margin-top: 8px;display: inline-block;}
 .liebr_box li p{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}
+.liebr_box li > span{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}
 .liebr_box li h2.no{font-size: 12px;background:  #ffd132;width: 50px;height: 22px;line-height: 22px;float: right;text-align: center;border-radius: 4px;color: #333;margin-top: 11px;}
 .liebr_box li h2.auth{background: none; float: right;margin-top: 8px;}
 .liebr_box li h3{
@@ -80,7 +86,14 @@
     width: auto;
 }
 
-.rjiant{width:12px!important;float: right!important;margin-right: 15px;margin-top:16px!important;}
+.liebr_box li .rjiant {
+    width: 12px!important;
+    float: right!important;
+    margin-right: 15px;
+    margin-top: 16px!important;
+    height: 12px;
+    display: inline-block;
+}
 .yaoqrk{background: #fff;padding-bottom:20px;position: relative;}
 .yaoqrk h2{font-size: 16px;padding:6px;text-align: center;border:1px solid  #ffd132;overflow: hidden;margin: 0 20px;color:#f5c432;border-radius: 6px;}
 

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

@@ -411,6 +411,7 @@ body {
     height: 30px;
     line-height: 30px;
     overflow: hidden;
+    display: none;
 }
 
 .tips a {

public/themes/default/weixin/public/assets/css/member.css

@@ -29,8 +29,10 @@
     overflow: hidden;
     height: 44px;
 }
-.liebr_box li img{width: 28px; height: 28px;float: left;margin-left: 12px;margin-top: 8px;}
-.liebr_box li p{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}
+.liebr_box li img{width: 28px; height: 28px;float: left;margin-left: 12px;margin-top: 8px;display: inline-block;}
+.liebr_box li > span{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}
+.liebr_box li  p{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}
+/*.liebr_box li p{font-size: 14px;line-height: 44px;float: left;margin-left: 10px;color: #666;}*/
 .liebr_box li h2.no{font-size: 12px;background:  #ffd132;width: 50px;height: 22px;line-height: 22px;float: right;text-align: center;border-radius: 4px;color: #333;margin-top: 11px;}
 .liebr_box li h2.auth{background: none; float: right;margin-top: 8px;}
 .liebr_box li h3{font-size: 12px;background:  #ffd132;float: right;text-align: center;border-radius: 130px;color: #333;margin-top: 11px;padding: 4px 8.5px;}
@@ -66,7 +68,7 @@
     width: auto;
 }
 
-.liebr_box li .rjiant{width:12px!important;float: right!important;margin-right: 15px;margin-top:16px!important; height: 12px;}
+.liebr_box li .rjiant{display: inline-block;width:12px!important;float: right!important;margin-right: 15px;margin-top:16px!important; height: 12px;}
 .yaoqrk{background: #fff;padding-bottom:20px;position: relative;}
 .yaoqrk h2{font-size: 16px;padding:6px;text-align: center;border:1px solid  #ffd132;overflow: hidden;margin: 0 20px;color:#f5c432;border-radius: 6px;}
 

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

@@ -225,6 +225,8 @@ var app = new Vue({
                 if(strs.length>9){
                     width = (strs.length-9)*13.5
                 }
+                console.log(content)
+                $(".tips").show();
                 $(".tips").css({width:width+'px'});
                 $(".tips a span").html(content);
                 _this.tipsTimerId = setInterval(function(){
@@ -232,6 +234,7 @@ var app = new Vue({
                        left = -100;
                        content = '';
                        index = index+1>=num? 0 : index+1;
+                       $(".tips").hide();
                        $(".tips").css({right:left+'%'});
                        $(".tips a span ").html(content);
                        _this.initTips(index)