Merge remote-tracking branch 'origin/master'

app/Lib/Action/Vip/PkTopAction.class.php

@@ -226,7 +226,9 @@ class PkTopAction extends IdentityAction{
 
             $ua = strtolower($_SERVER['HTTP_USER_AGENT']);
             $hideShiPan=0;
-            if(strpos($ua, 'oppo')||strpos($ua, 'huawei_jt')||strpos($ua, 'xiaomi')){
+//            $tj=strpos($ua, 'oppo')||strpos($ua, 'huawei_jt')||strpos($ua, 'xiaomi');
+            $tj=strpos($ua, 'vivo');
+            if($tj){
                 $hideShiPan=1;
             }
             if(I('channel')=='tencent_new_simplify'&&I('version')<'A3.7.9R'){

app/Tpl/Vip/PkTop/index.html

@@ -253,7 +253,7 @@
     </div>
     <eq name="hideShiPan" value="0">
         <div class="bottom-j-btn bottom-btn">
-            <div  style="width: 25%;background-color: #fdfdfd;float: left" id="zixun">大赛咨询</div>
+            <div  style="width: 25%;background-color: #fdfdfd;float: left" id="zixun">福利咨询</div>
             <div class="bottom-j-left" style="width: 25%">
                 <img class="icon" src="__PUBLIC__/Home/images/g2020/bottom-icon.png" alt="">资金重置卡
             </div>

app/Tpl/Vip/PkTop/pop.html

@@ -23,8 +23,8 @@
  
 <div class="camp-apply-pop pops dialog-pop" style="display: none;top:18vh" id="popPkTopSucc" >
     <div class="pop-main">
-        <p class="main-msg-i">恭喜成功报名</p>
-        <p class="main-msg-i1">添加管理员微信<br>便于后续发放比赛奖金</p>
+        <p class="main-msg-i" style="color: initial;">恭喜成功报名</p>
+        <p class="main-msg-i1" style="color: #ff2336;font-weight: bold;font-size: 18px;">加微信免费领取参赛权益<br>扫码进大赛高手交流群</p>
         <p class="code-img"><img src="{$Think.const.IMAGE_URL}/uploads/camps/weixin/{$weixin}.jpg" alt=""></p>
         <p class="main-msg-code" style="text-align:center;font-size: 13px;">大赛管理微信号：<span class="red">{$weixin}</span>
             <button class="copybtn" data-clipboard-action="copy" data-clipboard-text="{$weixin}"
@@ -44,9 +44,12 @@
 
 <div class="camp-apply-pop pops dialog-pop" style="display: none;top:18vh" id="popWx" >
     <div class="pop-main">
-        <p class="main-msg-i1">添加管理员微信<br>便于后续发放比赛奖金</p>
+        <!--<p class="main-msg-i1">添加管理员微信<br>便于后续发放比赛奖金</p>-->
+        <p class="main-msg-i1" style="font-size: 18px;" >大赛福利及参赛问题咨询</p>
+        <p class="main-msg-i"  style="font-size: 18px;" >加微信免费领取参赛权益<br>扫码进大赛高手交流群</p>
+
         <p class="code-img"><img src="{$Think.const.IMAGE_URL}/uploads/camps/weixin/{$weixin}.jpg" alt=""></p>
-        <p class="main-msg-code" style="text-align:center;font-size: 13px;">大赛管理微信号：<span class="red">{$weixin}</span>
+        <p class="main-msg-code" style="text-align:center;font-size: 13px;margin-left:-2px;">大赛管理微信号：<span class="red">{$weixin}</span>
             <button class="copybtn" data-clipboard-action="copy" data-clipboard-text="{$weixin}"
                     style="border: 0px;font-size: 11px;background-color: #ff2336;color: #ffffff;line-height: 23px;width: 60px;border-radius: 12px;margin-left: 8px;">
                 复制微信</button>