Merge branch 'test-v2.0-0530' into test

application/index/controller/Member.php

@@ -159,11 +159,13 @@ class Member extends Basic{
             if (!empty($params['area_type'])) {
                 switch ($params['area_type']) {
                     case 1 :
-                        $where['a.area_demand'] = ['<=', 100];break;
+                        $where['a.area_demand'] = ['<=', 30];break;
                     case 2 :
-                        $where['a.area_demand'] = ['between', [100,500]];break;
+                        $where['a.area_demand'] = ['between', [30,60]];break;
+                    case 4 :
+                        $where['a.area_demand'] = ['between', [60,100]];break;
                     default  :
-                        $where['a.area_demand'] = ['>', 500];
+                        $where['a.area_demand'] = ['>', 100];
                 }
             }
 

application/index/view/member/users_list.html

@@ -177,9 +177,10 @@
 												</select>
 												<select class="form-control btn2 margin-top-ld" name="area_type">
 													<option value="0">面积需求</option>
-													<option value="1">100㎡以下</option>
-													<option value="2">100㎡-500㎡</option>
-													<option value="3">500㎡以上</option>
+													<option value="1">30㎡以下</option>
+													<option value="2">30㎡-60㎡</option>
+													<option value="3">60㎡-100㎡</option>
+													<option value="4">100㎡以上</option>
 												</select>
 												<!--业态选择-->
 												<select class="form-control btn2 margin-top-ld" name="login_status">

application/model/Users.php

@@ -228,7 +228,7 @@ class Users extends Model
         if (!empty($data['user_nick'])) {
             $insert_data['user_nick'] = $data['user_nick'];
         }
-        if (!empty($data['user_phone'])) {
+        if (!empty($data['user_phone']) && $id == 0) {
             $insert_data['user_phone'] = $data['user_phone'];
         }
         if (!empty($data['sex'])) {
@@ -287,6 +287,8 @@ class Users extends Model
                 ->join('a_agents b', 'a.agent_id=b.id', 'left')
                 ->where('a.id', $id)->find();
             $data['agents'] = $data['name'] . '-' . $data['phone'];
+
+            $data['user_phone'] = hide_customer_phone($data['user_phone']);
             unset($data['name']);
             unset($data['phone']);
         } else {