Merge branch 'develop' of zhengxifeng/tyqngp into master

.gitignore

@@ -1,5 +1,6 @@
 data/
 runtime/
+static/
 *.log
 *.sql
 *.zip

apps/common/HomeController.php

@@ -101,8 +101,10 @@ class HomeController extends Controller
             if( $domain == $main_domain ){
                 //cookie('city','');
                 cookie('city',$this->config('firstcity'));
+                //var_dump($domain_first);die;
             }else{
                 cookie('city',$domain_first);
+
                 //var_dump($domain_first);
                 //设置新的cookie 城市id
                 //$cityid = 1;
@@ -119,14 +121,16 @@ class HomeController extends Controller
                     1,2,3,4
                 ];
                 $this->assign('testArray',$testArray);*/
+            }
 
-                //输出logo
-                $citylogo = $this->model->getCityLogo($domain_first);
-                if(empty($citylogo)){
-                    $citylogo = $this->model->getSiteLogo();
-                }
-                $this->assign('citylogo',$citylogo);
+            //var_dump($domain_first);die;
+            //输出logo
+            $citylogo = $this->model->getCityLogo($domain_first);
+            if(empty($citylogo)){
+                $citylogo = $this->model->getSiteLogo();
             }
+            $this->assign('citylogo',$citylogo);
+
         }else{
             $cur_city = array_filter($citys, function($t) use ($domain) { return $t['isurl'] == $domain; });
             if( !empty($cur_city) ){

git.txt

@@ -24,3 +24,8 @@ git rm -r --cached .
 修改 .gitignore 规则
 git add .
 git commit -m "clear cached"
+git push origin local-develop:develop
+
+git fetch --all
+git reset --hard origin/master
+git pull origin/master