Merge branch 'test'

application/api/controller/Member.php

@@ -263,7 +263,7 @@ class Member extends Basic
                             //邀请人是一级，被邀请人是二级
                             $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();
 
@@ -411,12 +411,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/app/view/index/share_detail.html

@@ -196,7 +196,7 @@
 <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/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",