Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/shop/lib/Manage.php

@@ -616,6 +616,21 @@ class Manage
         return $result;
     }
 
+    # 获取零售门店
+    public function search_l_shop_api()
+    {
+        $data = Dever::search('shop/info');
+        $result = array();
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['type'] == 2) {
+                    $result[] = $data[$k];
+                }
+            }
+        }
+        return $result;
+    }
+
     # 获取环比增长
     public function getGoodsHb($num, $day, $goods_id)
     {

service/mail/database/area_entry.php

@@ -48,7 +48,7 @@ return array
             'desc'      => '店铺名称',
             'match'     => 'is_numeric',
             'update'    => 'select',
-            'update_search' => 'shop/lib/manage.search_shop',
+            'update_search' => 'shop/lib/manage.search_l_shop',
             'search'    => array
             (
                 'api' => 'shop/info-like',