wupengfei 1 рік тому
батько
коміт
407b86df14

+ 2 - 1
.idea/workspace.xml

@@ -4,6 +4,7 @@
     <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/view/comment_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/comment_report/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/ReplyComment.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ReplyComment.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -313,7 +314,7 @@
       <workItem from="1683680449159" duration="24035000" />
       <workItem from="1683766597228" duration="22109000" />
       <workItem from="1683852930702" duration="24375000" />
-      <workItem from="1684112329391" duration="15443000" />
+      <workItem from="1684112329391" duration="15681000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/nutrition/view/comment_report/index.html

@@ -89,7 +89,7 @@
                 {eq name='vo.type' value='10'}<span class="layui-btn layui-btn-sm"  data-open='{:url("nutrition/datum_comment/index")}?datum_id={$vo.be_report.first_id}&url_id={$vo.be_report.second_id}&id={$vo.report_id}&r=1'>查看评论</span>{/eq}
                 {eq name='vo.type' value='12'}
                     {if $vo.object_info.reply_id}
-                    <span class="layui-btn layui-btn-sm"  data-open='{:url("operate/reply_comment/index")}?id={$vo.be_report.second_id}&reply_id={$vo.report_id}&r=1'>查看评论</span>
+                    <span class="layui-btn layui-btn-sm"  data-open='{:url("operate/reply_comment/index")}?forum_id={$vo.object_info.forum_id}&reply_id={$vo.object_info.reply_id}&r=1'>查看评论</span>
                     {else}
                     <span class="layui-btn layui-btn-sm"  data-open='{:url("operate/forum_comment/index")}?id={$vo.report_id}&r=1'>查看评论</span>
                     {/if}

+ 1 - 0
application/operate/controller/ReplyComment.php

@@ -34,6 +34,7 @@ class ReplyComment extends Controller
         $sel_where[] = ['c.reply_id','=',$this->reply_id];
         if($content = $this->request->get('content'))$sel_where[] = ['c.content','like','%'.$content.'%'];
         if($name = $this->request->get('name'))$sel_where[] = ['u.name','like','%'.$name.'%'];
+        if($id = $this->request->get('id'))$sel_where[] = ['c.id','=',$id];
         $query = $this->_query($this->table)->alias('c')
             ->field('c.*,u.name,u.headimg')
             ->leftJoin("store_member u",'u.id = c.user_id')