Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/api/controller/Member.php

@@ -250,31 +250,29 @@ class Member extends Basic
                 if (!empty($referrer_id)) {
                     if ($referrer_source == 20 && ($user_data['status'] != -1)){
                         $insert_data['agent_id']     = $referrer_id;   //客方也是经纪人
-                    } else {
+                    } elseif ($referrer_source == 10) {
+                        //统计经纪人id，目前保留两级，经纪人（id）→用户1（agent_id）→用户2（agent_id）
+                        //邀请人是一级，被邀请人是二级
 
                         //查找邀请人的信息
                         $referrer_user = $this->user->field('id,agent_id,referrer_id,referrer_source,source')
                             ->where('id', $referrer_id)
-                            ->where('referrer_source', 20)
                             ->find();
 
-                        if (!empty($referrer_user) && ($referrer_user['source'] == 10)) {
-                            //统计经纪人id，目前保留两级，经纪人（id）→用户1（agent_id）→用户2（agent_id）
+                        if (!empty($referrer_user['id'])) {
+
+                            //经纪人邀请的客户，客户再去邀请客户客方为二级
+                            if ($referrer_user['referrer_source'] == 20) {
+                                $insert_data['agent_id'] = $referrer_user['agent_id'];  //2 级
+                            } else {
+                                //客户邀请客户客方保留2级
                                 $referrer_user_agent_id = $this->user
                                     ->field('id,agent_id,referrer_id')
-                                ->where('referrer_id', $referrer_user['referrer_id'])
+                                    ->where('referrer_id', $referrer_id)
                                     ->where('agent_id', $referrer_user['agent_id'])
                                     ->find();
 
-                            if (empty($referrer_user_agent_id['agent_id'])) {
-                                $insert_data['agent_id'] = $referrer_user['agent_id'];  //1 级
-                            } else {
-                                $is_three = $this->user
-                                    ->where('id', $referrer_user_agent_id['referrer_id'])
-                                    ->where('agent_id', $referrer_user_agent_id['agent_id'])
-                                    ->count();
-
-                                if (empty($is_three)) {
+                                if (empty($referrer_user_agent_id)) {
                                     $insert_data['agent_id'] = $referrer_user_agent_id['agent_id']; //2 级
                                 }
                             }
@@ -410,12 +408,13 @@ class Member extends Basic
         $data['msg']    = '';
         
         if ($id) {
-            $restult = $this->user->field('user_nick,user_phone,create_time')
+            $result = $this->user->field('id,user_nick,user_phone,create_time')
                     ->where('referrer_id',$id)
                     ->where('status',0)
+                    ->order('create_time desc')
                     ->select();
-   
-            foreach ($restult as $k=>$v) {
+            $data_arr = [];
+            foreach ($result as $k=>$v) {
                  $arr = $v->getData();
                  $data_arr[$k]['user_nick']   = $arr['user_nick'];
                  $data_arr[$k]['user_phone']  = hide_customer_phone($arr['user_phone']);

application/api/controller/Shop.php

@@ -161,6 +161,7 @@ class Shop extends Basic
      */
     public function getShopDetail()
     {
+        return $this->response("101", "请更新到新版本");
         $params = $this->params;
         $field  = "a.id,a.management_fee,a.title,a.address,a.city,a.room_area,a.room_area2,a.business_area,a.disc,a.disccircles,
         a.sales,a.slotting_fee,a.transfer_fee, a.yetai,a.room_area2,a.shangpu_type,a.is_test,a.sellingpoint,a.singn_rule,

application/app/view/index/share_detail.html

@@ -191,11 +191,12 @@
     <a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
 </div>
 
-<script src="/app/js/jquery.js"></script>
+<!--<script src="/app/js/jquery.js"></script>-->
+<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
 <script src="/app/js/swiper.js"></script>
 <script src="/app/js/app_jump.js" ></script>
 <script src="/app/js/common.js" charset="utf-8"></script>
-<script src="/app/js/detaila_tl.js"></script>
+<script src="/app/js/detaila_tl.js?new1"></script>
 <script src="/app/js/Tab_min.js" charset="utf-8"></script>
 </body>
 </html>

application/model/GHouses.php

@@ -358,6 +358,8 @@ class GHouses extends BaseModel
         //剩余商铺为0下架
         if (empty($params['residue_num'])) {
             $params['status'] = 2;
+        } else {
+            $params['status'] = 1;
         }
 
         //新增或编辑
@@ -838,7 +840,7 @@ class GHouses extends BaseModel
             if (!empty($internal_title)) {
 
                 //剩余商铺为0下架
-                if (empty($params['residue_num'])) {
+                if (empty($params['residue_num']) && isset($params['residue_num'])) {
                     $params['status'] = 2;
                 } else {
                     $params['status'] = 1;

application/model/Users.php

@@ -46,6 +46,7 @@ class Users extends Model
         $data = $this
             ->field($fields)
             ->where($param)
+            ->order('create_time desc')
             ->select();
         return $data;
     }

public/app/js/detaila_tl.js

@@ -16,7 +16,8 @@
 		url: ServerHostTempC + '/broker/getShopDetail',
 		data: {
 			'id': _shangpuId,
-			'site_area': _isC=='1'?1:3
+//			'site_area': _isC=='1'?1:3
+			'site_area': 1
 		},
 		type: "GET",
 		dataType: "json",

public/resource/js/user.js

@@ -331,7 +331,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                             $("#cus_id").html(data.data.user_info.user_id);//客户编号
                             $("#cus_name").val(data.data.user_info.user_nick);//姓名
                             $("#sex").val(data.data.user_info.sex);//性别
-                            $("#cus_phone").html(data.data.user_info.user_phone);//电话
+                            $("#cus_phone").html(hideTel(data.data.user_info.user_phone));//电话
                             $("#cus_date").html(data.data.user_info.create_time);//上传时间
                             $("#cus_fang").val(data.data.user_info.agentinfo);//客方
                             var caozuo_table="";

public/resource/template/user_template_tpl.html

@@ -8,7 +8,7 @@
                 [%= it[item]["user_nick"] %]
             [% } %]
         </td>
-        <td>[%= it[item]["user_phone"] %]</td>
+        <td>[%= hideTel(it[item]["user_phone"]) %]</td>
         <td>[%= it[item]["create_time"] %]</td>
         <td>
             [% if(it[item]["follow_time"] != null) { %]