wupengfei 2 年之前
父节点
当前提交
50f1b99356
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 2
      .idea/workspace.xml
  2. 1 0
      application/nutrition/controller/VideoManage.php

+ 1 - 2
.idea/workspace.xml

@@ -4,7 +4,6 @@
     <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/VideoManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_manage/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_manage/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -191,7 +190,7 @@
       <workItem from="1669429338320" duration="861000" />
       <workItem from="1669448616248" duration="5065000" />
       <workItem from="1669597148644" duration="17061000" />
-      <workItem from="1669682447842" duration="1952000" />
+      <workItem from="1669682447842" duration="2029000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/nutrition/controller/VideoManage.php

@@ -161,6 +161,7 @@ class VideoManage extends Controller
     protected function _form_filter(&$data)
     {
         if($this->request->isGet()){
+            $data['type'] = 2;
             $all_cate  = VCM::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
             $this->r = input('get.r',0);
             $this->cate_tree = make_tree($all_cate);