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

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
chenzhi 5 years ago
parent dfff8b6240 ede4cdd96e
commit 76b561810d
4 changed files with 69 additions and 17 deletions
Show Stats Download Patch File Download Diff File

5
Application/Admin/Controller/ConsoleController.class.php
Unescape Escape View File

@ -94,9 +94,10 @@ class ConsoleController extends Think {
$this->modifyLogin(1569686400);
}
public function modifyLoginGenerate()
public function modifyLoginGenerate($start_time=0)
{
$this->modifyLogin(strtotime(date("Y-m-d"))-86400);
$start_time = $start_time ? $start_time : date('Y-m-d', strtotime('-1 day'));
$this->modifyLogin(strtotime($start_time));
}
/**

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

@ -169,14 +169,16 @@ class MemberController extends ThinkController
$map['is_platform'] = 0;
//数据
$usermodel = M('user', 'tab_');
$sql1 = $usermodel->field('tab_user.*,IFNULL(sum(b.pay_amount),0) as deposit_total')
$userField = "tab_user.id,device_number,age_status,account,balance,gold_coin,alipay,tab_user.promote_id,register_type,tab_user.promote_account,register_time,lock_status,register_way,register_ip,login_time,check_status";
$sql1 = $usermodel->field("{$userField},IFNULL(sum(b.pay_amount),0) as deposit_total")
->join('left join tab_deposit AS b ON tab_user.id = b.user_id AND b.pay_status = 1')
->where($map)
->group('tab_user.id')
->where($hav)
// ->order($order)
->select(false);
// $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
// ->join('left join tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1')
// ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
@ -209,7 +211,6 @@ class MemberController extends ThinkController
->select();
}
//计数
$sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1')

2
Application/Admin/Controller/ToolController.class.php
Unescape Escape View File

@ -125,7 +125,7 @@ class ToolController extends ThinkController {
*/
public function smsset($value='')
{
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew");
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang");
$this->meta_title = '短信设置';
$this->m_title = '短信设置';

72
Application/Admin/View/Tool/smsset.html
Unescape Escape View File

@ -9,6 +9,7 @@
<li data-tab="tab2"><a href="javascript:void(0);" >阿里大鱼（老）</a></li>
<li data-tab="tab3"><a href="javascript:void(0);" >极光</a></li>
<li data-tab="tab4"><a href="javascript:void(0);" >阿里大鱼（新）</a></li>
<li data-tab="tab5"><a href="javascript:void(0);" >中网</a></li>
</ul>
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">用于配置短信通知功能相关参数的功能</p>
@ -297,17 +298,66 @@
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="{$m_url}">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
<div class="tab-content tabcon1711 tabcon17112">
<div id="tab5" class="tab-pane tab5">
<form action="{:U('saveTool')}" method="post" class="form-horizontal zhongwang form_info_ml">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">账号</td>
<td class="r table_radio">
<input name="config[smtp_account]" type="text" value="{$zhongwang['smtp_account']}" class="">
<span class="notice-text">账号</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">密码</td>
<td class="r table_radio">
<input name="config[smtp_password]" type="text" value="{$zhongwang['smtp_password']}" class="">
<span class="notice-text">密码</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">每日IP发送数量</td>
<td class="r table_radio">
<input name="config[limit]" type="text" value="{$zhongwang['limit']}" class="">
<span class="notice-text">0或空则不限制</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">启用状态</td>
<td class="r table_radio">
<span class="form_radio">
<label>
<input type="radio" name="status" value="0" <eq name="zhongwang_data['status']" value="0">checked="checked"</eq>> 禁用
</label>
<label>
<input type="radio" name="status" value="1" <eq name="zhongwang_data['status']" value="1">checked="checked"</eq>> 启用
</label>
</span>
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="zhongwang">
<input type="submit" value="保存" target-form="zhongwang" class="submit_btn form_btn ajax-post mlspacing">
</form>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="{$m_url}">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">

Write Preview
Loading…
Cancel
Save