Merge branch 'test'

application/index/controller/CellPhone.php

@@ -74,6 +74,10 @@ class CellPhone extends Basic
                 }
             }
 
+            if (!empty($this->params['ali_yun_phone'])) {
+                $where['a.secret_no'] = ['LIKE', '%'.$this->params['ali_yun_phone'].'%'];
+            }
+
             $data['list']  = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
             $data['total'] = $report->getCallListTotal($where);
             return $this->response($result['code'], $result['msg'], $data);

application/index/view/cell_phone/index.html

@@ -35,6 +35,7 @@
                                             </select>
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="姓名" type="text" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="手机号" type="phone" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="ali_yun_phone" placeholder="隐私号码" type="phone" value="">
                                             <div class="clear">
                                             </div>
                                             <span class="fore-span ld-Marheight">拨打时间:</span>

application/index/view/member/users_list.html

@@ -949,13 +949,13 @@
 	<!-- /.modal -->
 </div>
 <!--拨打手机号-->
-<div class="modal fade" id="modal-call" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-call" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content modal-body-width">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+				<!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     &times;
-                </button>
+                </button>-->
 				<h4 class="modal-title">
                    请使用
 					<span id="phone_title">

application/index/view/remark/remark_follow_index.html

@@ -587,13 +587,10 @@
 	<!-- /.modal -->
 </div>
 <!--拨打手机号-->
-<div class="modal fade" id="modal-call" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="modal-call" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content modal-body-width">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    &times;
-                </button>
 				<h4 class="modal-title">
                    请使用
 					<span id="phone_title">

public/resource/js/callPhoneIndex.js

@@ -40,6 +40,7 @@ define (['doT', 'text!temp/callPhone_template_tpl.html', 'css!style/home.css','c
             params.end_date  = $('#end_date') .val();//时间2
             params.call_type = $("#call_type").val();
             params.call_style = $("#call_style").val();
+            params.ali_yun_phone = $("#ali_yun_phone").val();
             $.ajax ({
                 url: '/index/callLog',//获取列表
                 type: 'GET',