diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index 37f290871..e1653bac4 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -126,7 +126,9 @@ class PromoteGameRatioController extends ThinkController
$params = I('get.');
$id = $params['id'] ?? 0;
$id = intval($id);
+ $metaTitle = '游戏分成比例申请';
if ($id) {
+ $metaTitle .= '--修改';
$field = 'promote_id, game_id, ratio, begin_time, end_time, remark';
$map['id'] = $id;
$promoteGameRatio = D(self::MODEL_NAME)->field($field)->where($map)->find();
@@ -138,7 +140,7 @@ class PromoteGameRatioController extends ThinkController
$this->assign('gameList', getAllGameList());
$this->assign('promoteList', getPromoteByLevel(1));
- $this->meta_title = '游戏分成比例申请';
+ $this->meta_title = $metaTitle;
$this->display();
}
}
diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html
index 776077526..3fcd39081 100644
--- a/Application/Admin/View/PromoteGameRatio/applyRatio.html
+++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html
@@ -24,15 +24,17 @@
<td class="r">
<select name="promote_id" id="promote_id">
<option value="">会长账号</option>
- <volist name="promoteList" id="vo">
- <empty name="record">
+ <empty name="record">
+ <volist name="promoteList" id="vo">
<option value="{$vo.id}">{$vo.account}({$vo.real_name})</option>
- <else/>
- <option value="{$vo.id}" <if condition="$vo.id eq $record.promote_id">selected</if> >{$vo.account}({$vo.real_name})</option>
- </empty>
- </volist>
+ </volist>
+ <else/>
+ <volist name="promoteList" id="vo">
+ <option value="{$vo.id}" <if condition="$vo['id'] eq $record['promote_id']">selected</if> >{$vo.account}({$vo.real_name})</option>
+ </volist>
+ </empty>
</select>
- <span class="notice-text">通过推广员后台注册申请或者管理后台创建的账号</span>
+ <span class="notice-text">一级渠道推广员账号</span>
</td>
</tr>
<tr>
@@ -40,60 +42,32 @@
<td class="r">
<select id="game_id" name="game_id" class="select_gallery" >
<option value="">游戏名称</option>
- <volist name="gameList" id="vo">
- <empty name="record">
+ <empty name="record">
+ <volist name="gameList" id="vo">
<option value="{$vo.id}">{$vo.game_name}</option>
- <else/>
- <option value="{$vo.id}" <if condition="$vo.id eq $record.game_id">selected</if> >{$vo.game_name}</option>
- </empty>
- </volist>
+ </volist>
+ <else/>
+ <volist name="gameList" id="vo">
+ <option value="{$vo.id}" <if condition="$vo['id'] eq $record['game_id']">selected</if> >{$vo.game_name}</option>
+ </volist>
+ </empty>
</select>
- <span class="notice-text">密码长度必须大于6位</span>
+ <span class="notice-text">会长推广平台已申请的游戏</span>
</td>
</tr>
<tr>
- <td class="l">账号状态：</td>
+ <td class="l">原分成比例：</td>
<td class="r table_radio">
- <span class="form_radio table_btn">
- <label >
- <input type="radio" value="1" name="status" checked="checked"> 开启
- </label >
- <label >
- <input type="radio" value="2" name="status" > 锁定
- </label>
- </span>
- <span class="notice-text">锁定状态下，推广员账号则无法登录</span>
+ <span class="form_radio table_btn"></span>
+ <span class="notice-text"></span>
</td>
</tr>
<tr>
- <td class="l">真实姓名：</td>
- <td class="r">
- <input type="text" class="txt" name="real_name" value="" placeholder=" 输入推广员负责人姓名">
- </td>
- </tr>
- <tr>
- <td class="l">手机号：</td>
- <td class="r">
- <input type="text" class="txt" name="mobile_phone" value="" placeholder="输入推广员负责人手机号">
- </td>
- </tr>
- <td class="l">邮箱：</td>
- <td class="r">
- <input type="text" class="txt" name="email" value="" placeholder="输入推广员邮箱">
- </td>
- </tr>
- <tr>
- <td class="l">商务专员</td>
- <td class="r">
- <select name="ba_id" id="admin">
- <option value="0">请选择商务专员</option>
- <volist name=":get_business_affairs_list()" id="vo">
- <option value="{$vo.id}">{$vo.account}</option>
- </volist>
- </select>
- <span class="notice-text">设置该推广员所属的商务专员组</span>
+ <td class="l">现分成比例：</td>
+ <td class="r table_radio">
+ <input type="text" class="txt" name="account" value="" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+ <span class="notice-text">当前需要修改成的分成比例</span>
</td>
-
</tr>
</tbody>
</table>
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 76728d4cf..33df55fa0 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1885,7 +1885,7 @@ class QueryController extends BaseController
if (empty($list['user_account']) ) {
$list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
}
- $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+ $list['user_account'] = empty($list['user_account']) ? '--' : $list['user_account'];
$list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
$list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
$list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];