1

.idea/workspace.xml

@@ -3,7 +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/common/model/DatumIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/DatumIntro.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_url/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/series_datum/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/series_datum/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -239,7 +242,7 @@
       <workItem from="1676854339163" duration="15125000" />
       <workItem from="1676940616770" duration="17337000" />
       <workItem from="1677026931281" duration="15461000" />
-      <workItem from="1677113364166" duration="8400000" />
+      <workItem from="1677113364166" duration="8911000" />
     </task>
     <servers />
   </component>
@@ -365,10 +368,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1211" y="541" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1675311007920" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1676870715449">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1677131988307">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1676870715449" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1677131988307" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1676355565535">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Datum.php

@@ -219,6 +219,9 @@ class Datum extends Base
      * @return name:datum_url type:string default:-- desc:资料地址
      * @return name:down_num type:string default:-- desc:下载量
      * @return name:follow_switch type:int default:-- desc:订阅开关状态【0关闭1开启】
+     * @return name:video_id type:int default:-- desc:视频id
+     * @return name:video_item type:int default:-- desc:item_id
+     * @return name:goods_id type:int default:-- desc:商品id
 
      * @return name:url_arr type:array default:-- desc:资料
      * @return name:url_arr.id type:int default:-- desc:[请求/api/Datum/getDatumItemInfo用，请求资料模块其他接口参数：url_id]

application/nutrition/controller/SeriesDatum.php

@@ -4,6 +4,7 @@ use app\common\model\datum_idIntro;
 use app\common\model\datum_idUrl;
 use app\common\model\DatumIntro;
 use app\common\model\DatumUrl;
+use app\common\model\SupplierGoods;
 use library\Controller;
 use library\tools\Data;
 use think\Db;
@@ -159,6 +160,12 @@ class SeriesDatum extends Controller
         if($this->request->isGet()){
             $this->datum_cate = DatumCate::column('id,title,is_vip','id');
             $this->r = input('get.r',0);
+            // 视频
+            $this->video_list = \app\common\model\VideoIntro::with('videoArr')
+                ->where(['is_deleted'=>0])->order('id desc')
+                ->select()->toArray();
+            $this->supplier_goods = SupplierGoods::getSupplierGoodsList($this->request->action() == 'add' ? ['s.is_deleted'=>0]: []);
+
         }
 
         if($this->request->isPost()) {

application/nutrition/view/datum_url/form.html

@@ -33,43 +33,6 @@
                 </div>
             </div>
 
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">关联视频</label>
-                <div class="layui-input-inline">
-                    <select name="video_id" lay-filter ="video_id">
-                        <option value="0">请选择</option>
-                        {foreach $video_list as $vk=>$vv}
-                        <option  {if isset($vo.video_id) && $vo.video_id == $vv['id'] }selected{/if} data-vl_key="{$vk}" value="{$vv['id']}">{$vv['title']}</option>
-                        {/foreach}
-                    </select>
-                </div>
-
-
-                <div class="layui-input-inline">
-                    <select name="video_item" lay-filter ="video_item">
-                        <option value="0">请选择</option>
-                        {foreach $video_list as $vk=>$vv}
-                        {if isset($vo.video_id) && $vo.video_id == $vv['id'] }
-                        {foreach $vv['video_arr'] as $cln}
-                        <option {if isset($vo.video_item) && $vo.video_item == $cln['id']} selected  {/if} value="{$cln['id']}">{$cln['title']}</option>
-                        {/foreach}
-                        {/if}
-                        {/foreach}
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item" >
-                <label class="layui-form-label ">关联商品</label>
-                <div class="layui-input-inline"  style="width: 300px">
-                    <select name="goods_id" lay-filter ="goods_id">
-                        <option value="0">请选择</option>
-                        {foreach $supplier_goods as $gk=>$gv}
-                        <option  {if isset($vo.goods_id) && $vo.goods_id == $gv['id'] }selected{/if}  value="{$gv['id']}">{$gv['name']}------{$gv['title']}</option>
-                        {/foreach}
-                    </select>
-                </div>
-            </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label label-required">PDF文件</label>

application/nutrition/view/series_datum/form.html

@@ -25,7 +25,43 @@
                 </div>
             </div>
 
+            <div class="layui-form-item">
+                <label class="layui-form-label label-required">关联视频</label>
+                <div class="layui-input-inline">
+                    <select name="video_id" lay-filter ="video_id">
+                        <option value="0">请选择</option>
+                        {foreach $video_list as $vk=>$vv}
+                        <option  {if isset($vo.video_id) && $vo.video_id == $vv['id'] }selected{/if} data-vl_key="{$vk}" value="{$vv['id']}">{$vv['title']}</option>
+                        {/foreach}
+                    </select>
+                </div>
+
+
+                <div class="layui-input-inline">
+                    <select name="video_item" lay-filter ="video_item">
+                        <option value="0">请选择</option>
+                        {foreach $video_list as $vk=>$vv}
+                        {if isset($vo.video_id) && $vo.video_id == $vv['id'] }
+                        {foreach $vv['video_arr'] as $cln}
+                        <option {if isset($vo.video_item) && $vo.video_item == $cln['id']} selected  {/if} value="{$cln['id']}">{$cln['title']}</option>
+                        {/foreach}
+                        {/if}
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
 
+            <div class="layui-form-item" >
+                <label class="layui-form-label ">关联商品</label>
+                <div class="layui-input-inline"  style="width: 300px">
+                    <select name="goods_id" lay-filter ="goods_id">
+                        <option value="0">请选择</option>
+                        {foreach $supplier_goods as $gk=>$gv}
+                        <option  {if isset($vo.goods_id) && $vo.goods_id == $gv['id'] }selected{/if}  value="{$gv['id']}">{$gv['name']}------{$gv['title']}</option>
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
 
             <div class="layui-form-item">
                 <label class="layui-form-label label-required">标签</label>
@@ -66,5 +102,20 @@
     <script>
         window.form.render();
         $('[name="cover"]').uploadOneImage();
+        // 关联视频监听
+        form.on('select(video_id)', function(data){
+            var cl_html = '<option value="0">请选择</option>';
+            if(data.value == 0) {
+                $("select[name='video_item']").html(cl_html);
+            }else{
+                var vl_key =  data.elem[data.elem.selectedIndex].dataset.vl_key;
+                var video_list = {:json_encode($video_list)};
+                $.each(video_list[vl_key]['video_arr'],function (ck,cv) {
+                    cl_html +='<option value="'+cv.id+'">'+cv.title+'</option>';
+                })
+                $("select[name='video_item']").html(cl_html);
+            }
+            window.form.render();
+        });
     </script>
 </div>