chuweiqiang 1 year ago
parent
commit
32213a161c

+ 1 - 1
application/admin/controller/video/Video.php

@@ -35,7 +35,7 @@ class Video extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\video\Video;
-
+        $this->view->assign("IsDeletedList", $this->model->getIsDeletedList());
     }
 
 

+ 8 - 1
application/admin/controller/video/VideoFile.php

@@ -35,7 +35,8 @@ class VideoFile extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\video\VideoFile;
-
+        $this->view->assign("IsDeletedList", $this->model->getIsDeletedList());
+        $this->view->assign("IsTryList", $this->model->getIsTryList());
     }
 
 
@@ -65,8 +66,14 @@ class VideoFile extends Backend
             return $this->selectpage();
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $data = input();
+        $where_e = [];
+        if(isset($data['video_id']) && $data['video_id'] != null && $data['video_id'] != ''){
+            $where_e['video_id'] = $data['video_id'];
+        }
         $list = $this->model
             ->where($where)
+            ->where($where_e)
             ->where('is_deleted',1)
             ->order($sort, $order)
             ->paginate($limit);

+ 8 - 5
application/admin/model/video/Video.php

@@ -8,13 +8,13 @@ use think\Model;
 class Video extends Model
 {
 
-    
 
-    
+
+
 
     // 表名
     protected $name = 'video';
-    
+
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'integer';
 
@@ -27,9 +27,12 @@ class Video extends Model
     protected $append = [
 
     ];
-    
 
-    
+    public function getIsDeletedList()
+    {
+        return ['0' => __('是'), '1' => __('否')];
+    }
+
 
 
 

+ 13 - 5
application/admin/model/video/VideoFile.php

@@ -8,13 +8,13 @@ use think\Model;
 class VideoFile extends Model
 {
 
-    
 
-    
+
+
 
     // 表名
     protected $name = 'video_file';
-    
+
     // 自动写入时间戳字段
     protected $autoWriteTimestamp = 'integer';
 
@@ -27,9 +27,17 @@ class VideoFile extends Model
     protected $append = [
 
     ];
-    
 
-    
+
+    public function getIsDeletedList()
+    {
+        return ['0' => __('是'), '1' => __('否')];
+    }
+
+    public function getIsTryList()
+    {
+        return ['0' => __('是'), '1' => __('否')];
+    }
 
 
 

+ 1 - 1
application/admin/view/books/books/index.html

@@ -87,7 +87,7 @@
 
                 <div class="col-xs-12 col-sm-6 col-md-3">
                     <div class="form-group">
-                        <label class="control-label">用户名</label>
+                        <label class="control-label">系列</label>
                         <input type="hidden" class="operate" data-name="series_id" value="="/>
                         <div>
                             <input id="c-series_id" data-source="books.books_series/index" data-primary-key="id"

+ 34 - 2
application/admin/view/video/video_file/add.html

@@ -9,15 +9,47 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-video_id" data-rule="required" data-source="video/index" class="form-control selectpage" name="row[video_id]" type="text" value="">
+            {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}">
+            {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}
+
         </div>
     </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <textarea id="c-url" class="form-control " rows="5" name="row[url]" cols="50"></textarea>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-url" class="form-control " rows="5" name="row[url]" cols="50"></textarea>
+            <div class="input-group">
+                <input id="c-url" class="form-control" size="50" name="row[url]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-url" class="btn btn-danger faupload" data-input-id="c-url" data-multiple="false" data-preview-id="p-url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-url" class="btn btn-primary fachoose" data-input-id="c-url" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-url"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-url"></ul>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">是否试看:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select  id="c-is_awards" class="form-control selectpicker" name="row[is_try]">
+                {foreach name="IsTryList" item="vo"}
+                <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 41 - 2
application/admin/view/video/video_file/edit.html

@@ -6,18 +6,57 @@
             <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
         </div>
     </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <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>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <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}">
+            {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}">
+            {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}
+
         </div>
     </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <textarea id="c-url" class="form-control " rows="5" name="row[url]" cols="50">{$row.url|htmlentities}</textarea>-->
+<!--        </div>-->
+<!--    </div>-->
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-url" class="form-control " rows="5" name="row[url]" cols="50">{$row.url|htmlentities}</textarea>
+            <div class="input-group">
+                <input id="c-url" class="form-control" size="50" name="row[url]" type="text" value="{$row.url|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-url" class="btn btn-danger faupload" data-input-id="c-url" data-multiple="false" data-preview-id="p-url"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-url" class="btn btn-primary fachoose" data-input-id="c-url" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-url"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-url"></ul>
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">是否试看:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select  id="c-is_awards" class="form-control selectpicker" name="row[is_try]">
+                {foreach name="IsTryList" item="vo"}
+                <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 5
application/admin/view/video/video_file/index.html

@@ -7,14 +7,10 @@
                 <div class="widget-body no-padding">
                     <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/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</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-danger btn-del btn-disabled disabled {:$auth->check('video/video_file/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
 
-                        
-
-                        
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('video/video_file/edit')}"

+ 8 - 2
public/assets/js/backend/video/video_file.js

@@ -27,11 +27,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'video_id', title: __('Video_id')},
+                        // {field: 'video_id', title: __('Video_id')},
                         {field: 'sort', title: __('Sort')},
                         {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
+                        }
                     ]
                 ]
             });

+ 16 - 0
public/assets/js/fast.js

@@ -132,6 +132,22 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 title = options && options.title ? options.title : (title ? title : "");
                 url = Fast.api.fixurl(url);
                 url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1";
+                console.log('url-',url);
+                console.log('title-',title);
+                console.log('options-',options);
+                //传参
+                var params = typeof options !== 'undefined' ? options.params : null;
+                if(params){
+                    var params_str = JSON.stringify(params);
+                    params_str = params_str.replace(/:/g,'='),
+                        params_str =params_str.replace(/,/g,'&'),
+                        params_str = params_str.replace('}',''),
+                        params_str =params_str.replace('{',''),
+                        params_str =params_str.replace(/"/g,''),
+
+                        url = url + "&" + params_str;
+                }
+
                 var area = Fast.config.openArea != undefined ? Fast.config.openArea : [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%'];
                 options = $.extend({
                     type: 2,