1

.idea/workspace.xml

@@ -2,9 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/application/nutrition/view/top_search/index_search.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/SearchStatistics.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/SearchStatistics.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/SearchStatistics.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/UserSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserSearch.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/TopSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/TopSearch.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/top_search/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/top_search/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/top_search/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/top_search/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -125,7 +131,7 @@
     <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/common/model" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/nutrition/view/top_search" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -136,11 +142,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\zs\gaoyixia\application\nutrition\view\top_search" />
       <recent name="D:\zs\gaoyixia\application\common\model" />
       <recent name="D:\zs\gaoyixia\application\api\controller" />
       <recent name="D:\zs\gaoyixia\application\nutrition\controller" />
       <recent name="D:\zs\gaoyixia\application\nutrition\view" />
-      <recent name="D:\zs\gaoyixia\application\operate\controller" />
     </key>
   </component>
   <component name="SvnConfiguration">
@@ -226,7 +232,7 @@
       <workItem from="1665448772446" duration="594000" />
       <workItem from="1665451038308" duration="20434000" />
       <workItem from="1665535775245" duration="5105000" />
-      <workItem from="1665543789478" duration="3565000" />
+      <workItem from="1665543789478" duration="4386000" />
     </task>
     <servers />
   </component>

application/api/controller/Expedite.php

@@ -69,16 +69,35 @@ class Expedite extends Base
 
 
     /**
-     * @title 获取热搜设置
+     * @title 获取热搜设置标题
      * @desc  获取热搜设置
      * @author  qc
      * @url /api/Expedite/getTopSearch
      * @method GET
+     * @param name:sort_type type:int default:1 desc:排序规则1默认2搜索量
+     * @param name:page type:int default:-- desc:页数
+     * @param name:page_num type:int default:-- desc:每页数量
+     * @param name:type type:int default:-- desc:类型0=>"全部",1=>'视频',2=>'图文',3=>'资料',4=>'新闻',5=>'需求',6=>'论坛',7=>'商品',8=>'招聘',9=>'供应商',10=>'供应商产品',
      * @return name:title type:string default:-- desc:标题
+     * @return name:num type:int default:-- desc:搜索量
+     * @return name:type type:int default:-- desc:类型0=>"全部",1=>'视频',2=>'图文',3=>'资料',4=>'新闻',5=>'需求',6=>'论坛',7=>'商品',8=>'招聘',9=>'供应商',10=>'供应商产品',
      */
     public function getTopSearch()
     {
-        $list = TopSearch::field('id,title')->where(['status'=>1,'is_deleted'=>0])->order('sort desc,id desc')->select()->toArray();
+        $type = input('get.type');
+        $sort_type= input('sort_type',1);
+        switch ($sort_type) {
+            case 1:
+                $order =  ['sort'=>'desc','id'=>'desc'];
+                break;
+            default:
+                $order =  ['num'=>'desc','id'=>'desc'];
+                break;
+        }
+        $list = TopSearch::field('id,title,type,num')
+            ->where(['status'=>1,'is_deleted'=>0,'type'=>$type])
+            ->order($order)
+            ->select()->toArray();
         $this->success('ok',['list'=>$list]);
     }
 

application/api/controller/Press.php

@@ -118,6 +118,7 @@ class Press extends Base
      * @param name:id type:int default:-- desc:新闻id
      * @param name:sort_type type:int default:1 desc:排序规则1时间2热点
      * @param name:page type:int default:-- desc:页数
+     * @param name:page_num type:int default:-- desc:每页数量
      * @return name:name type:string default:-- desc:会员名称
      * @return name:headimg type:string default:-- desc:会员头像
      * @return name:content type:string default:-- desc:内容

application/common/model/SearchStatistics.php

@@ -1,9 +0,0 @@
-<?php
-namespace app\common\model;
-use library\tools\Data;
-use think\Model;
-// 会员搜索统计
-class SearchStatistics extends Model
-{
-
-}

application/common/model/UserSearch.php

@@ -27,11 +27,11 @@ class UserSearch extends Model
      */
     public static function saveSearchTitle($user_id,$title,$type = 0){
         Data::save('UserSearch',['user_id'=>$user_id,'title'=>$title,'type'=>$type,'create_at'=>date('Y-m-d H:i:s')],'user_id',['user_id'=>$user_id,'type'=>$type,'title'=>$title]);
-        $stat = SearchStatistics::where('title','like','%'.$title.'%')->where('type','=',$type)->value('id');
+        $stat = TopSearch::where('title','like','%'.$title.'%')->where('type','=',$type)->value('id');
         if($stat) {
-            SearchStatistics::where('id',$stat)->setInc('num');
+            TopSearch::where('id',$stat)->setInc('num');
         }else{
-            SearchStatistics::create(['title'=>$title,'type'=>$type]);
+            TopSearch::create(['title'=>$title,'type'=>$type]);
         }
     }
 

application/nutrition/controller/TopSearch.php

@@ -31,7 +31,7 @@ class TopSearch extends Controller
         $this->title = '热搜列表';
         $query = $this->_query($this->table)->where('is_deleted',0);
         $query->like('title');
-        $query->order(' sort desc , id desc')->page();
+        $query->order('sort desc, id desc')->page();
     }
 
     /**

application/nutrition/view/top_search/form.html

@@ -14,6 +14,12 @@
                     <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
                 </div>
             </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label label-required">搜索量</label>
+                <div class="layui-input-block">
+                    <input type="number" name="num"  value='{$vo.num|default="0"}' placeholder="请输入搜索量" class="layui-input">
+                </div>
+            </div>
             {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
             <div class="layui-form-item text-center">
                 <button class="layui-btn" type='submit'>保 存</button>

application/nutrition/view/top_search/index.html

@@ -6,6 +6,7 @@
 
 {block name="content"}
 <div class="think-box-shadow">
+    {include file='top_search/index_search'}
     <table class="layui-table margin-top-20" lay-skin="line">
         <thead>
         <tr>

application/nutrition/view/top_search/index_search.html

@@ -0,0 +1,16 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">标题</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入标题" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+    <script>form.render()</script>
+</fieldset>