Merge branch 'test'

application/api_broker/controller/Client.php

@@ -288,14 +288,11 @@ class Client extends Basic
                 {
                     $label[] = '我的';
                 }
-                /*dump($v['create_time']);
-                $time=strtotime(date("Y-m-d h:i:s"))-strtotime($v['create_time']);
-                dump(strtotime(date("Y-m-d h:i:s"))-strtotime($v['create_time']));//48时(h)=172800秒(s)
-                exit;*/
-                if((strtotime(date("Y-m-d h:i:s")) - strtotime($v['create_time'])) < 172800)
+
+                /*if((strtotime(date("Y-m-d h:i:s")) - strtotime($v['create_time'])) < 172800)
                 {
                     $label[] = '保护期内';
-                }
+                }*/
                 //无效客户不显示标签
                 if($v['user_status'] != -1){
                     $user_res[$k]['label'] = implode(',',$label);

application/index/controller/Label.php

@@ -150,7 +150,7 @@ class Label extends Basic
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
         $labels = New ULabels;
-        $field = 'id,name,create_time';
+        $field = 'id,name,create_time,free';
         $where['type'] = 1;
         $result['data']['list']  = $labels->getList($pageNo, $pageSize, 'id DESC', $field, $where);
         $result['data']['total'] = $labels->getTotal($where);