Merge branch 'test'

application/api_broker/service/CallPhoneService.php

@@ -77,11 +77,6 @@ class CallPhoneService
     public function bindAXB($phone_a, $phone_b, $record = true, int $user_id,  $agent_id, string $agent_name, int $landlord, int $house_id)
     {
         $result['status'] = 'failed';
-
-        //过年期间不能打电话
-        $result['msg'] = '过年期间不能打电话，具体等通知！';
-        return $result;
-        
         $type = '';
         if (strlen($phone_a) != 11) {
             $result['msg'] = '本机号码格式错误，请重新编辑！';

public/resource/js/reportList.js

@@ -133,6 +133,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			//点击撤销,修改全局bargain_id,弹出框出来
 			_doc.on('click', '.report-back-out', function() {
 				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+				$('#pass_cexiao').val('');
 			});
 			
 			//点击撤销，确定按钮触发的事件