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

application/admin/controller/Good.php

@@ -58,7 +58,13 @@ class Good extends Base
         if(request()->isPost()){
             $data = input('post.');  
             if(empty($data['tags_id'])){//解决复选框值为空的时候
-                return 3;
+                $data['tags_id']='';//将rules字段的值设置为空
+                $data['create_time'] = time();
+                if($user->where('id',$id)->update($data)){
+                    return 1;
+                }else{
+                    return 2;
+                }
             }
             $data['tags_id']=implode(',',$data['tags_id']);
             if($user->where('id',$id)->update($data)){  

application/admin/view/good/edit.html

@@ -99,10 +99,8 @@ layui.use(['form', 'layedit', 'jquery'], function(){
                             parent.layer.close(index);//关闭当前frame
                             parent.layui.table.reload('idSystem');//成功刷新父窗口的 table
                         });
-                    }else if(data==2){
-                        layer.alert('工具标题不能重复',{icon:5});
                     }else{
-                        layer.alert('标签不能为空',{icon:5});
+                        layer.alert('工具标题不能重复',{icon:5});
                     }
                 });
 

application/index/controller/Base.php

@@ -19,7 +19,7 @@ class Base extends Controller
         }
 
         // 找到所有商品，判断商品是否在标签内
-        $ta = db('good')->field('id, title, tags_id')->select();
+        $ta = db('good')->field('id, title, tags_id')->where('tags_id','<>','')->select();//查询出tags_id不为空的所有数据
         foreach ($ta as $val) {
             $tag_ids = explode(',', $val['tags_id']);
             

application/index/view/base/header.html

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