Merge branch 'release' of 47.111.118.107:wmtx/platform into fix/admin_second_optimization

master
chenzhi 5 years ago
commit 6c6dddf6ac

@ -149,7 +149,7 @@ class ToolController extends ThinkController {
*/
public function smsset($value='')
{
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang");
$this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang,juhedata");
$this->meta_title = '短信设置';
$this->m_title = '短信设置';
@ -166,7 +166,7 @@ class ToolController extends ThinkController {
*/
public function age($value='')
{
$this->BaseConfig("tool_age");
$this->BaseConfig("tool_age,juhe_age");
$this->meta_title = '实名认证';
$this->m_title = '实名认证';

@ -4,6 +4,10 @@
<!--end 添加至常用设置悬浮弹窗-->
<div class="cf main-place top_nav_list navtab_list">
<ul class="tabnav1711 fr jstabnav">
<li data-tab="tab1" class="current"><a href="javascript:void(0);" >阿里云实名</a></li>
<li data-tab="tab2"><a href="javascript:void(0);" >聚合数据实名</a></li>
</ul>
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">用于配置实名认证相关参数的功能;需要到阿里云创建实名认证接口参数</p>
</div>
@ -35,8 +39,8 @@
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="tool_age">
@ -44,8 +48,43 @@
</form>
</div>
</div>
<div class="tab-content tabcon1711 tabcon17112">
<div id="tab2" class="tab-pane tab2">
<form action="{:U('saveTool')}" method="post" class="form-horizontal juhe_age form_info_ml">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">Appkey</td>
<td class="r table_radio">
<input name="config[appkey]" type="text" value="{$juhe_age['appkey']}" class="input-large">
<span class="notice-text">阿里云实名认证接口 控制台->云市场->appcode</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="juhe_age['status']" value="0">checked="checked"</eq>> 禁用
</label>
<label>
<input type="radio" name="status" value="1" <eq name="juhe_age['status']" value="1">checked="checked"</eq>> 启用
</label>
</span>
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="juhe_age">
<input type="submit" value="保存" target-form="juhe_age" class="submit_btn form_btn ajax-post mlspacing">
</form>
</div>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">

@ -10,6 +10,7 @@
<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>
<li data-tab="tab6"><a href="javascript:void(0);" >聚合数据</a></li>
</ul>
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">用于配置短信通知功能相关参数的功能</p>
@ -347,6 +348,56 @@
</form>
</div>
</div>
<div class="tab-content tabcon1711 tabcon17112">
<div id="tab6" class="tab-pane tab6">
<form action="{:U('saveTool')}" method="post" class="form-horizontal juhedata form_info_ml">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l noticeinfo">模板id</td>
<td class="r table_radio">
<input name="config[tpl_id]" type="text" value="{$juhedata['tpl_id']}" class="">
<span class="notice-text">模板id</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">AppKey</td>
<td class="r table_radio">
<input name="config[key]" type="text" value="{$juhedata['key']}" class="">
<span class="notice-text">AppKey</span>
</td>
</tr>
<tr>
<td class="l noticeinfo">每日IP发送数量</td>
<td class="r table_radio">
<input name="config[limit]" type="text" value="{$juhedata['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="juhedata['status']" value="0">checked="checked"</eq>> 禁用
</label>
<label>
<input type="radio" name="status" value="1" <eq name="juhedata['status']" value="1">checked="checked"</eq>> 启用
</label>
</span>
<span class="notice-text">短信设置启用状态</span>
</td>
</tr>
</tbody>
</table>
<input type="hidden" name="name" value="juhedata">
<input type="submit" value="保存" target-form="juhedata" class="submit_btn form_btn ajax-post mlspacing">
</form>
</div>
</div>
<div class="common_settings">

@ -1748,4 +1748,8 @@ ALTER TABLE `sj_game_user`.`sj_user`
ADD COLUMN `platform_account` varchar(60) NULL COMMENT '游戏渠道玩家账号' AFTER `age_type`;
ALTER TABLE `tab_deposit`
ADD COLUMN `old_change_promote_id` int(11) NULL DEFAULT 0 COMMENT '修改配置前渠道' ,
ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ;
ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ;
-- zyx 20200515
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhedata', '聚合数据', '{\"tpl_id\":\"215303\",\"key\":\"1aa07a33b6d6408e835e416fafcd6f22\",\"limit\":\"\",\"status\":\"1\"}', NULL, 1, 1, 1589361782);
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhe_age', '聚合身份认证', '{\"appkey\":\"80427f4769c6938f12a870f51014ddbe\",\"status\":\"1\"}', NULL, 1, 1, 1464164373);

Loading…
Cancel
Save