From 22961561d461444e4054708b79d959902ef1c93b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 4 Aug 2020 16:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=A2=E5=8D=95=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Spend/lists.html | 6 +++---
 Application/Common/Common/extend.php    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index fdcc521d4..65650d778 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -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>
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 526108922..762fa78a2 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -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=>"绑定平台币"),