合并分支 'master-server' 到 'master'

gx异步执行更新列表页



查看合并请求 !1346

@@ -65,7 +65,7 @@ class AiBlogController extends BaseController
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
+                    $v['route'] = $this->user['domain'] . 'blog/' . $v['route'];
                 }
                 }
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
@@ -106,7 +106,7 @@ class AiBlogController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
-                $v['route'] = $this->user['test_domain'] . 'user/' . $v['route'];
+                $v['route'] = $this->user['domain'] . 'user/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -173,9 +173,7 @@ class AiBlogController extends BaseController
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                if(!empty($v['route'])){
-                    $v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
-                }
+                $v['route'] = $this->user['domain'] . 'top-blog/' . ($v['route'] > 1) ? $v['route'] : '';
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }