1

application/admin/controller/Ajax.php

@@ -83,7 +83,7 @@ class Ajax extends Backend
                 } catch (UploadException $e) {
                     $this->error($e->getMessage());
                 }
-                $this->success(__('Uploaded successful'), '', ['url' => cdnurl($attachment->url), 'fullurl' => cdnurl($attachment->url, true)]);
+                $this->success(__('Uploaded successful'), '', ['url' => cdnurl($attachment->url,true), 'fullurl' => cdnurl($attachment->url, true)]);
             } elseif ($method == 'clean') {
                 //删除冗余的分片文件
                 try {
@@ -115,7 +115,7 @@ class Ajax extends Backend
             } catch (UploadException $e) {
                 $this->error($e->getMessage());
             }
-
+            //替换为完整路径
             $this->success(__('Uploaded successful'), '', ['url' => cdnurl($attachment->url,true), 'fullurl' => cdnurl($attachment->url, true)]);
         }
     }

application/admin/view/video/video_file/add.html

@@ -6,11 +6,15 @@
             <input id="c-title" class="form-control" name="row[title]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
+    {if $Think.get.video_id && $Think.get.video_id != ''}
+    <div class="form-group" style="display: none">
+        {else}
+        <div class="form-group">
+            {/if}
+        <label class="control-label col-xs-12 col-sm-2">视频课程:</label>
         <div class="col-xs-12 col-sm-8">
             {if $Think.get.video_id && $Think.get.video_id != ''}
-            <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="{$Think.get.video_id}">
+            <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="{$Think.get.video_id}" style="display: none">
             {else}
             <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="">
             {/if}

application/admin/view/video/video_file/edit.html

@@ -12,11 +12,15 @@
 <!--            <input id="c-video_id" data-rule="required" data-source="video/index" class="form-control selectpage" name="row[video_id]" type="text" value="{$row.video_id|htmlentities}">-->
 <!--        </div>-->
 <!--    </div>-->
+    {if $Think.get.video_id && $Think.get.video_id != ''}
+    <div class="form-group" style="display: none">
+    {else}
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
+    {/if}
+        <label class="control-label col-xs-12 col-sm-2">视频课程:</label>
         <div class="col-xs-12 col-sm-8">
             {if $Think.get.video_id && $Think.get.video_id != ''}
-            <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="{$Think.get.video_id}">
+            <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="{$Think.get.video_id}" style="display: none">
             {else}
             <input id="c-video_id" data-rule="required" data-source="video.video/index" data-field="title" class="form-control selectpage" name="row[video_id]" type="text" value="{$row.video_id|htmlentities}">
             {/if}

application/admin/view/video/video_file/index.html

@@ -8,7 +8,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('video/video_file/edit?video_id='.$Think.get.video_id,)?'':'hide'}" title="{:__('Add')} " data-params="video_id={$Think.get.video_id}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('video/video_file/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('video/video_file/edit')?'':'hide'}" title="{:__('Edit')}" data-params="video_id={$Think.get.video_id}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('video/video_file/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
 
                     </div>

application/common/library/Upload.php

@@ -416,7 +416,10 @@ class Upload
             'extparam'    => '',
         );
         $attachment = new Attachment();
+        //替换为完整路径
+        $params['url'] = cdnurl($params['url'],true);
         $attachment->data(array_filter($params));
+
         $attachment->save();
 
         \think\Hook::listen("upload_after", $attachment);

public/assets/js/backend/video/video.js

@@ -33,7 +33,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'sort', title: __('Sort'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {
+                            field: 'operate',
+                            title: __('Operate'),
+                            table: table,
+                            events: Table.api.events.operate,
+                            formatter: Table.api.formatter.operate,
+                            buttons: [{
+                                name: 'detail',
+                                title: __('文件列表'),
+                                classname: 'btn btn-xs btn-primary btn-dialog',
+                                icon: 'fa fa-list',
+                                url: 'video.video_file/index?video_id={id}',
+                                extend: 'data-area=\'["75%","75%"]\'',
+                                callback: function (data) {
+                                    Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                }
+                            },],
+                        }
                     ]
                 ]
             });

public/assets/js/backend/video/video_file.js

@@ -29,6 +29,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         // {field: 'video_id', title: __('Video_id')},
                         {field: 'sort', title: __('Sort')},
+                        {
+                            field: 'is_try',
+                            title: '是否可以试看',
+                            formatter:function(value,row){
+                                if(row.is_try === "0"){
+                                    return "<span>是</span>";
+                                }else if(row.is_try === "1"){
+                                    return "<span>否</span>";
+                                }
+                            },
+                        },
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {

public/assets/js/require-upload.js

@@ -18,6 +18,12 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined,
                     var onUploadSuccess = up.options.onUploadSuccess;
                     var data = typeof ret.data !== 'undefined' ? ret.data : null;
                     //上传成功后回调
+                    //URL前缀
+                    let url_suffix = Config.upload.uploadurl == "ajax/upload" ? window.location.origin : Config.upload.cdnurl;
+                    if(data){
+                        data.url = url_suffix + data.url;
+                    }
+                    ret.data =data;
                     if (button) {
                         //如果有文本框则填充
                         var input_id = $(button).data("input-id") ? $(button).data("input-id") : "";