1

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <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/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/UserVideo.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/UserVideo.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/user_video/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/user_video/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_comment/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_comment/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -132,6 +134,12 @@
     <property name="two.files.diff.last.used.folder" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\zs\gaoyixia\public\a" />
+      <recent name="D:\zs\gaoyixia\public" />
+      <recent name="D:\zs\gaoyixia\public\wx_cert" />
+      <recent name="D:\zs\gaoyixia\application\api\controller" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\zs\gaoyixia\config" />
       <recent name="D:\zs\gaoyixia\application\common\service" />
@@ -139,12 +147,6 @@
       <recent name="D:\zs\gaoyixia\application\sd" />
       <recent name="D:\zs\gaoyixia\public" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\zs\gaoyixia\public\a" />
-      <recent name="D:\zs\gaoyixia\public" />
-      <recent name="D:\zs\gaoyixia\public\wx_cert" />
-      <recent name="D:\zs\gaoyixia\application\api\controller" />
-    </key>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -230,7 +232,7 @@
       <workItem from="1675904734949" duration="20832000" />
       <workItem from="1675990026788" duration="13260000" />
       <workItem from="1676077132290" duration="20234000" />
-      <workItem from="1676250114476" duration="4780000" />
+      <workItem from="1676250114476" duration="4918000" />
     </task>
     <servers />
   </component>
@@ -414,7 +416,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/application/nutrition/view/user_video/index.html</url>
-          <line>45</line>
+          <line>53</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">

application/nutrition/controller/UserVideo.php

@@ -38,7 +38,7 @@ class UserVideo extends Controller
         $video_cate = VCM::field('id,title')->select()->toArray();
         $this->video_cate = array_column($video_cate,null,'id');
         $sel_where = [];
-        $sel_where[] = ['v.is_deleted','=',0];
+        $sel_where[] = ['v.is_deleted','in','0,1'];
         if($title = $this->request->get('title')) $sel_where[] = ['v.title','like','%'.$title.'%'];
         if($phone = $this->request->get('phone')) $sel_where[] = ['m.phone','like','%'.$phone.'%'];
         $this->status = $this->request->get('status',-1);
@@ -127,7 +127,7 @@ class UserVideo extends Controller
      */
     public function del()
     {
-        $this->_save($this->table, ['is_deleted' => 1]);
+        $this->_save($this->table, ['is_deleted' =>2]);
     }
 
 

application/nutrition/view/user_video/index.html

@@ -10,7 +10,8 @@
             <th class='text-left nowrap' >标题</th>
             <th class='text-left nowrap' >视频</th>
             <th class='text-left nowrap' >分类</th>
-            <th class='text-left nowrap'>状态</th>
+            <th class='text-left nowrap'>审核状态</th>
+            <th class='text-left nowrap' >状态</th>
             <th class='text-left nowrap'>置顶</th>
             <th class="text-left nowrap">操作</th>
         </tr>
@@ -32,6 +33,13 @@
             </td>
             <td class='text-left nowrap'>{$video_cate[$vo.first_classify]['title']|default='--'}--{$video_cate[$vo.second_classify]['title']|default='--'}</td>
             <td class='text-left nowrap'>{$vo.status == 0 ?'待审核' : ($vo.status == 1?'审核通过':'审核拒绝')}</td>
+            <td class='text-left '>
+                {if $vo.is_deleted == 0}
+                <span class="layui-btn layui-btn-xs">正 常</span>
+                {else}
+                <span class="layui-btn layui-btn-xs layui-btn-warm ">已下架</span>
+                {/if}
+            </td>
             <td class='text-left nowrap'>{$vo.is_top == 1 ?'是' :'否'}</td>
             <td class='text-left nowrap' >
                 {if $vo.status == 0}

application/nutrition/view/video_comment/index.html

@@ -10,10 +10,10 @@
         <tr>
             <th class='text-left nowrap' >ID</th>
             <th class='text-left nowrap' >用户</th>
-            <th class='text-left ' style="max-width: 800px !important;">评论内容</th>
-            <th class='text-left ' >时间</th>
-            <th class='text-left ' >状态</th>
-            <th class="text-left ">操作</th>
+            <th class='text-left nowrap' style="max-width: 800px !important;">评论内容</th>
+            <th class='text-left nowrap' >时间</th>
+            <th class='text-left nowrap' >状态</th>
+            <th class="text-left nowrap">操作</th>
         </tr>
         </thead>
         <tbody>