elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
master
liuweiwen 5 years ago
parent 43c1f7832a 15ce00396f
commit 8a7b1a9768
5 changed files with 98 additions and 22 deletions
Show Stats Download Patch File Download Diff File

9
Application/Admin/Controller/MemberController.class.php
Unescape Escape View File

@ -788,13 +788,20 @@ class MemberController extends ThinkController
$map['server_name'] = $_REQUEST['server_name'];
unset($_REQUEST['server_name']);
}
if (isset($_REQUEST['promote_id'])) {
$map['promote_id'] = $_REQUEST['promote_id'];
unset($_REQUEST['promote_id']);
}
// $map['type'] = 1;
// $map['login_time'] = ['exp', 'login_time<>0'];
$extend = array();
$extend['map'] = $map;
$count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
$sql = "select count(user_id) as count from ({$count})t";
$count = M('UserLoginRecord','tab_')->query($sql);
$this->m_title = '登录记录';
$this->assign('user_count',$count[0]['count']);
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
parent::lists("UserLoginRecord", $p, $extend['map']);

42
Application/Admin/View/Member/login_record.html
Unescape Escape View File

@ -90,6 +90,21 @@
<div class="input-list">
<input type="text" name="login_ip" class="" placeholder="登录IP" value="{:I('login_ip')}">
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
<option value="">请选择推广员等级</option>
<option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
<option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
<option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
<option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
</select>
-
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
</select>
</div>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search"
url="{:U('Member/login_record','model='.$model['name'] . '&row=' . I('row'),false)}">
@ -139,6 +154,10 @@
</td>
</tr>
</volist>
<tr>
<td colspan="2">合计</td>
<td colspan="4">&#12288;&#12288;登录玩家：{$user_count}人 </td>
</tr>
</empty>
</tbody>
</table>
@ -178,6 +197,7 @@
highlight_subnav("{:U('Member/login_record')}");
$(function () {
<volist name = ":I('get.')" id = "vo" > Think.setValue('{$key}', "{$vo}");
</volist >
$(".select_gallery").select2();
@ -276,6 +296,28 @@
$("#game_type").change();
});
$("#game_name").change();
var promote_id = "{:I('promote_id')}";
$("#promote_level").change(function(){
$.ajax({
url:"{:U('Ajax/getPromotersByLevel')}",
type:"get",
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
data = response.data;
for (var i in data){
str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
}
$("#promote_id").empty();
$("#promote_id").append(str);
$("#promote_id").select2();
}
})
});
$("#promote_level").change();
})
</script>
</block>

24
Application/Home/View/default/Apply/my_game.html
Unescape Escape View File

@ -11,6 +11,14 @@
.btn-role-border {
border-left: 0;
}
.clipboard-btn {
width: 60px;
height: 28px;
border: 0;
border-radius: 3px;
color: #fff;
background-color: #3A97FF;
}
</style>
</block>
@ -260,13 +268,13 @@
<div class="game-window-content-eveyone" style="display: block;color: #3A97FF;font-size: 1.1rem;">
<label style="margin-right: 20px;">下载地址:</label>
<span id="game_link_address" style="word-wrap: break-word;white-space: normal;"></span>
<button id="clipboard-btn" style="display: none;" data-text="">复制</button>
</div>
</div>
<div class="game-window-content" style="text-align: center;width: auto;padding-top: 5px;">
<div class="game-window-content-eveyone" style="display: block;color: #999;font-size: 1.1rem;">
<span>复制成功,ctrl+v粘贴即可</span>
<span id="copy_msg">复制成功,ctrl+v粘贴即可</span>
<button class="clipboard-btn" id="clipboard-btn" style="display: none;" data-text="">复制</button>
</div>
</div>
@ -887,12 +895,22 @@
});
});
new ClipboardJS('#clipboard-btn', {
var clipboard = new ClipboardJS('#clipboard-btn', {
text: function(trigger) {
return trigger.getAttribute('data-text');
}
})
clipboard.on('success', function (e) {
$('#copy_msg').text('复制成功,ctrl+v粘贴即可');
$('#clipboard-btn').hide();
});
clipboard.on('error', function (e) {
$('#copy_msg').text('自动复制失败，请点击复制按钮');
$('#clipboard-btn').show();
});
$('#submit').click(function () {
var url = $(this).attr('url');
var query = $('.jssearch').find('input').serialize();

41
Application/Mobile/View/User/recharge.html
Unescape Escape View File

@ -19,14 +19,14 @@
<a href="{:U('/User/index')}" class="arrows"></a>
</div>
<div class="recharge-tabbar">
<li class="selected" name="currency">平台币充值</li>
<li name="iscurrency">折扣充值</li>
<li class="selected" name="currency" style="margin-left:0;">平台币充值</li>
<!-- <li name="iscurrency">折扣充值</li> -->
</div>
</div>
<div class="content">
<div class="recharge-flat" >
<div class="recharge-flat" style="width: 6.9rem;height: 2.9rem;">
<form class="" id="form1" action="{:U('User/recharge')}" method="post">
<div class="flat-box">
<div class="flat-info">
@ -38,13 +38,13 @@
<div class="flat-box">
<div class="flat-info">
<div>充值金额</div>
<input type="text" class="rcmoney1" name="pay_amount" placeholder="请输入金额，最低金额1元" style="text-align:right;width: 2.88rem">
<input type="text" class="rcmoney1" name="pay_amount" placeholder="请输入金额，最低金额1元" style="text-align:right;width: 2.88rem" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
</div>
</div>
<div class="flat-box">
<div class="flat-info">
<div>获得平台币</div>
<input type="text" class="rcplatform" name="balance" readonly placeholder="" value="" style="text-align:right;">
<input type="text" class="rcplatform rcmoney1ptb" name="balance" readonly placeholder="" value="" style="text-align:right;">
</div>
</div>
<div class="recharge-payment">
@ -85,7 +85,7 @@
</div>
</form>
</div>
<div class="recharge-discount" style="display: none;">
<!-- <div class="recharge-discount" style="display: none;">
<form class="" id="form2" action="{:U('User/recharge')}" method="post">
<div class="flat-box">
<div class="flat-info">
@ -108,7 +108,7 @@
<div class="flat-box">
<div class="flat-info">
<div>充值金额</div>
<input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额，最低金额1元" style="width:2.88rem;text-align:right;">
<input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额，最低金额1元" style="width:2.88rem;text-align:right;" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
</div>
</div>
<div class="flat-box">
@ -122,7 +122,7 @@
<div class="flat-box">
<div class="flat-info">
<div>实付金额</div>
<input type="text" class="txt realmoney" name="realmoney" readonly style="text-align:right;">
<input type="text" class="txt rcmoney2bb realmoney" name="realmoney" readonly style="text-align:right;">
</div>
</div>
<div class="flat-box">
@ -133,7 +133,7 @@
</div>
<div class="recharge-payment">
<div class="title">请选择支付方式</div>
<div class="alipay">
<div class="alipay bindway">
<div class="alipay_img">
<img src="__IMG__/zhifubaozhifu.png" alt="">
<div class="img_text">
@ -143,12 +143,12 @@
</div>
<div class="radio_select">
<input id="zhifubao1" name="way" type="radio" value="1" checked>
<input id="zhifubao1" name="way1" type="radio" value="1" checked>
<label for="zhifubao1" class="radio-label"></label>
</div>
</div>
<div class="alipay" id="ch_weixin1">
<div class="alipay bindway" id="ch_weixin1">
<div class="alipay_img">
<img src="__IMG__/weixin.png" alt="">
<div class="img_text">
@ -157,7 +157,7 @@
</div>
</div>
<div class="radio_select">
<input id="weixin1" name="way" type="radio" value="2" >
<input id="weixin1" name="way1" type="radio" value="2" >
<label for="weixin1" class="radio-label"></label>
</div>
</div>
@ -169,7 +169,7 @@
</div>
</form>
</div>
</div>
</div> -->
@ -197,6 +197,14 @@
sib.find('.t-tabpan').eq(index).addClass('active').siblings().removeClass('active');
return false;
});
//点击父标签切换radio
$(".alipay").click(function(){
$(this).children(".radio_select").children("input").prop("checked", true);
})
//阻止事件冒泡
$(".radio_select").click(function(){
event.stopPropagation();
})
$('.jssbtn').click(function() {
var that = $(this);
if (that.hasClass('on')) {
@ -237,7 +245,7 @@
$('.rcmoney').keyup(function() {
var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-discount'),pf=parent.find('.rcplatform');
var rm = parent.find('.realmoney');
if(val == ""){return true;}
if(val == ""){$(".rcmoney2bb").val(0);$(".rcplatform").val(0);return true;}
if (val) {
if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
pf.val(val);
@ -258,7 +266,7 @@
$('.rcmoney1').keyup(function() {
var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-flat'),pf=parent.find('.rcplatform');
var rm = parent.find('.realmoney');
if(val == ""){return true;}
if(val == ""){$(".rcmoney1ptb").val(0);return true;}
if (val) {
if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
pf.val(val);
@ -360,7 +368,8 @@
popmsg.msg(result.info);
}
},
error:function(){
error:function(res){
console.log(res)
alert("服务端异常");
}
})

BIN
Public/Mobile/images/juxing3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Write Preview
Loading…
Cancel
Save