You've already forked qlg.tsgz.moe
							
							bulabula
This commit is contained in:
		| @@ -1 +1 @@ | ||||
| open_basedir=/www/wwwroot/qlg.tsgz.moe/:/tmp/:/proc/ | ||||
| open_basedir=/www/wwwroot/qlg/:/tmp/:/proc/ | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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{ | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								qlg.tar.gz
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								qlg.tar.gz
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user