...
|
...
|
@@ -246,8 +246,12 @@ class Goods extends Frontend |
|
|
->join('sto_goodstype t','t.id = g.goodstype_id')
|
|
|
->join('sto_store s','s.id = g.store_id')
|
|
|
->where($where)
|
|
|
->order($order)
|
|
|
->select();
|
|
|
->order($order);
|
|
|
if(!empty($param['paginate'])){
|
|
|
$data = $data->paginate($param['pageNum'],'',['page'=>$param['page']]);
|
|
|
}else{
|
|
|
$data = $data->select();
|
|
|
}
|
|
|
foreach($data as $key => $vo){
|
|
|
//计算距离
|
|
|
$distance = distance($param,$vo);
|
...
|
...
|
|