合并、中金分赛场

Public/Home/css/g2021.css

@@ -2283,7 +2283,7 @@ input.money:-ms-input-placeholder { /* Internet Explorer 10+ */
 }
 .my-info-data .head-r-num,.award-tab-list .head-r-num{
     position: relative;
-    display: flex;width: 57%;
+    display: flex;width: 100%;
     padding-top: 5px;
 }
 .award-tab-list .head-r-num{
@@ -2443,7 +2443,7 @@ input.money:-ms-input-placeholder { /* Internet Explorer 10+ */
 .award-tab-panel .rule-make{
     display: block;font-size: 13px;
     color: #666666;
-    margin: 0 auto;width: 88%;
+    margin: 0 auto 10px;width: 90%;
     background-color: #F6F6F6;
     padding: 10px 20px;
     border-radius: 8px;text-align: center;

Public/Home/js/pktop.js

@@ -199,14 +199,17 @@ function sendSmsAndSubmit(){
 
                     layer.open({content: data.info,skin: 'msg',time: 2,
                         end:function () {
-
+                            var href=location.href;
+                            console.log('当前页面url:'+href);
+                            // location.reload();
                             if(targetUrl!=''){
                                 $.cookie('denglu',targetUrl);
-                                location.href='/PkTop';
-                            }else{
-                                window.location.reload();
+                                location.href=targetUrl;
+
                             }
 
+
+
                         }});
                 }else{
                     //可能有各种错误提示

Public/css/h5/g2021.css

@@ -2934,7 +2934,7 @@ table tbody .tr-top3 .td-tx .tx-img{
     border: none;
 }
 .buy-card,.buy-card:hover{
-    color: #1d27fe;padding-left: 15px;
+    /*color: #1d27fe;padding-left: 15px;*/
 }
 .table-data-des{
     height: 69px;

Public/js/pk.js

@@ -86,7 +86,16 @@ function submitBaoming(userType,tradeUrl){
             if(data.status == 1){
 
                 if(data.canLogin==1){
-                    layer.alert('登录成功', 1, function(){location.reload();});
+                    layer.alert('登录成功', 1, function(){
+                        // location.reload();
+                        if(tradeUrl==''){
+                            location.href='/Index/myInvite?pop=1';
+                        }else{
+                            $.cookie('denglu','/Index/saicheng');
+                            location.href='/Index/saicheng';
+                        }
+
+                    });
                 }else{
                     $('#baoming').text('进入交易');
                     $('#pop1').hide();
@@ -97,10 +106,15 @@ function submitBaoming(userType,tradeUrl){
                 if(data.joinStatus==1){
                     //邀请页面过来的
                     if(tradeUrl==''){
-                        window.location.reload();
+                        // window.location.reload();
+                        location.href='/Index/myInvite?pop=1';
                     }else{
                         //因登录窗重用，不出现下面的弹窗了
-                        layer.alert('登录成功', 1, function(){location.reload();});
+                        layer.alert('登录成功', 1, function(){
+                             $.cookie('denglu','/Index/saicheng');
+                            location.href='/Index/saicheng';
+                            // location.reload();
+                        });
                         return;
                         var index = $.layer({
                             type: 1,title: ' ',border : [5, 0.5, '#666'],btns: 2,btn: ['关闭', '去交易'],

Public/js/popad_mini_jiang.js

@@ -2,7 +2,7 @@
 var href53="https://www23.53kf.com/webCompany.php?arg=10161301&style=3&kflist=off&zdkf_type=1&lnk_overflow=0&referer="+window.location.href+"&tfrom=1&tpl=crystal_blue";
 
 var _popadstr = '<style>body, tr, td, img, p, ul, li, h3 {border: 0 none;margin: 0;padding: 0;}' +
-    '.gotop {bottom: 289px;height: 280px;margin-left: 510px;position: fixed;_position:absolute;right: 10px;width: 60px;z-index: 99999;}' +
+    '.gotop {bottom: 289px;height: 280px;margin-left: 510px;position: fixed;_position:absolute;right: 10px;width: 60px;z-index: 999;}' +
     'ul.right-qq1 {margin: 0 auto;line-height:1em;}ul.right-qq1 .right-li {width:60px;height:60px;list-style: outside none none;text-align: center;margin-bottom: 2px;}' +
     'ul.right-qq1 .right-li .li-a{display: block;width: 60px;height: 60px;position: relative;overflow: hidden;}' +
     'ul.right-qq1 li .li-a img{display: block;position: absolute;top: 0px;left: 0px;transition: 0.2s;-webkit-transition: 0.2s;-moz-transition: 0.2s;}' +
@@ -60,7 +60,7 @@ _popadstr += '        <li class="kf-ouuter right-li right-one" onMouseover="Kfsh
     '<a  href="javascript:;"  id="" class="suspendQQ li-a">' +
     '<img src="/Public/images/popad/right-icon1-1.png" alt=""></a><div class="right-qq" >';
 _popadstr += '            <div style="display: none;width: 160px" class="kf-code" id="KFCodeleft">';
-_popadstr += '                <a href="javascript:;"><img src="/Public/images/2023ewm/koufuchaogu.gif" width="150"></a>';
+_popadstr += '                <a href="javascript:;"><img src="/Public/images/2023ewm/vipDs.jpg" width="150"></a>';
 _popadstr += '            </div>';
 _popadstr += '        </div></li>';
 

Public/js/popad_mini_pk.js

@@ -78,7 +78,7 @@ _popadstr += '        <li class="kf-ouuter right-li right-one" onMouseover="Kfsh
     '<a  href="javascript:;"  id="" class="suspendQQ li-a">' +
     '<img src="/Public/images/popad/right-icon1-1.png" alt=""></a><div class="right-qq" >';
 _popadstr += '            <div style="display: none;width: 160px" class="kf-code" id="KFCodeleft">';
-_popadstr += '                <a href="javascript:;"><img src="/Public/images/2023ewm/koufuchaogu.gif" width="150"></a>';
+_popadstr += '                <a href="javascript:;"><img src="/Public/images/2023ewm/vipDs.jpg" width="150"></a>';
 _popadstr += '            </div>';
 _popadstr += '        </div></li>';
 

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

@@ -49,7 +49,7 @@ class IndexAction extends IdentityAction {
 
         //刷新页面后获取弹出的消息
 //        $popData=$this->getPopData($userId);
-        $firstPageData=array('popType'=>$popData['popType'],'popPkUserName'=>$popData['popPkUserName']);
+        $firstPageData=[];
         $firstPageData['gonggao']=$this->getGonggao();
         //获奖心得
         $thinks=M('PktopUserphb')->where(array('think'=>array('exp','is not null')))->order('month desc')->limit(10)->select();
@@ -91,6 +91,13 @@ class IndexAction extends IdentityAction {
             $myData=$this->getMyData();
             $this->assign('myData',$myData);
         }
+        //重置卡个数
+        if($userId){
+            $leftNum=M()->db(10, C('DB_CONFIG_DEMO'))->table('cofool_magicbox_card')->where(['user_id'=>$userId,'card_type'=>2,'use_time'=>0])->count();
+        }else{
+            $leftNum=0;
+        }
+        $this->assign('resetLeftNum',$leftNum);
 
         $this->display();
 
@@ -1263,15 +1270,30 @@ class IndexAction extends IdentityAction {
         //中金大赛
         $bmData=M('Zhongjin')->where(['user_id'=>$userId])->order('add_time desc')->find();
         $dsStatus['zjStatus']=$bmData['status']==1?1:0;
+        $group = D('Group')->getGroup(ZHONGJIN_GROUP);
+        $dsStatus['zjStartTime']=date('Y-m-d',$group['startTime']);
+        $dsStatus['zjEndTime']=$group['endTime']?date('Y-m-d',$group['endTime']):'长期';
+
         //炼股赛
         $dsStatus['qmStatus']=in_array(PRIZE_GROUP_2021,$ids)?1:0;
+        $group = D('Group')->getGroup(PRIZE_GROUP_2021);
+        $dsStatus['qmStartTime']=date('Y-m-d',$group['startTime']);
+        $dsStatus['qmEndTime']=$group['endTime']?date('Y-m-d',$group['endTime']):'长期';
+
         //初级小白
         $bmData=M('Baoming')->where(['user_id'=>$userId,'status'=>['in',[1,6]],'group_id'=>NIU_BAI_ID])->find();
         $dsStatus['nbStatus']=empty($bmData)?0:1;
+        $group = D('Group')->getGroup(NIU_BAI_ID);
+        $dsStatus['nbStartTime']=date('Y-m-d',$group['startTime']);
+        $dsStatus['nbEndTime']=$group['endTime']?date('Y-m-d',$group['endTime']):'长期';
+
 //        var_dump($bmData);exit;
         //黑马特训营
         $bmData=M('Baoming')->where(['user_id'=>$userId,'status'=>['in',[1,6]],'group_id'=>NIU_STRONG_ID])->find();
         $dsStatus['hmStatus']=empty($bmData)?0:1;
+        $group = D('Group')->getGroup(NIU_STRONG_ID);
+        $dsStatus['hmStartTime']=date('Y-m-d',$group['startTime']);
+        $dsStatus['hmEndTime']=$group['endTime']?date('Y-m-d',$group['endTime']):'长期';
 
         //横盘突破
 //        $bmData=M('Baoming')->where(['user_id'=>$userId,'status'=>['in',[1,6]],'group_id'=>HPTP_ID])->find();
@@ -1288,6 +1310,10 @@ class IndexAction extends IdentityAction {
         }
         $dsStatus['hpStatus']=$hpStatus;
 
+        $group = D('Group')->getGroup(HPTP_ID);
+        $dsStatus['hpStartTime']=date('Y-m-d',$group['startTime']);
+        $dsStatus['hpEndTime']=$group['endTime']?date('Y-m-d',$group['endTime']):'长期';
+
         $this->assign('dsStatus',$dsStatus);
         //大赛动态
         $where=['status'=>1,'category_id'=>129];
@@ -1381,7 +1407,7 @@ class IndexAction extends IdentityAction {
         foreach ($items as $key=>&$value){
             $value["item_time"] = date('Y.m.d',$value['item_time']);
             if($value['item_money']>0){
-                $group = D('Group')->getGroup($value['source']);
+                $group = D('Group')->getGroup($value['group_id']);
 //                var_dump($group);exit;
                 $value['gName'] = $group['name'];
                 $itemList1[]=$value;
@@ -1391,9 +1417,45 @@ class IndexAction extends IdentityAction {
         }
         $this->assign('itemList1',$itemList1);
         $this->assign('itemList2',$itemList2);
+
+        //参赛总人数
+        $where=['group_id' => ['in',[ZHONGJIN_GROUP,PRIZE_GROUP_2021,NIU_BAI_ID,NIU_STRONG_ID,HPTP_ID]]];
+        $userNum = M('Group')->where($where)->cache(true,60*5)->sum('member_quantity');
+        $this->assign('userNum',$userNum);
+
         $this->display();
     }
 
+
+
+    //百宝箱首页使用翻倍卡和资金重置卡时调用该方法
+    public function saveCardConfig(){
+        $userId = $this->user['userID'];
+        //3练习区重置卡，4有奖大赛重置卡,5中金大赛的重置
+        $useType = I('use_type',0,'intval');
+
+        //1翻倍卡，2重置卡，先找出最先购买的未使用的卡
+        $cardType=$useType<=2?1:2;
+        $where=['user_id'=>$userId,'use_time'=>0,'card_type'=>$cardType];
+        $cardId=M("MagicboxCard")->where($where)->order('add_time asc')->getField('id');
+
+
+        $saveData=['use_time'=>time(),'use_type'=>$useType];
+        M("MagicboxCard")->where(['user_id'=>$userId,'id'=>$cardId])->save($saveData);
+        //如果配置的是资金重置卡，还要写到表resetbalance
+        if($useType==3){
+            $testId = D('Group')->getPractice($userId);
+            M("PkResetbalance")->add(['uid'=>$testId.'X'.$userId,'add_time'=>time(),'reset_type'=>3]);
+        }
+        if($useType==4){
+            M("PkResetbalance")->add(['uid'=>PRIZE_GROUP_2021.'X'.$userId,'add_time'=>time(),'reset_type'=>4]);
+        }
+        if($useType==5){
+            M("PkResetbalance")->add(['uid'=>ZHONGJIN_GROUP.'X'.$userId,'add_time'=>time(),'reset_type'=>5]);
+        }
+        $this->ajaxReturn(['status' =>1,'info' => '使用成功']);
+    }
+
 }
 
 

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

@@ -35,6 +35,11 @@ class PkTopAction extends IdentityAction{
             $this->assign('groupInfo', json_encode($groupInfo));
             //设置分享参数
             $this->setShare($userId, I('cfrom'));
+
+            //取微信
+            $weixin = M('GroupInfo')->where(['group_id' => $groupId])->getField('wechat');
+            $this->assign('weixin', $weixin);
+            $this->assign('weixinUrl', 'https://eturl.cn/Rhq2wA?is_head=1');
             //重置卡个数
             if($userId){
                 $leftNum=M('MagicboxCard')->where(['user_id'=>$userId,'card_type'=>2,'use_time'=>0])->count();
@@ -613,7 +618,8 @@ class PkTopAction extends IdentityAction{
             if($row['grade'] == -2){
                 M('UserGroup')->where(['user_id'=>$userId,'group_id'=>$groupId])->save(['grade'=>0,'add_time'=>time()]);
             }else{
-                return ['status'=>0,'info'=>'您已经参加过该大赛','debug'=>$userId,'flag'=>1];
+//                return ['status'=>0,'info'=>'您已经参加过该大赛','debug'=>$userId,'flag'=>1];
+                return ['status'=>0,'info'=>'登录成功','debug'=>$userId,'flag'=>1];
             }
         }
 
@@ -698,40 +704,40 @@ class PkTopAction extends IdentityAction{
 //    }
 
     //我的所有的挑战列表，包括我挑战别人的，和别人挑战我的
-	public function myPkList(){
-        $userId = I('userId', '',intval);
-        if(!$userId){
-            $userId = $this->user['userID'];
-        }
-//        $where['pk_end_time']=array('egt',date('Y-m-d'));
-        $where['_complex'] = array('active_id'=>$userId,'passive_id'=>$userId,'_logic'=>'or');
-        $myPkList=M('PktopData')->where($where)->order('pk_begin_time desc')->select();
-        foreach ($myPkList as $k => &$v) {
-            $v['pk_begin_time']=date('m月d日',strtotime($v['pk_begin_time']));
-            $v['pk_end_time']=date('m月d日',strtotime($v['pk_end_time']));
-
-        }
-
-        $this->assign(array('myPkList'=>$myPkList));
-        //进入交易需要的参数
-        $groupInfo=M('Group')->field('group_id,web_id,category,name,startTime,endTime')->where(array('group_id'=>$this->GID))->find();
-
-        $zhuangtai=$this->getGroupStatus($groupInfo);
-        $groupInfo['userID']=$userId;
-
-        $groupInfo['close_tips']='';
-        $groupInfo['viewPage']=2;
-        $groupInfo['zhuangtai'] = $zhuangtai;
-        $groupInfo['title'] = '『全民炼股』争霸赛(2020赛季)';
-        $groupInfo['desc'] = $groupInfo['shareContent']='红包周周有，万元大奖月月送，精英还可赢PK奖';
-
-        $this->assign('groupInfo',json_encode($groupInfo));
-        //我的挑战金
-        $myInfo=M('PktopUser')->where(array('user_id'=>$userId))->find();
-        $leftMoney=$myInfo['active_money']+$myInfo['passive_money']-$myInfo['already_withdraw_money'];
-        $this->assign('leftMoney',$leftMoney);
-        $this->display();
-    }
+//	public function myPkList(){
+//        $userId = I('userId', '',intval);
+//        if(!$userId){
+//            $userId = $this->user['userID'];
+//        }
+////        $where['pk_end_time']=array('egt',date('Y-m-d'));
+//        $where['_complex'] = array('active_id'=>$userId,'passive_id'=>$userId,'_logic'=>'or');
+//        $myPkList=M('PktopData')->where($where)->order('pk_begin_time desc')->select();
+//        foreach ($myPkList as $k => &$v) {
+//            $v['pk_begin_time']=date('m月d日',strtotime($v['pk_begin_time']));
+//            $v['pk_end_time']=date('m月d日',strtotime($v['pk_end_time']));
+//
+//        }
+//
+//        $this->assign(array('myPkList'=>$myPkList));
+//        //进入交易需要的参数
+//        $groupInfo=M('Group')->field('group_id,web_id,category,name,startTime,endTime')->where(array('group_id'=>$this->GID))->find();
+//
+//        $zhuangtai=$this->getGroupStatus($groupInfo);
+//        $groupInfo['userID']=$userId;
+//
+//        $groupInfo['close_tips']='';
+//        $groupInfo['viewPage']=2;
+//        $groupInfo['zhuangtai'] = $zhuangtai;
+//        $groupInfo['title'] = '『全民炼股』争霸赛(2020赛季)';
+//        $groupInfo['desc'] = $groupInfo['shareContent']='红包周周有，万元大奖月月送，精英还可赢PK奖';
+//
+//        $this->assign('groupInfo',json_encode($groupInfo));
+//        //我的挑战金
+//        $myInfo=M('PktopUser')->where(array('user_id'=>$userId))->find();
+//        $leftMoney=$myInfo['active_money']+$myInfo['passive_money']-$myInfo['already_withdraw_money'];
+//        $this->assign('leftMoney',$leftMoney);
+//        $this->display();
+//    }
 
     //我的邀请列表
     public function myInvite(){
@@ -915,41 +921,41 @@ class PkTopAction extends IdentityAction{
     }
 
     //pk列表，选月份后也调用该方法
-	public function pkList(){
-    	    if(IS_GET){
-    	        //显示当前月的挑战
-//                $month=date('Y-m');
-                $month=date('Y-m',strtotime(date('Y-m-01') . "-1 month"));
-                $selectMonth=array();
-                foreach ($this->MONTH as $k => $value) {
-                    $nowMonth=date('Y-m',strtotime(date('Y-m-01')));
-                    if($k<$nowMonth){
-                        $selectMonth[$k]=$value;
-                    }
-                }
-            }else{
-                $month = I('month', '',intval);
-            }
-        $pkList=M('PktopData')->where(array('month'=>$month))->order('add_time desc')->select();
-        foreach ($pkList as $k => &$v) {
-            $v['pk_begin_time']=date('m月d日',strtotime($v['pk_begin_time']));
-            $v['pk_end_time']=date('m月d日',strtotime($v['pk_end_time']));
-
-        }
-        $this->assign(array('pkList'=>$pkList,'selectMonth'=>$selectMonth,'lastMonth'=>$month));
-        $this->assign(['type'=>'pkList']);
-        if(IS_GET){
-            $userId = $this->user['userID'];
-            $this->setGoTrade($userId);
-            $this->display();
-        }else{
-
-            $content = $this->fetch('item2');
-            $this->ajaxReturn(array(
-                'status' => 1,'count'=>count($pkList),'data' => $content
-            ));
-        }
-    }
+//	public function pkList(){
+//    	    if(IS_GET){
+//    	        //显示当前月的挑战
+////                $month=date('Y-m');
+//                $month=date('Y-m',strtotime(date('Y-m-01') . "-1 month"));
+//                $selectMonth=array();
+//                foreach ($this->MONTH as $k => $value) {
+//                    $nowMonth=date('Y-m',strtotime(date('Y-m-01')));
+//                    if($k<$nowMonth){
+//                        $selectMonth[$k]=$value;
+//                    }
+//                }
+//            }else{
+//                $month = I('month', '',intval);
+//            }
+//        $pkList=M('PktopData')->where(array('month'=>$month))->order('add_time desc')->select();
+//        foreach ($pkList as $k => &$v) {
+//            $v['pk_begin_time']=date('m月d日',strtotime($v['pk_begin_time']));
+//            $v['pk_end_time']=date('m月d日',strtotime($v['pk_end_time']));
+//
+//        }
+//        $this->assign(array('pkList'=>$pkList,'selectMonth'=>$selectMonth,'lastMonth'=>$month));
+//        $this->assign(['type'=>'pkList']);
+//        if(IS_GET){
+//            $userId = $this->user['userID'];
+//            $this->setGoTrade($userId);
+//            $this->display();
+//        }else{
+//
+//            $content = $this->fetch('item2');
+//            $this->ajaxReturn(array(
+//                'status' => 1,'count'=>count($pkList),'data' => $content
+//            ));
+//        }
+//    }
 
         public function login()   {
             $userId=I('user_id', '',intval);
@@ -1392,14 +1398,20 @@ class PkTopAction extends IdentityAction{
         $this->assign('referer', $referer);
         $this->assign('member_quantity', $member_quantity);
         $this->assign('p', 1);
-        //取微信
-        $weixin = M('GroupInfo')->where(['group_id' => $groupId])->getField('wechat');
-        $this->assign('weixin', $weixin);
-        $this->assign('weixinUrl', 'https://eturl.cn/Rhq2wA?is_head=1');
+
 
         //我的成绩
       $this->setMyData();
 
+
+        //重置卡个数
+        if($userId){
+            $leftNum=M()->db(10, C('DB_CONFIG_DEMO'))->table('cofool_magicbox_card')->where(['user_id'=>$userId,'card_type'=>2,'use_time'=>0])->count();
+        }else{
+            $leftNum=0;
+        }
+        $this->assign('resetLeftNum',$leftNum);
+
         $this->display();
     }
 
@@ -1470,8 +1482,6 @@ class PkTopAction extends IdentityAction{
             $content = $this->fetch('itemWeek');
             $this->ajaxReturn(['status' => 1,'count' =>$phb[1],'data' => $content]);
         }
-
-
         }
 
 
@@ -1496,9 +1506,6 @@ class PkTopAction extends IdentityAction{
             $this->ajaxReturn(['status' => 1,'count' =>$phb[1],'data' => $content]);
         }
 
-
-
-
     }
 
     //其他排行榜

app/Tpl/Vip/Index/jiang.html

@@ -105,7 +105,7 @@
           <img src="__PUBLIC__/Home/images/g2023/quanshang.png" alt="">
         </div>
         <div class="item-cont-l">
-          <p class="t">全民炼股赛-券商专场</p> <p class="s">每月评奖,前3名或盈利2%以上瓜分<br>     比赛时间：2022-12-19 ~ 2023-11-30</p>
+          <p class="t">全民炼股赛-券商专场</p> <p class="s">每月评奖,前3名或盈利2%以上瓜分<br>     比赛时间：{$dsStatus.zjStartTime} ~ {$dsStatus.zjEndTime}</p>
         </div>
         <div class="item-cont-r">
           <p class="num">5000元</p><p class="num-sub">本月奖金池</p>
@@ -125,7 +125,7 @@
           <img src="__PUBLIC__/Home/images/g2023/quanmin.png" alt="">
         </div>
         <div class="item-cont-l">
-          <p class="t">全民分赛场</p> <p class="s">每周评奖，正盈利+即可瓜分<br>   比赛时间：2022-12-19 ~ 2023-11-30</p>
+          <p class="t">全民分赛场</p> <p class="s">每周评奖，正盈利+即可瓜分<br>   比赛时间：{$dsStatus.qmStartTime} ~ {$dsStatus.qmEndTime}</p>
         </div>
         <div class="item-cont-r">
           <p class="num">2000元</p><p class="num-sub">本月奖金池</p>
@@ -145,7 +145,7 @@
           <img src="__PUBLIC__/Home/images/g2023/niubai.png" alt="">
         </div>
         <div class="item-cont-l">
-          <p class="t">股市小白训练赛</p>  <p class="s">赠视频课程、名师带队，正盈利即可瓜分奖学金<br> 比赛时间：2022-12-19 ~ 2023-11-30</p>
+          <p class="t">股市小白训练赛</p>  <p class="s">赠视频课程、名师带队，正盈利即可瓜分奖学金<br> 比赛时间：{$dsStatus.nbStartTime} ~ {$dsStatus.nbEndTime}</p>
         </div>
         <div class="item-cont-r">
           <p class="num">500元</p> <p class="num-sub">本月奖金池</p>
@@ -161,7 +161,7 @@
           <img src="__PUBLIC__/Home/images/g2023/heima.png" alt="">
         </div>
         <div class="item-cont-l">
-          <p class="t">狙击黑马股训练赛</p><p class="s">赠炒股工具、视频课程，正盈利即可瓜分奖学金<br>比赛时间：2022-12-19 ~ 2023-11-30</p>
+          <p class="t">狙击黑马股训练赛</p><p class="s">赠炒股工具、视频课程，正盈利即可瓜分奖学金<br>比赛时间：{$dsStatus.hmStartTime} ~ {$dsStatus.hmEndTime}</p>
         </div>
         <div class="item-cont-r">
           <p class="num">300元</p> <p class="num-sub">本月奖金池</p>
@@ -177,7 +177,7 @@
           <img src="__PUBLIC__/Home/images/g2023/hengpan.png" alt="">
         </div>
         <div class="item-cont-l">
-          <p class="t">横盘突破训练赛</p><p class="s">赠炒股工具、视频课程，正盈利即可瓜分奖学金<br>比赛时间：2022-12-19 ~ 2023-11-30</p>
+          <p class="t">横盘突破训练赛</p><p class="s">赠炒股工具、视频课程，正盈利即可瓜分奖学金<br>比赛时间：{$dsStatus.hpStartTime} ~ {$dsStatus.hpEndTime}</p>
         </div>
         <div class="item-cont-r">
           <p class="num">200元</p> <p class="num-sub">本月奖金池</p>
@@ -216,7 +216,7 @@
         </div>
         <div class="step-cont-r">
           <p class="save-msg1"><img src="__PUBLIC__/Home/images/g2023/tl-left.png" alt="">领奖咨询<img src="__PUBLIC__/Home/images/g2023/tl-right.png" alt=""></p>
-          <img class="code-img" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg" >
+          <img class="code-img" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg" >
           <p class="code-msg">打开微信扫一扫，添加客服咨询</p>
         </div>
       </div>
@@ -263,7 +263,7 @@
           叩富十年赛场，让学习炒股更简单，更有趣！
         </div>
         <div class="step-cont-r">
-          <img class="code-img" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg" >
+          <img class="code-img" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg" >
           <p class="code-msg c3">打开微信扫一扫，添加客服咨询</p>
         </div>
       </div>
@@ -273,41 +273,6 @@
 
 <div class="mask" style="display: none;"></div>
 
-<!--<div class="camp-apply-pop pops" style="display: none;" id="popTixianNull">-->
-  <!--<div class="pop-main">-->
-    <!--<p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;">您的钱包还未开启</p>-->
-    <!--<p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px;" >报名参赛即可开启钱包</p>-->
-    <!--<p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>-->
-    <!--<p class="pop-sub1 inWx" style="font-size: 14px;">（详情咨询客服）</p>-->
-    <!--<p class="pop-sub1">-->
-    <!--</p>-->
-  <!--</div>-->
-  <!--<span class="t-pop-close"  ><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>-->
-<!--</div>-->
-
-<!--<div class="camp-apply-pop pops" style="display: none;" id="popTixian1">-->
-  <!--<div class="pop-main">-->
-    <!--<p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;" >您当前奖金不足20元</p>-->
-    <!--<p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px;">累计奖金超过20元可提现</p>-->
-    <!--<p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>-->
-    <!--<p class="pop-sub1 inWx" style="font-size: 14px;">（详情咨询客服）</p>-->
-    <!--<p class="pop-sub1">-->
-    <!--</p>-->
-  <!--</div>-->
-  <!--<span class="t-pop-close"  ><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>-->
-<!--</div>-->
-<!--<div class="camp-apply-pop pops" style="display: none;" id="popTixian2">-->
-  <!--<div class="pop-main">-->
-    <!--<p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;" >奖金提现请添加客服微信</p>-->
-    <!--<p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px;" >官方客服给您发微信红包</p>-->
-    <!--<p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>-->
-    <!--<p class="pop-sub1 inWx" style="font-size: 14px;">（详情咨询客服）</p>-->
-    <!--<p class="pop-sub1">-->
-    <!--</p>-->
-  <!--</div>-->
-  <!--<span class="t-pop-close"  ><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>-->
-<!--</div>-->
-
 
 
 
@@ -354,38 +319,7 @@
             }
         });
 
-        //输入手机号验证码后提交
-        $("#submitLogin").click(function () {
-            var mobile=$("#mobile").val();
-            var smsCode=$("#smsCode").val();
-            if(mobile==''){layer.msg('请输入手机号');return;}
-            if(smsCode==''){layer.msg('请输入验证码');return;}
-            var targetUrl=$('#popLogin').attr('targetUrl');
-            // var referer='{$_GET.referer}';
-            var  param={mobile:mobile,smsCode:smsCode,targetUrl:targetUrl};
-            $.post("/Index/telLogin",param,function(data){
-                // alert();
-                if(data.status == 2){
-                    layer.msg(data.info);
-                }
-                if(data.status == 1){
-                    $(".mask").hide();
-                    $("#popLogin").hide();
-
-                    if(typeof(targetUrl) == "undefined"||targetUrl==''){
-                        layer.msg('登录成功', 2,1,function(){ location.reload();  });
-                    }else{
-                        layer.msg('登录成功', 2,1,function(){
-                            $.cookie('denglu',targetUrl);
-                            location.reload();
-                        });
 
-
-                    }
-
-                }
-            });
-        });
         //进入交易
         $(".goTradeBtn").click(function () {
             window.event.stopPropagation();
@@ -431,7 +365,7 @@
   var time = 50;
   var mytimer=setInterval(scrollUp,time);
 </script>
-<script type="text/javascript" src="__PUBLIC__/js/popad_mini_jiang.js{$Think.config.js_version}111"></script>
+<script type="text/javascript" src="__PUBLIC__/js/popad_mini_jiang.js{$Think.config.js_version}34"></script>
 </html>
 
 <!--userId:{$user.userID}-userName:{$user.userName}-->
\ No newline at end of file

app/Tpl/Vip/Index/myInvite.html

@@ -131,6 +131,7 @@ $(function(){
         if('{$user.userID}'==''){
             $(".mask").show();
             $("#pop1").show();
+
         }else{
             //记录分享日志
             $.post('/Index/shareLog', {}, function (data) {    });
@@ -155,6 +156,10 @@ $(function(){
     $('#closeSucc').click(function(){
         location.reload();
     });
+    if('{$_GET.pop}'==1){
+        $(".mask").show();
+        $("#pop2weima").show();
+    }
 
 })
 </script>

app/Tpl/Vip/Index/myItemPc.html

@@ -11,11 +11,20 @@
             </div>
             <div class="info-data">
                 <div class="data"><span class="title">周盈利率：</span>
+                    <empty name="myData.lastweekup">
+                        <span class="num ">--</span>
+                    <else/>
                         <gt name="myData.lastweekup" value="0"><span class="num red">{$myData.lastweekup}%</span></gt>
-                    <eq name="myData.lastweekup" value="0"><span class="num ">{$myData.lastweekup}%</span></eq>
-                    <lt name="myData.lastweekup" value="0"><span class="num green">{$myData.lastweekup}%</span></lt>
+                        <eq name="myData.lastweekup" value="0"><span class="num ">0.00%</span></eq>
+                        <lt name="myData.lastweekup" value="0"><span class="num" style="color:#009933" >{$myData.lastweekup}%</span></lt>
+                    </empty>
+
+
+                </div>
+                <div class="data"><span class="title">月周转率：</span>
+                    <span class="num"><empty name="myData.monthzzl">--<else/>{$myData.monthzzl}%</empty></span>
+
                 </div>
-                <div class="data"><span class="title">月周转率：</span><span class="num">{$myData.monthzzl}%</span></div>
             </div>
 
             <!--<if condition="empty($myData['monthzzl']) or $myData['monthzzl'] eq 0">-->
@@ -62,8 +71,8 @@
                     <empty name="myData.lastweekup"> <span class="num ">--</span>
                         <else/>
                         <gt name="myData.lastweekup" value="0"><span class="num red">{$myData.lastweekup}%</span></gt>
-                        <eq name="myData.lastweekup" value="0"><span class="num ">{$myData.lastweekup}%</span></eq>
-                        <lt name="myData.lastweekup" value="0"><span class="num green">{$myData.lastweekup}%</span></lt>
+                        <eq name="myData.lastweekup" value="0"><span class="num ">0.00%</span></eq>
+                        <lt name="myData.lastweekup" value="0"><span class="num" style="color:#009933" >{$myData.lastweekup}%</span></lt>
                     </empty>
 
                 </div>

app/Tpl/Vip/Index/newPop.html

@@ -26,7 +26,7 @@
         <p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;">大赛福利及参赛问题咨询</p>
         <p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px" >加微信免费领取参赛权益、进大赛高手交流群
         </p>
-        <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>
+        <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg"/></p>
         <p class="code-msg" style="text-align: center">打开微信扫一扫，添加客服咨询</p>
     </div>
     <span class="t-pop-close"  ><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
@@ -37,15 +37,14 @@
         <p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;">打开微信扫一扫，邀请好友参赛</p>
         <!--<p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px" >加微信免费领取参赛权益、进大赛高手交流群-->
         <!--</p>-->
-        <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipds.jpg"/></p>
+        <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg"/></p>
         <button class="copyBtn" data-clipboard-action="copy"
-                style="background-color: #D80603;color: #fff;display: inline-block;padding: 10px 137px;"
+                style="background-color: #D80603;color: #fff;display: inline-block;padding: 10px 137px;border:0px;"
                 data-clipboard-text="http://m.jiantou8.com/Match/jiang" >复制大赛链接</button>
     </div>
     <span class="t-pop-close"  ><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
 </div>
 
-
 <script>
     $(function () {
 
@@ -68,6 +67,38 @@
             });
         });
 
+        //输入手机号验证码后提交
+        $("#submitLogin").click(function () {
+            var mobile=$("#mobile").val();
+            var smsCode=$("#smsCode").val();
+            if(mobile==''){layer.msg('请输入手机号');return;}
+            if(smsCode==''){layer.msg('请输入验证码');return;}
+            var targetUrl=$('#popLogin').attr('targetUrl');
+            // var referer='{$_GET.referer}';
+            var  param={mobile:mobile,smsCode:smsCode,targetUrl:targetUrl};
+            $.post("/Index/telLogin",param,function(data){
+                // alert();
+                if(data.status == 2){
+                    layer.msg(data.info);
+                }
+                if(data.status == 1){
+                    $(".mask").hide();
+                    $("#popLogin").hide();
+
+                    if(typeof(targetUrl) == "undefined"||targetUrl==''){
+                        layer.msg('登录成功', 2,1,function(){ location.reload();  });
+                    }else{
+                        layer.msg('登录成功', 2,1,function(){
+                            $.cookie('denglu',targetUrl);
+                            location.reload();
+                        });
+                    }
+                }
+            });
+        });
+
+
+
 
 
 

app/Tpl/Vip/Index/pop.html

 
 
-<div class="submit-info-pop pops web-pop" style="display: none;z-index: 1112" id="pop1" targetUrl="">
+    <div class="submit-info-pop pops web-pop" style="display: none;z-index: 1112" id="pop1" targetUrl="">
         <span class="t-pop-close"><img src="__PUBLIC__/images/h5/g2020/pop-close.png" alt=""></span>
-    <div class="p-msg">
             <!--报名成功-->
-    </div>
+            <div class="p-msg"></div>
         <div class="form-info-box"  >
             <div class="form-info-input">
                 <input type="tel" class="phone-input" placeholder="请输入手机号" maxlength="11">
@@ -25,7 +24,8 @@
             </div>
             <input class="form-info-btn bmStep2" type="button" value="立即报名">
         </div>
-</div>
+    </div>
+
 
 
 
@@ -61,34 +61,21 @@
         <!--</p>-->
         <p class="main-code-img">
             <!--<button class="camp-copyBtn copyBtn" data-clipboard-action="copy" data-clipboard-text="{$weixin}" >一键复制</button>-->
-            <a  href="{:WWW_URL}/Zjds"  target="_blank">
-                <button class="camp-copyBtn"   >参加更高奖金官方大赛 ></button>
-            </a>
+            <a  href="{:WWW_URL}/Zjds"  target="_blank"><button class="camp-copyBtn"   >参加更高奖金官方大赛 ></button></a>
 
         </p>
     </div>
     <span class="t-pop-close" refresh="1"><img src="__PUBLIC__/images/h5/g2020/pop-close.png" alt=""></span>
 </div>
 
-<!--购买成功-->
 
-<div class="buy-success-pop pops dialog-pop" style="display: none" id="popPaySucc">
-    <span class="t-pop-close"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
-    <div class="pop-main bold">
-        <div class="pop-main-img">
-            <br>
-            <img class="card-img" src="__PUBLIC__/Home/images/g2020/cz-card.png" alt="">
-        </div>
-        <div class="pop-main-msg red msg">资金重置卡购买成功</div>
-        <a href="javascript:;" class="box-go-buy" month="1" >立即购买</a>
-    </div>
-</div>
+
 
 <!--资金重置卡-->
-<div class="issue-class-pop box pops box-reset dialog-pop" style="display: none;">
+<div class="issue-class-pop box pops box-reset dialog-pop" style="display: none;" id="popChoose">
     <span class="t-pop-close"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
     <div class="underway-name-b">
-        <div class="b-title">您正在使用资金重置卡<span class="sub">（余1张）</span></div>
+        <div class="b-title">您正在使用资金重置卡<span class="sub">（余{$resetLeftNum|default=0}张）</span></div>
         <div class="underway-name"><span class="bold">训练区</span>
             <input type="radio" value="3" name="resetRadio"  checked class="check-in"><p class="c9 f12">当日使用，第二个交易日重置资金</p>
         </div>
@@ -102,31 +89,55 @@
     <input type="button" value="确定使用" class="issue-confirm" id="useReset">
     <div class="reset-msg">使用后，模拟金重置为初始值，<br>同时交易记录等全部清除，请谨慎使用</div>
 </div>
+
 <!--使用成功-->
-<div class="buy-success-pop pops dialog-pop" style="display: none;">
-    <span class="t-pop-close"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
+<div class="buy-success-pop pops dialog-pop" style="display: none;" id="popUseSucc">
+    <span class="t-pop-close" refresh="1"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
     <div class="pop-main">
-        <div class="pop-main-img">
-            <br>
+        <div class="pop-main-img"><br>
             <img class="use-img" src="__PUBLIC__/images/2023/use-img.png" alt="">
         </div>
         <div class="pop-main-msg red msg">使用成功</div>
         <p class="pop-main-img1">您的模拟金将重置为初始状态</p>
-        <p class="pop-main-img2">【全民炼股争霸赛-全民分赛场】</p>
+        <p class="pop-main-img2" id="resetGroupName" ></p>
+    </div>
+</div>
+
+<!--购买成功-->
+
+<div class="buy-success-pop pops dialog-pop" style="display: none" id="popPaySucc">
+    <span class="t-pop-close"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>
+    <div class="pop-main bold">
+        <div class="pop-main-img"><br>
+            <img class="card-img" src="__PUBLIC__/Home/images/g2020/cz-card.png" alt="">
+        </div>
+        <div class="pop-main-msg red msg">资金重置卡购买成功</div>
+        <a href="javascript:;" class="box-go-buy useResetCard"    >立即使用</a>
     </div>
 </div>
+
+
+
 <script>
     $(function () {
-        //点击重置卡图片
+
+        //点击右边侧边栏的重置卡图片
         $(".left-card1").click(function () {
             if('{$user.userID}'==''){
                 $(".mask").show();
                 $("#pop1").show();
+                // $("#popLogin").show();
             }else{
                 // location.href="/index/resetBalance";
-                location.href="{$Think.config.M_URL}/Box";
+                if('{$resetLeftNum}'>0){
+                    $(".mask").show();
+                    $("#popChoose").show();
+                }else{
+                    location.href='{$Think.config.WWW_URL}Lesson/pay2?type=reset';
+                }
             }
         });
+
         //点击右侧的 邀请好友分钱 图片
         $(".right4").click(function () {
                 location.href="/index/myInvite";
@@ -137,7 +148,6 @@
             // $('#password').parent().show();
             var mobileNumber=$(".phone-input").val();
             if(mobileNumber==''){layer.msg('请输入手机号');return;}
-            // var reg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\d{8})$/ ;
             var reg = /^((1[2-9]{1}[0-9]{1})+\d{8})$/ ;
             if(!reg.test(mobileNumber)){layer.msg('请输入有效的11位手机号码');return;}
 
@@ -161,7 +171,27 @@
             });
         });
 
+        //点击弹框里面的确定使用
+        $('#useReset').click(function(){
+            var use_type = $('input[name="resetRadio"]:checked').val();
+            console.log('使用类型:'+use_type);
 
+            $.post("/Index/saveCardConfig", {use_type: use_type}, function (data) {
+                if (data.status ==1) {
+                    if(use_type==3||use_type==4||use_type==5){
+                        var obj={3:'【训练区】',4:'【全民炼股争霸赛-全民分赛场】',5:'【全民炼股争霸赛-中金分赛场】'};
+                        $('#resetGroupName').html(obj[use_type]);
+                        $("#popChoose").hide();
+                        $("#popUseSucc").show();
+
+                    }else{
+                        layer.msg(data.info, 2,1,function(){ location.href='/Box';  });
+                    }
+                }else{
+                    layer.msg(data.info,1,1);
+                }
+            });
+        });
 
 
 

app/Tpl/Vip/Index/rule.html

@@ -56,7 +56,10 @@
                         </div>
                         <div class="item-d">
                             <!--<span class="item-t"><img src="__PUBLIC__/images/h5/g2020/wp4.png" alt=""></span>-->
-                            <p class="item-p">4、初始资产统一为100万元虚拟资金；周赛期间如果亏损较多，可以购买“重置卡”进行重置资产到初始资金100万，<span class="red">当天（交易日）使用次日（交易日）生效</span>。<a href="javascript:;" class="buy-card">立即购买资金重置卡>></a></p>
+                            <p class="item-p">4、初始资产统一为100万元虚拟资金；周赛期间如果亏损较多，可以购买“重置卡”进行重置资产到初始资金100万，
+                                <span class="red">当天（交易日）使用次日（交易日）生效</span>。
+                                <a href="javascript:;" class="buy-card">立即购买资金重置卡>></a>
+                            </p>
                         </div>
                     </div>
                     <div class="time-contest-item">

app/Tpl/Vip/Index/withdraw.html

@@ -67,7 +67,7 @@
       </div>
       <div class="withdraw-panel" style="display: none;">
         <table>
-          <thead><tr><th>奖金来源</th><th>金额</th><th>时间</th><th>状态</th></tr> </thead>
+          <thead><tr><th>记录</th><th>金额</th><th>时间</th><th>状态</th></tr> </thead>
           <tbody>
             <foreach name="itemList2" item="vo">
               <tr>
@@ -97,7 +97,7 @@
   <div class="pop-main">
     <p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;">您的钱包还未开启</p>
     <p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px;" >报名参赛即可开启钱包</p>
-    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>
+    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg"/></p>
     <p class="pop-sub1 inWx" style="font-size: 14px;">（微信扫一扫，添加客服）</p>
     <p class="pop-sub1">
     </p>
@@ -109,7 +109,7 @@
   <div class="pop-main">
     <p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;" >您当前奖金不足20元</p>
     <p class="main-msg-i okTxt" style="color: #333333;margin-bottom: 15px;">累计奖金超过20元可提现</p>
-    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>
+    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg"/></p>
     <p class="pop-sub1 inWx" style="font-size: 14px;">（微信扫一扫，添加客服）</p>
     <p class="pop-sub1">
     </p>
@@ -121,7 +121,7 @@
   <div class="pop-main">
     <p class="main-msg-i okTxt" style="color: #333333;" >提现申请已发起</p>
     <p style="text-align: center;font-weight: bold;font-size: 18px;color: #ff2336;margin-top: 5px;margin-bottom: 15px;" >奖金由官方客服给您发微信红包</p>
-    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/jiangWx.jpg"/></p>
+    <p style="margin-left: 29%;"><img style="width: 60%;" src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg"/></p>
     <p class="pop-sub1 inWx" style="font-size: 14px;">（微信扫一扫，添加客服）</p>
     </div>
   <span class="t-pop-close"><img src="__PUBLIC__/Home/images/g2020/trade-close.png" alt=""></span>

app/Tpl/Vip/PkTop/index.html

@@ -19,6 +19,7 @@
     <script type="text/javascript" src="__PUBLIC__/js/layer_mobile/layer.js"></script>
     <script type="text/javascript" src="__PUBLIC__/js/clipboard.min.js"></script>
     <script type="text/javascript" src="__PUBLIC__/Home/js/app.js{$Think.config.js_version}"></script>
+
     <script type="text/javascript" src="__PUBLIC__/Home/js/pktop.js?_={:date('Y-m-d-H:i:s',filemtime('./Public/Home/js/pktop.js'))}"></script>
     <script type="text/javascript" src="__PUBLIC__/Home/js/lottery.js?_={:date('Y-m-d-H:i:s',filemtime('./Public/Home/js/lottery.js'))}"></script>
     <script type="text/javascript" src="__PUBLIC__/js/jquery.cookie.js"></script>
@@ -36,9 +37,6 @@
             margin-right: -8px;
         }
         .overHide{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-
-    </style>
-    <style>
     </style>
     <script type="text/javascript">
         AppBridge.init();
@@ -115,10 +113,10 @@
                     </div>
                     <div class="code-cont2">
                         <div class="code">
-                            <img src="__PUBLIC__/Home/images/g2020/2023ewm/zhongjinDs.jpg" alt="">
+                            <img src="__PUBLIC__/Home/images/2023ewm/vipDs.jpg" alt="">
                             <p class="save-msg">保存截图，使用微信扫一扫</p>
-                            <p class="save-code">微信号：{$weixin}</p>
-<!--                            <button class="copy-code-btna copbtn copyWx" data-clipboard-action="copy" data-clipboard-text="{$weixin}" >复制微信</button>-->
+                            <!--<p class="save-code">微信号：{$weixin}</p>-->
+
                             <button class="recognition-code jumpWx" weixinUrl="{$weixinUrl}" >进入微信一键添加</button>
                         </div>
                     </div>
@@ -315,7 +313,6 @@
 
         //资金重置卡
         // $('.bottom-j-left').click(function() {
-        //     // $.post('/Public/statistics',{type_:'Allex_fund_reset'},function () {})
         //     if ('{$user.userID}' > 0) {
         //         location.href = '{:M_URL}/Box';
         //     } else {
@@ -327,6 +324,33 @@
         //     }
         // });
 
+        //立即购买资金重置卡
+        $('.buy-card').click(function() {
+            if('{$user.userID}'==''){
+                if(mfrom[1]>0){
+                    AppBridge.goLogin();
+                }else{
+                    $('#baomingPOP').attr('targetUrl','{:M_URL}/Pay/apply_pay?type=serviceReset');
+                    animPop('#baomingPOP');
+                }
+            }else{
+                location.href = '{:M_URL}/Pay/apply_pay?type=serviceReset';
+            }
+        });
+
+        //立即获得重置卡
+        // $('.getNow').click(function() {
+        //     if('{$user.userID}'==''){
+        //         if(mfrom[1]>0){
+        //             AppBridge.goLogin();
+        //         }else{
+        //             $('#baomingPOP').attr('targetUrl','{:M_URL}/Box');
+        //             animPop('#baomingPOP');
+        //         }
+        //     }else{
+        //         location.href = '{:M_URL}/Box';
+        //     }
+        // });
 
 
         //开户链接跳转
@@ -340,16 +364,16 @@
         if('{$_GET.clickFlag}'==1){
             $(".baoming").click();
         }
-        //刷新后跳转
+
+        //跳转
         var denglu=$.cookie('denglu');
         if(denglu!=''&&denglu!=null){
             $.cookie('denglu','');
-            if('{$resetLeftNum}'>0){
-                location.href=denglu+"?popFlag=5";
-            }else{
             location.href=denglu;
+
+
         }
-        }
+
 
     });
 

app/Tpl/Vip/PkTop/myItem.html

@@ -17,7 +17,7 @@
                             <else/>
                             <gt name="myData.lastweekup" value="0"><td class="num red">{$myData.lastweekup}%</td></gt>
                             <eq name="myData.lastweekup" value="0"><td class="num ">{$myData.lastweekup}%</td></eq>
-                            <lt name="myData.lastweekup" value="0"><td class="num green">{$myData.lastweekup}%</td></lt>
+                            <lt name="myData.lastweekup" value="0"><td class="num  " style="color:#009933"  >{$myData.lastweekup}%</td></lt>
                         </empty>
 
                         <td class="num" style="text-align: right;">
@@ -69,7 +69,7 @@
                         <else/>
                             <gt name="myData.lastweekup" value="0"><td class="num red">{$myData.lastweekup}%</td></gt>
                             <eq name="myData.lastweekup" value="0"><td class="num ">{$myData.lastweekup}%</td></eq>
-                            <lt name="myData.lastweekup" value="0"><td class="num green">{$myData.lastweekup}%</td></lt>
+                            <lt name="myData.lastweekup" value="0"><td class="num" style="color:#009933"  >{$myData.lastweekup}%</td></lt>
                         </empty>
                         <td class="num" style="text-align: right;">
                             <empty name="myData.monthzzl">--<else/>{$myData.monthzzl}%</empty>