diff --git a/.user.ini b/.user.ini index 0a4eb8f..740d209 100644 --- a/.user.ini +++ b/.user.ini @@ -1 +1 @@ -open_basedir=/www/wwwroot/qlg.tsgz.moe/:/tmp/:/proc/ \ No newline at end of file +open_basedir=/www/wwwroot/qlg/:/tmp/:/proc/ \ No newline at end of file diff --git a/hyhproject/common/model/Shopping.php b/hyhproject/common/model/Shopping.php index 3449c05..f54237c 100755 --- a/hyhproject/common/model/Shopping.php +++ b/hyhproject/common/model/Shopping.php @@ -161,9 +161,9 @@ class Shopping extends Base{ // COS('.$lat.'*PI()/180)*COS(lat*PI()/180)*POW(SIN(('.$lng.'*PI()/180-lng*PI()/180)/2),2)))*1000) AS distance'; $order = 'distance ASC'; //纬度 - $where['s.lat']=array('between',array($start['left-bottom']['lat'],$start['left-top']['lat'])); + //$where['s.lat']=array('between',array($start['left-bottom']['lat'],$start['left-top']['lat'])); //经度 - $where['s.lng']=array('between',array($start['left-bottom']['lng'],$start['right-bottom']['lng'])); + //$where['s.lng']=array('between',array($start['left-bottom']['lng'],$start['right-bottom']['lng'])); $rs = Db::name('shops s') ->where($where) ->field($field) diff --git a/hyhproject/common/model/Users.php b/hyhproject/common/model/Users.php index 367dda4..dc01756 100755 --- a/hyhproject/common/model/Users.php +++ b/hyhproject/common/model/Users.php @@ -104,7 +104,7 @@ class Users extends Base{ ->join('user_trees t','u.userId=t.uid') ->join('user_lock l','u.userId=l.userId') ->where(['t.pid'=>$userId,'u.userStatus'=>0,'u.userLevel'=>$userLevel]) - ->field('u.userId,u.trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime') + ->field('u.userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime') ->order('l.id DESC,u.userId DESC') ->paginate(input('pageSize/d'))->toArray(); }else{ diff --git a/qlg.tar.gz b/qlg.tar.gz new file mode 100755 index 0000000..535b736 Binary files /dev/null and b/qlg.tar.gz differ