wupengfei 2 years ago
parent
commit
44f6a4e817

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <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/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" 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" />
@@ -197,7 +198,7 @@
       <workItem from="1669941719663" duration="1986000" />
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
-      <workItem from="1670287594399" duration="4230000" />
+      <workItem from="1670287594399" duration="6481000" />
     </task>
     <servers />
   </component>

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

@@ -179,8 +179,7 @@ class VideoManage extends Controller
                     $this->video_url = VideoUrl::where(['video_id'=>$data['id']])->order('sort desc,id asc')->select()->toArray();
                 }
             }
-            // 文章列表
-            $this->article_list = \app\common\model\ArticleIntro::with('itemList')
+            $this->article_list =\app\common\model\ArticleIntro::with('itemChildren')
                 ->field('id,title')
                 ->where(['is_deleted'=>0])->order('id desc')
                 ->select()->toArray();

+ 2 - 2
application/nutrition/view/video_manage/form.html

@@ -79,7 +79,7 @@
                         <option value="0">请选择</option>
                         {foreach $article_list as $vk=>$vv}
                             {if isset($vo.article_id) && $vo.article_id == $vv['id'] }
-                                {foreach $vv['item_list'] as $cln}
+                                {foreach $vv['item_children'] as $cln}
                                     <option {if isset($vo.article_item) && $vo.article_item == $cln['id']} selected  {/if} value="{$cln['id']}">{$cln['title']}</option>
                                 {/foreach}
                             {/if}
@@ -287,7 +287,7 @@
             }else{
                 var vl_key =  data.elem[data.elem.selectedIndex].dataset.vl_key;
                 var article_list = {:json_encode($article_list)};
-                $.each(article_list[vl_key]['item_list'],function (ck,cv) {
+                $.each(article_list[vl_key]['item_children'],function (ck,cv) {
                     cl_html +='<option value="'+cv.id+'">'+cv.title+'</option>';
                 })
                 $("select[name='article_item']").html(cl_html);