Merge branch 'test'

application/index/extend/Basic.php

@@ -155,9 +155,9 @@ class Basic extends Controller
                         $m_user = new Users();
                         $where['agent_id'] = $this->userId;
                         $where['id'] = $this->params['id'];
-                        $is_ = $m_user->selectUser($where, 'id,agent_id');
+                        $is_ = $m_user->getMyUserCount($where);
 
-                        if ($is_['agent_id'] == 0) {
+                        if ($is_) {
                             $is_auth = 1;
                         } else {
                             $is_auth = $is_ > 0 ? 1:0;

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=121231' charset='utf-8'></script>
\ No newline at end of file
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=1212311' charset='utf-8'></script>
\ No newline at end of file

application/task/controller/PrivacyNumber.php

@@ -99,6 +99,7 @@ class PrivacyNumber
      */
     public function releaseNumber()
     {
+        set_time_limit(0);
         $m_bind = new BindingPhone();
 
         $fields                 = 'a.id,aliYun_phone_id,expiry_date,phone_x,phone_a,phone_b,subsId,a.type,a.mappingId';
@@ -218,17 +219,17 @@ class PrivacyNumber
      */
     public function checkBindPhone()
     {
+        set_time_limit(0);
         $m_bind = new BindingPhone();
 
         $where['a.status'] = 1;
         $where['a.type']   = 1;
+        $where['a.expiry_date'] = ['<', date('Y-m-d H:i:s')];
         $select_data = $m_bind->getBindingPhoneList('a.id,a.aliYun_phone_id,b.phone_x,a.subsId,a.expiry_date', $where);
 
         foreach ($select_data as $k => $v) {
             $query_status = PlsDemo::querySubscriptionDetail($v['subsId'], $v['phone_x']);
-
-            $expiry_date = strtotime($select_data['expiry_date']);
-            if (isset($query_status->code) && ($query_status->Code != 'OK') && ($expiry_date < time())) {
+            if (isset($query_status->Code) && ($query_status->Code != 'OK')) {
                 $m_bind->unBindTable($v['id'], $v['aliYun_phone_id']);
             }
         }

public/resource/template/user_template_tpl.html

@@ -42,8 +42,9 @@
 		<td width="16%">
 			[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || check_auth('index/useraction_search') ) { %]
 			<a class="btn1 btn-success caozuo genj_ure" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>详情/跟进</a>&nbsp;
+			[% if(it[item]['agent_id'] == it[item]['current_agent_id']) { %]
 			<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;
-			
+			[% } %]
 			<!--<a class="btn1 btn-success genj_ure" href="#modal-add" data-toggle="modal" data-id='[%= it[item]["id"] %]'>跟进</a>&nbsp;-->
 			
 			<a class="btn1 btn-success take-look" href="#modal-takeLook" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-name='[%= it[item]["user_name"] %]' data-phone='[%= it[item]["user_phone"] %]'>约带看</a>