1

.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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.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/controller/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -191,7 +192,7 @@
       <workItem from="1669448616248" duration="5065000" />
       <workItem from="1669597148644" duration="17061000" />
       <workItem from="1669682447842" duration="24394000" />
-      <workItem from="1669769873624" duration="1998000" />
+      <workItem from="1669769873624" duration="2931000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/VideoManage.php

@@ -186,11 +186,11 @@ class VideoManage extends Controller
 
         if($this->request->isPost()) {
             $data['up_type'] = 2;
-            if($data['up_type'] == 1){
+            /*if($data['up_type'] == 1){
                 $data['url'] = $data['up_url'];
             }else{
                 $data['url'] = $data['path'];
-            }
+            }*/
             if(empty($data['cover'])) $this->error('请上传视频封面');
             if(empty($data['ali_vid'])) $this->error('云点播ID不能为空');
             if(!empty($data['phone'])) {

application/nutrition/controller/VideoUrl.php

@@ -132,11 +132,11 @@ class VideoUrl extends Controller
         }
         if($this->request->isPost()){
             list($post) = [$this->request->post()];
-            if($post['up_type'] == 1){
+           /* if($post['up_type'] == 1){
                 $data['url'] = $post['up_url'];
             }else{
                 $data['url'] = $post['path'];
-            }
+            }*/
             if(empty($data['cover'])) $this->error('请上传视频封面');
             if(empty($data['ali_vid'])) $this->error('云点播ID不能为空');
             $vid_info = getVideoTime($data['ali_vid']);