wupengfei 1 year ago
parent
commit
bca5f8989c

+ 5 - 3
.idea/workspace.xml

@@ -3,8 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/DatumReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/DatumReport.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleReport.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoReport.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_report/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -379,7 +381,7 @@
       <workItem from="1689813742376" duration="13449000" />
       <workItem from="1689900489647" duration="18483000" />
       <workItem from="1690159826319" duration="22343000" />
-      <workItem from="1690246325106" duration="16570000" />
+      <workItem from="1690246325106" duration="16721000" />
     </task>
     <servers />
   </component>

+ 2 - 2
application/nutrition/controller/ArticleReport.php

@@ -24,8 +24,8 @@ class ArticleReport extends Controller
     {
         $this->title = '举报列表';
         $where= [];
-        if($this->request->request('name'))      $where[]= ['m.name','like','%'.$this->request->request('phone').'%'];
-        if($this->request->request('label'))      $where[]= ['m.label','like','%'.$this->request->request('label').'%'];
+        if($this->request->request('name'))      $where[]= ['m.name','like','%'.$this->request->request('name').'%'];
+        if($this->request->request('content'))      $where[]= ['f.content','like','%'.$this->request->request('content').'%'];
         $where[]= ['f.is_deleted','=',0];
         $where[]= ['f.type','=',5];
         $query = $this->_query($this->table);

+ 2 - 2
application/nutrition/controller/VideoReport.php

@@ -23,8 +23,8 @@ class VideoReport extends Controller
     {
         $this->title = '举报列表';
         $where= [];
-        if($this->request->request('name'))      $where[]= ['m.name','like','%'.$this->request->request('phone').'%'];
-        if($this->request->request('label'))      $where[]= ['m.label','like','%'.$this->request->request('label').'%'];
+        if($this->request->request('name'))      $where[]= ['m.name','like','%'.$this->request->request('name').'%'];
+        if($this->request->request('content'))      $where[]= ['f.content','like','%'.$this->request->request('content').'%'];
         $where[]= ['f.is_deleted','=',0];
         $where[]= ['f.type','=',1];
         $query = $this->_query($this->table);

+ 2 - 2
application/nutrition/view/article_report/index.html

@@ -15,9 +15,9 @@
                 </div>
             </div>
             <div class="layui-form-item layui-inline">
-                <label class="layui-form-label">标签</label>
+                <label class="layui-form-label">内容</label>
                 <div class="layui-input-inline">
-                    <input name="label" value="{$Think.get.label|default=''}" placeholder="请输入标签" class="layui-input">
+                    <input name="content" value="{$Think.get.content|default=''}" placeholder="请输入举报内容" class="layui-input">
                 </div>
             </div>
 

+ 2 - 2
application/nutrition/view/video_report/index.html

@@ -15,9 +15,9 @@
                 </div>
             </div>
             <div class="layui-form-item layui-inline">
-                <label class="layui-form-label">标签</label>
+                <label class="layui-form-label">内容</label>
                 <div class="layui-input-inline">
-                    <input name="label" value="{$Think.get.label|default=''}" placeholder="请输入标签" class="layui-input">
+                    <input name="content" value="{$Think.get.content|default=''}" placeholder="请输入举报内容" class="layui-input">
                 </div>
             </div>