Merge branch 'master' of https://git.dashgame.com/919693957/Tools

# Conflicts:
#	application/route.php

application/index/controller/Base.php

@@ -58,6 +58,22 @@ class Base extends Controller
         }
 
     }
+  
+  
+  	public function alls(){//所有工具      
+        $cid=db('good')
+                ->alias('a')           
+                ->field('a.*,b.catename')
+                ->join('column b','a.column_id=b.id')
+                ->order('sort desc')
+                ->select();
+        $this->assign([
+            'cid'=>$cid,
+ 
+        ]);
+        return view('indexs/index');
+
+    }
 
 
 

application/index/view/base/header.html

@@ -324,7 +324,7 @@
 
 
 <ol class="breadcrumb col-sm-12 col-auto item nav-list" id="choose-tool">
-<li><a href="{:url('Indexs/index')}"><span style="cursor: pointer;">所有工具</span></a></li>
+<li><a href="{:url('Base/alls')}"><span style="cursor: pointer;">所有工具</span></a></li>
 
 {volist name="data" id="vo"}
     <li><a href="{:url('Index/index',['column_id'=>$vo.id])}"><span style="cursor: pointer;">{$vo.catename}</span></a></li>   

application/route.php

@@ -20,4 +20,4 @@
 
 // ];
 think\Route::rule('/lst','admin/login/lst'); //后台登录地址替换为/lst(访问(本地)登录页面就直接 localhost/lst 访问)
-think\Route::rule('','index/indexs/index');
+think\Route::rule('','index/indexs/index');//直接localhost:85访问前台首页