wupengfei 2 年之前
父節點
當前提交
fcf9cba7d9

+ 1 - 2
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <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.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.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>
@@ -192,7 +191,7 @@
       <workItem from="1669429338320" duration="861000" />
       <workItem from="1669448616248" duration="5065000" />
       <workItem from="1669597148644" duration="17061000" />
-      <workItem from="1669682447842" duration="1789000" />
+      <workItem from="1669682447842" duration="1952000" />
     </task>
     <servers />
   </component>

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

@@ -190,11 +190,11 @@ class VideoManage extends Controller
             }else{
                 $data['url'] = $data['path'];
             }
-
+            $data['type'] = 2;
             if($data['type'] == 1){
                 if( !$data['url']) $this->error('请上传视频');
             }else{
-                $item_title = input('post.item_title');
+                $item_title = input('post.ali_vid');
                 if(empty($item_title)) $this->error('请上传视频');
             }
             if(empty($data['cover'])) $this->error('请上传视频封面');

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

@@ -157,7 +157,7 @@
                 </div>
             </div>
 
-            <div class="layui-form-item">
+         <!--   <div class="layui-form-item">
                 <label class="layui-form-label label-required">上传类型</label>
                 <div class="layui-input-inline">
                     <select name="up_type" lay-filter ="up_type">
@@ -170,18 +170,18 @@
                         {/foreach}
                     </select>
                 </div>
-            </div>
+            </div>-->
 
 
-            <div class="layui-form-item up_video">
+          <!--  <div class="layui-form-item up_video">
                 <label class="layui-form-label label-required">视频上传</label>
                 <div class="layui-input-block">
                     <input class="up_url layui-input" name="up_url" type="hidden"  value="{$video_url.url|default=''}">
                 </div>
-            </div>
+            </div>-->
 
-            <div class="layui-form-item path"   style="display: none">
-                <label class="layui-form-label label-required">视频路径</label>
+            <div class="layui-form-item path">
+                <label class="layui-form-label">视频路径</label>
                 <div class="layui-input-block">
                     <input  name="path" class="layui-input"  value="{$video_url.url|default=''}" />
                 </div>