Merge branch 'master' of https://git.97admin.com:433/chendeben/taoqu

App/Api/Controller/Search.php

@@ -12,7 +12,7 @@ class Search extends Controller
 {
     public function main()
     {
-        $kw = $this->getQuery()->string("args_0");
+        $kw = $this->getQuery()->string("kw")?:$this->getQuery()->string("args_0");
         $bids = $this->getQuery()->string("bids");
         $cid = $this->getQuery()->string("cid");
         $request=[