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

Merge branch 'hotfix/market_percentage' of wmtx/platform into master

Browse Source 
市场结算管理bug修正
master
廖金灵 4 years ago committed by Gogs
parent 7bb6b3b31b 5dcc25f97e
commit 0665e8265a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
Application/Admin/Common/extend.php
Unescape Escape View File

@ -2790,7 +2790,7 @@ function promote_listsMarket($type){
$admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
$map['admin_id'] = $admin_id;
if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14) {
if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
unset($map['admin_id']);
}

6
Application/Admin/View/Spend/lists.html
Unescape Escape View File

@ -277,14 +277,14 @@
</td>
<td>
<if condition="$data['pay_status'] eq 1"><span class="game_notice_status_color">{:get_info_status($data['pay_game_status'],14)}</span>
<elseif condition="$data.status eq 0"/>
<elseif condition="$data.pay_status eq 0"/>
— —
<else/>
{:get_info_status($data['pay_game_status'],14)}
</if>
</td>
<td style="text-indent:0;">
<if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 1">
<if condition="($data['pay_game_status'] eq 0 or $data['pay_game_status'] eq 2) and $data['pay_status'] eq 1">
<a class=" budan" href="javascript:void(0);"
href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
<else/>
@ -294,7 +294,7 @@
</if>
<br />
<if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 0">
<if condition="($data['pay_game_status'] eq 0 or $data['pay_game_status'] eq 2) and ($data['pay_status'] eq 0 or $data['pay_status'] eq 2)">
<a class="pay_repair" href="javascript:void(0);"
href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/noticePayed')}" style="width:100%;">通知到账</a>
</if>

4
Application/Common/Common/extend.php
Unescape Escape View File

@ -687,12 +687,12 @@ function get_info_status($type=null,$group=0){
6 =>array(0=>"未修复" ,1=>"已修复"),//纠错状态
7 =>array(0=>"失败" ,1=>"成功"),//纠错状态 未修复 已修复
8 =>array(0=>"禁用" ,1=>"启用"),//显示状态 禁用 启用
9 =>array(0=>"下单未支付" ,1=>"充值成功"),//订单状态 下单未支付 充值成功
9 =>array(0=>"下单未支付" ,1=>"充值成功" ,2=>"充值失败"),//订单状态 下单未支付 充值成功
10 =>array(0=>"正常" ,1=>"拥挤",2=>"爆满"),//区服状态 正常 拥挤 饱满
12 =>array(0=>L('Unpaid'),1=>"成功"), // 未支付 成功
30=>array(0=>"待审核",1=>"已审核",2=>"驳回"), //待审核
13 =>array(1=>'已读',2=>"未读"),
14 =>array(0=>"通知失败",1=>"通知成功"),
14 =>array(0=>"通知失败",1=>"通知成功",2=>"通知失败"),
15 =>array(0=>"未充值",1=>"已充值"),
16 =>array(0=>"未回复",1=>"已回复"),
17 =>array(0=>"平台币",1=>"绑定平台币"),

Write Preview
Loading…
Cancel
Save