Merge branch 'test'

application/api_broker/controller/User.php

@@ -159,12 +159,11 @@ class User extends Basic
                 //'全部客户列表' 需要排除排除纯房东客户
                 $conditions['user_label'] = array( "neq", 2 );
 
-                if (!isset($conditions['create_time'])){
-                    //1.'全部客户列表' 需要排除排除保护期内的客户
-                    //2.上面流程如果不存在$conditions['create_time']，说明非精确搜索，排除排除保护期内的客户
+                if (!isset($conditions['create_time'])){//不存在$conditions['create_time']说明非精确搜索
+                    //1.全部客户列表、非精确搜索 需要排除排除保护期内的客户
                     $time_now = date('Y-m-d H:i:s');//当前时间
-                    $time_after = date("Y-m-d H:i:s",strtotime("+1 day"));//24小时前的时间
-                    $conditions['protect_time'] = array( 'not between', array( $time_now, $time_after ) );
+                    //protect_time 将截止日期大于当前时间的数据排除掉
+                    $conditions['protect_time'] = array('lt',$time_now);
                 }
 
             }

public/app/js/shop_detail_pc.js

@@ -482,7 +482,7 @@ require(['vue', 'css!style/shop_detail_pc.css', 'jquery0325', 'common'], functio
 			},
 			dealArea: function() {
 				let _this = this;
-				if(_this.d.shop_type) {
+				if(_this.d.shop_type=='1') {
 					//街铺
 					return _this.d.shop_area_start + '㎡';
 				} else {