moonsflyer пре 4 месеци
родитељ
комит
e7787f70e6
1 измењених фајлова са 11 додато и 26 уклоњено
  1. 11 26
      phalapi/src/app/functions.php

+ 11 - 26
phalapi/src/app/functions.php

@@ -4444,32 +4444,17 @@ namespace App;
             ->select("province,city")
             ->where("type in (1,2,3)")
             ->fetchAll();
-        $province_arr = array_diff(array_column($rs,'province'));
-//        $shop_list = [];
-//        foreach($rs as &$v){
-//            $shopwhere['uid'] = $v['uid'];
-//            if(!empty($province)){
-//                $shopwhere['province']=$province;
-//            }
-//
-//            $shop_info=\PhalApi\DI()->notorm->shop_apply
-//                ->select('uid,name,thumb,username,sale_nums,service_points,province')
-//                ->where($shopwhere)
-//                ->fetchOne();
-//
-////            $v['cate_name']=$cate_name;
-////
-////            $v['addtime'] = date('Y-m-d H:i:s',$shop_info['addtime']);
-////
-//            if($shop_info){
-//                $shop_info['thumb'] =  get_upload_path( $shop_info['thumb']);
-//                $shop_info['delivery_time'] =  '35分钟' ;
-//
-//                $shop_list[]=$shop_info;
-//            }
-//
-//        }
-        return $province_arr;
+
+        $shop_list = [];
+        foreach($rs as &$v){
+
+            if(!in_array($v['province'], $shop_list)) {
+                array_push($shop_list,$v['province']);
+            }else{
+                unset($v);
+            }
+        }
+        return $rs;
     }
 
     // 根据不同条件获取物流列表信息