Merge remote-tracking branch 'origin/master'

new_admincp/applications/zsb/controllers/realHouse.php

@@ -224,6 +224,7 @@ class realHouse extends MY_Controller {
         $data_page['typeList'] = array('99' => '选择举报原因') + array('0' => '房源不可看', '1' => '价格不准确', '2' => '图片不真实', '3' => '描述不真实');
         //$data_page['reportList'] = array('99' => '选择处理结果') + array('1' => '举报成功(扣罚)', '2' => '举报失败', '0' => '待处理' ,'3'=> '举报成功(不扣罚)');
         $data_page['reportList'] = array('99' => '选择处理结果') + array('1' => '举报成功(扣罚)', '2' => '举报失败', '0' => '待处理');
+        $data_page['reportListArr'] = array('99' => '选择处理结果') + array('1' => '举报成功(扣罚)', '2' => '举报失败', '0' => '待处理' ,'3'=> '举报成功(不扣罚)');
         $data_page['appealList'] = array('99' => '选择申诉状态') + array('0' => '未申诉', '1' => '已申诉', '2' => '申诉成功', '3' => '申诉失败');
         //$searchData = array('uid' => $info['uid'], 'note' => 1);
 

new_admincp/applications/zsb/views/nj/realHouse_reportRecord.php

@@ -135,7 +135,7 @@
                                         <div class=""><?=$typeList[$item['type']]?></div>
                                     </td>
                                     <td class="td w70">
-                                        <div class=""><?=$reportList[$item['report_result']]?></div>
+                                        <div class=""><?=$reportListArr[$item['report_result']]?></div>
                                     </td>
                                     <td class="td w70">
                                         <div class=""><?=$appealList[$item['appeal']]?></div>