Skip to content

C
cof_vip
Commit be38ace9 authored by houdong's avatar houdong
Browse files
Options

合并分支 'houdong' 到 'master' 

Houdong

查看合并请求 !2
parents 23c92ce5 9348dd0f
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 58 deletions
Public/Home/css/g2023.css
View file @ be38ace9
......@@ -694,6 +694,10 @@ input:-ms-input-placeholder {color: #c8c8c8;}
.withdraw-panel table tbody tr td.green{
color: #15b661;
}
.withdraw-panel table tbody tr td.status img{
width: 18px;
position: relative;top: 3px;cursor: pointer;
}
.no-data-c{
color: #333333;font-size: 16px;
text-align: center;
......
Public/Home/js/pktop.js
View file @ be38ace9
......@@ -224,7 +224,15 @@ function sendSmsAndSubmit(){
//可能有各种错误提示
layer.open({content:'登录成功',skin: 'msg',time: 2,
end:function () {
location.href=targetUrl;
// location.href=targetUrl;
if(targetUrl!=''){
$.cookie('denglu',targetUrl);
location.href='/PkTop';
}else{
window.location.reload();
}
}});
}else{
// $('#baomingPOP').hide();
......
app/Lib/Action/Vip/PkTopAction.class.php
View file @ be38ace9
......@@ -40,6 +40,13 @@ class PkTopAction extends IdentityAction{
$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();
}else{
$leftNum=0;
}
$this->assign('resetLeftNum',$leftNum);
}
}
......
app/Tpl/Vip/Index/withdraw.html
View file @ be38ace9
......@@ -76,7 +76,11 @@
<td>{$vo.item_time}</td><td><eq name="vo.status" value="1">已完成<else/>待审核</eq> </td>
</tr>
</foreach>
<tr>
<td>提现</td>
<td class="withdraw-num green"><span class="num">¥{$vo.item_money}11元</span></td>
<td>{$vo.item_time}11</td><td class="status">待审核 <img src="__PUBLIC__/Home/images/g2023/check-img.png" alt=""></td>
</tr>
</tbody>
</table>
......@@ -126,19 +130,18 @@
</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="popZixun">-->
<!--<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>-->
<!--</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="popTixian3">
<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/vipDs.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>
<include file="newPop" />
<include file="footer" />
......
app/Tpl/Vip/PkTop/index.html
View file @ be38ace9
......@@ -171,15 +171,15 @@
</div>
<!--更多大赛-->
<div class="contest-body-detail" style="display: none;">
<div class="contest-setting contest-item contest-bg">
<div class="title-p">更多大赛 更多奖金</div>
<div class="setting-info">
<img class="set-info-t" src="__PUBLIC__/images/h5/g2020/hycs-img.png" alt="">
<include file="moreDs"/>
</div>
</div>
</div>
<!--<div class="contest-body-detail" style="display: none;">-->
<!--<div class="contest-setting contest-item contest-bg">-->
<!--<div class="title-p">更多大赛 更多奖金</div>-->
<!--<div class="setting-info">-->
<!--<img class="set-info-t" src="__PUBLIC__/images/h5/g2020/hycs-img.png" alt="">-->
<!--<include file="moreDs"/>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<include file="bottom"/>
<div class="foot-fix"> </div>
......@@ -292,17 +292,7 @@
// });
//点关闭刷新页面取状态
// $("#closeSucc").click(function () {
// $('#popPkTopSucc').hide();
// window.location.reload();
// });
//根据参数显示不同的标签页
// if('{$_GET.viewPage}'=='1'){ $('.en-li').eq(0).click(); }
// if('{$_GET.viewPage}'=='2'){ $('.en-li').eq(1).click(); }
// if('{$_GET.viewPage}'=='3'){ $('.en-li').eq(2).click(); }
// if('{$_GET.viewPage}'=='4'){ $('.en-li').eq(3).click(); }
//点用户名和头像跳转到该大赛的旧的交易页
......
app/Tpl/Vip/PkTop/static_price.html
View file @ be38ace9
......@@ -59,20 +59,16 @@
<span class="star-bg"></span>
</div>
</div>
<div class="time-contest-item box-avt-msg">
<span class="time-t" style="width:100%;">
<img class="icon" style="width: 20px;height: 20px;" src="__PUBLIC__/Home/images/g2020/allex_icon.png" alt="">模拟资金重置卡
<!--<div class="time-contest-item box-avt-msg">-->
<!--<span class="time-t" style="width:100%;">-->
<!--<img class="icon" style="width: 20px;height: 20px;" src="__PUBLIC__/Home/images/g2020/allex_icon.png" alt="">模拟资金重置卡-->
<!--<a href="javascript:;"-->
<!--style="-webkit-border-radius: 20px;font-size: 12px;color: #ffffff;background-color: #F98935;-->
<!--padding: 0px 8px;float: right;line-height: 23px;margin-top: 2px;font-weight: normal;" class="getNow">立即获得重置卡</a>-->
<!--</span>-->
<!--<p class="msg-l1">使用后，模拟金重置为初始一百万，同时收益率、持仓、交易记录等全部清除。</p>-->
<!--<p class="msg-l2">注：当个交易日使用，第二个交易日生效。<br>（交易日指早9点-下午4点开盘期间）</p>-->
<!--</div>-->
<!--<a href="{:M_URL}/Box" style="-webkit-border-radius: 20px;font-size: 12px;color: #ffffff;background-color: #F98935;padding: 0px 8px;float: right;line-height: 23px;margin-top: 2px;font-weight: normal;">立即获得重置卡</a>-->
</span>
<p class="msg-l1">使用后，模拟金重置为初始一百万，同时收益率、持仓、交易记录等全部清除。</p>
<p class="msg-l2">注：当个交易日使用，第二个交易日生效。<br>（交易日指早9点-下午4点开盘期间）</p>
</div>
<div class="time-contest-item box-avt-msg" style="padding-top: 5px;">
<a href="{:M_URL}/Zjds" target="_blank">
<img src="__PUBLIC__/images/2022/vipBottom1.png" alt="">
......
app/Tpl/Vip/PkTop/static_rule.html
View file @ be38ace9
......@@ -10,6 +10,13 @@
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<style>
.zjCard{
-webkit-border-radius: 20px;font-size: 12px;color: #ffffff;background-color: #F98935;padding: 0px 8px;
}
</style>
<div class="contest-setting contest-item">
<div class="title-p">大赛规则</div>
<div class="setting-info">
......@@ -26,20 +33,22 @@
<span class="item-t"><img src="__PUBLIC__/Home/images/g2020/w3.png" alt=""></span>
<p class="item-p1">周转率需＞0%（每月必须交易一次），才可参加周赛评奖。全仓买入卖出一次的周转率算作100%；</p>
</div>
<div class="item-d">
<span class="item-t"><img src="__PUBLIC__/Home/images/g2020/w4.png" alt=""></span>
<p class="item-p1">初始资产统一为100万元虚拟资金；周赛期间如果亏损较多，可以购买“重置卡”进行重置资产到初始资金100万，
<span class="red">当天（交易日）使用次日（交易日）生效。</span><br>
<!--<a href="javascript:;" class="buy-card">立即购买资金重置卡></a>-->
<!--<div class="item-d">-->
<!--<span class="item-t"><img src="__PUBLIC__/Home/images/g2020/w4.png" alt=""></span>-->
<!--<p class="item-p1">初始资产统一为100万元虚拟资金；周赛期间如果亏损较多，可以购买“重置卡”进行重置资产到初始资金100万，-->
<!--<span class="red">当天（交易日）使用次日（交易日）生效。</span><br>-->
<!--<a href="{:M_URL}/Box" style="">立即获得重置卡</a>-->
<!--<gt name="resetLeftNum" value="0">-->
<!--<a href="javascript:;" class="buy-card useResetCard">使用资金重置卡 X{$resetLeftNum}</a>-->
<!--<else/>-->
<!--<a href="javascript:;" class="buy-card">立即购买资金重置卡</a>-->
<!--</gt>-->
<!--</p>-->
<!--</div>-->
<gt name="resetLeftNum" value="0">
<a href="{:M_URL}/Box?popFlag=5" class="zjCard">立即使用重置卡 X{$resetLeftNum}</a>
<else/>
<a href="javascript:;" class="zjCard getResetCard" >立即获得重置卡</a>
</gt>
</p>
</div>
</div>
<div class="time-contest-item">
<span class="time-t"> <img class="icon" src="__PUBLIC__/Home/images/g2020/pm-icon1.png" alt="">排名规则</span>
......@@ -84,4 +93,23 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
<script type="text/javascript">
//立即获得重置卡
$('.getResetCard').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';
}
});
</script>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment