wupengfei 2 rokov pred
rodič
commit
e523406b25

+ 5 - 1
.idea/workspace.xml

@@ -3,7 +3,11 @@
   <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/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/one_article/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_article/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/one_datum/form.html" 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" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_url/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -205,7 +209,7 @@
       <workItem from="1670547445908" duration="11821000" />
       <workItem from="1671196552398" duration="3806000" />
       <workItem from="1671605812878" duration="482000" />
-      <workItem from="1671670352202" duration="4915000" />
+      <workItem from="1671670352202" duration="5424000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/nutrition/view/datum_url/form.html

@@ -24,7 +24,7 @@
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label label-required">文件</label>
+                <label class="layui-form-label label-required">PDF文件</label>
                 <label class="layui-col-xs10 relative">
                     <label class="layui-col-xs9 think-form-group-left">
                         <input name="url" value='{$vo.url|default=""}'  readonly placeholder="请上传" class="layui-input">

+ 46 - 1
application/nutrition/view/one_article/form.html

@@ -167,7 +167,34 @@
 
             </div>
 
-            <div class="layui-form-item " >
+
+
+            <div class="layui-form-item" style="display: none">
+                <label class="layui-form-label label-required">描述类型</label>
+                <div class="layui-input-inline">
+                    <select name="content_type" lay-filter ="content_type">
+                        {foreach [1=>'富文本',2=>'PDF'] as $ck=>$cv}
+                        {if !empty($vo.content_type) &&  $vo.up_type == $ck }
+                        <option selected data-cl_key="{$ck}" value="{$ck}">{$cv}</option>
+                        {else}
+                        <option data-cl_key="{$ck}" value="{$ck}">{$cv}</option>
+                        {/if}
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item pdf">
+                <label class="layui-form-label label-required">PDF文件</label>
+                <label class="layui-col-xs10 relative">
+                    <label class="layui-col-xs9 think-form-group-left">
+                        <input name="pdf" value='{$vo.pdf|default=""}'  readonly placeholder="请上传" class="layui-input">
+                    </label>
+                    <button type="button" class="layui-btn" id="test3"><i class="layui-icon"></i>上传文件</button>
+                </label>
+            </div>
+
+            <div class="layui-form-item content" >
                 <label class="layui-form-label">描述</label>
                 <div class="layui-input-block">
                     <textarea name="content">{$vo.content|default=""}</textarea>
@@ -242,6 +269,24 @@
         });
 
 
+        form.on('select(content_type)', function(data){
+            check_type()
+            window.form.render();
+        })
+
+
+        function check_type() {
+            if( $("select[name='content_type']").val() == 1) {
+                $(".content").show();
+                $(".ppt").hide();
+            }else{
+                $(".content").hide();
+                $(".ppt").show();
+            }
+            window.form.render();
+        }
+        check_type()
+
     </script>
 </div>
 {/block}

+ 1 - 1
application/nutrition/view/one_datum/form.html

@@ -10,7 +10,7 @@
             </div>
 
             <div class="layui-form-item">
-                <label class="layui-form-label label-required">文件</label>
+                <label class="layui-form-label label-required">PDF文件</label>
 
                 <label class="layui-col-xs10 relative">
                     <label class="layui-col-xs9 think-form-group-left">

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

@@ -130,7 +130,7 @@
             </div>
 
             <div class="layui-form-item">
-                <label class="layui-form-label label-required">PPT</label>
+                <label class="layui-form-label label-required">PDF</label>
                 <label class="layui-col-xs10 relative">
                     <label class="layui-col-xs9 think-form-group-left">
                         <input name="ppt" value='{$video_url.ppt|default=""}'  readonly placeholder="请上传" class="layui-input">

+ 1 - 1
application/nutrition/view/video_url/form.html

@@ -106,7 +106,7 @@
             </div>
 
             <div class="layui-form-item">
-                <label class="layui-form-label label-required">PPT</label>
+                <label class="layui-form-label label-required">PDF</label>
                 <label class="layui-col-xs10 relative">
                     <label class="layui-col-xs9 think-form-group-left">
                         <input name="ppt" value='{$vo.ppt|default=""}'  readonly placeholder="请上传" class="layui-input">