wupengfei há 2 anos atrás
pai
commit
85d8fff36f

+ 8 - 2
.idea/workspace.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -186,7 +191,8 @@
       <workItem from="1668991533353" duration="2596000" />
       <workItem from="1669429338320" duration="861000" />
       <workItem from="1669448616248" duration="5065000" />
-      <workItem from="1669597148644" duration="16412000" />
+      <workItem from="1669597148644" duration="17061000" />
+      <workItem from="1669682447842" duration="1789000" />
     </task>
     <servers />
   </component>

+ 0 - 9
application/common.php

@@ -340,15 +340,6 @@ function http_post_json($url, $jsonStr,$token_res)
     return  json_decode($response,true);
 }
 
-function encryptStr($str,$key,$base64 = true)
-{
-     @$block = mcrypt_get_block_size('des','ecb');
-     $pad =  $block - (strlen($str)%$block);
-     $str .= str_repeat(chr($pad),$pad);
-     @$enc_str = mcrypt_encrypt(MCRYPT_DES,$key,$str,MCRYPT_MODE_ECB);
-     return  $enc_str;
-}
-
 
 function getVideoTime($ali_id)
 {

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

@@ -197,6 +197,7 @@ class VideoManage extends Controller
                 $item_title = input('post.item_title');
                 if(empty($item_title)) $this->error('请上传视频');
             }
+            if(empty($data['cover'])) $this->error('请上传视频封面');
             if(!empty($data['phone'])) {
                 $user_id = User::where('phone|email',$data['phone'])->value('id');
                 if(!$user_id) $this->error('该账号未注册');

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

@@ -18,7 +18,7 @@
             <div class="layui-form-item">
                 <label class="layui-form-label label-required">简介</label>
                 <div class="layui-input-block">
-                    <input name="desc" maxlength="100"  value='{$vo.desc|default=""}' placeholder="请输入简介" class="layui-input">
+                    <textarea placeholder="请输入简介" class="layui-textarea" name="label">{$vo.desc|default=''}</textarea>
                 </div>
             </div>