lizhen_gitee 2 months ago
parent
commit
0d612f02fb

+ 2 - 1
application/admin/controller/Payvipconfig.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 充值配置
+ * 充值vip配置
  *
  * @icon fa fa-circle-o
  */
@@ -23,6 +23,7 @@ class Payvipconfig extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Payvipconfig;
         $this->view->assign("isShowList", $this->model->getIsShowList());
+        $this->view->assign("vipLevelList", $this->model->getVipLevelList());
     }
 
     public function import()

+ 1 - 0
application/admin/controller/Startadvert.php

@@ -23,6 +23,7 @@ class Startadvert extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Startadvert;
         $this->view->assign("isShowList", $this->model->getIsShowList());
+        $this->view->assign("typeList", $this->model->getTypeList());
     }
 
     public function import()

+ 3 - 1
application/admin/lang/zh-cn/messagesys.php

@@ -4,5 +4,7 @@ return [
     'Id'         => 'ID',
     'Title'      => '消息标题',
     'Info'       => '消息内容',
-    'Createtime' => '创建时间'
+    'Createtime' => '创建时间',
+    'Long_title' => '长标题',
+    'Image'      => '封面图'
 ];

+ 13 - 10
application/admin/lang/zh-cn/payvipconfig.php

@@ -1,14 +1,17 @@
 <?php
 
 return [
-    'Id'        => 'ID',
-    'Money'     => '金额',
-    'Days'      => '天数',
-    'Title'     => '展示',
-    'Info'      => '划线价格',
-    'Is_show'   => '是否展示',
-    'Is_show 1' => '是',
-    'Is_show 0' => '否',
-    'Weight'    => '排序',
-    'Gold_num'  => '赠送金币数量'
+    'Id'           => 'ID',
+    'Money'        => '实扣人民币金额',
+    'Days'         => 'VIP天数',
+    'Title'        => '展示',
+    'Info'         => '划线价格',
+    'Is_show'      => '是否展示',
+    'Is_show 1'    => '是',
+    'Is_show 0'    => '否',
+    'Weight'       => '排序',
+    'Vip_level'    => 'vip等级',
+    'Vip_level 10' => 'VIP',
+    'Vip_level 20' => 'SVIP',
+    'Gold_num'     => '赠送金币数量'
 ];

+ 11 - 5
application/admin/lang/zh-cn/startadvert.php

@@ -1,9 +1,15 @@
 <?php
 
 return [
-    'Id'        => 'ID',
-    'Image'     => '图片',
-    'Is_show'   => '是否显示',
-    'Is_show 1' => '显示',
-    'Is_show 0' => '隐藏'
+    'Id'         => 'ID',
+    'Images'     => '图片',
+    'Video_file' => '视频',
+    'Url'        => '跳转链接',
+    'Is_show'    => '是否显示',
+    'Is_show 1'  => '上架',
+    'Is_show 0'  => '下架',
+    'Type'       => '类型',
+    'Type 1'     => '视频',
+    'Type 2'     => '图片',
+    'Minsecond'  => 'N秒后可跳过'
 ];

+ 15 - 1
application/admin/model/Payvipconfig.php

@@ -25,7 +25,8 @@ class Payvipconfig extends Model
 
     // 追加属性
     protected $append = [
-        'is_show_text'
+        'is_show_text',
+        'vip_level_text'
     ];
     
 
@@ -35,6 +36,11 @@ class Payvipconfig extends Model
         return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
     }
 
+    public function getVipLevelList()
+    {
+        return ['10' => __('Vip_level 10'), '20' => __('Vip_level 20')];
+    }
+
 
     public function getIsShowTextAttr($value, $data)
     {
@@ -44,6 +50,14 @@ class Payvipconfig extends Model
     }
 
 
+    public function getVipLevelTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['vip_level']) ? $data['vip_level'] : '');
+        $list = $this->getVipLevelList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
 
 
 }

+ 15 - 1
application/admin/model/Startadvert.php

@@ -25,7 +25,8 @@ class Startadvert extends Model
 
     // 追加属性
     protected $append = [
-        'is_show_text'
+        'is_show_text',
+        'type_text'
     ];
     
 
@@ -35,6 +36,11 @@ class Startadvert extends Model
         return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
     }
 
+    public function getTypeList()
+    {
+        return ['1' => __('Type 1'), '2' => __('Type 2')];
+    }
+
 
     public function getIsShowTextAttr($value, $data)
     {
@@ -44,6 +50,14 @@ class Startadvert extends Model
     }
 
 
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
 
 
 }

+ 20 - 0
application/admin/view/messagesys/add.html

@@ -12,6 +12,26 @@
             <textarea id="c-info" class="form-control " rows="5" name="row[info]" cols="50"></textarea>
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Long_title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-long_title" class="form-control" name="row[long_title]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 20 - 0
application/admin/view/messagesys/edit.html

@@ -12,6 +12,26 @@
             <textarea id="c-info" class="form-control " rows="5" name="row[info]" cols="50">{$row.info|htmlentities}</textarea>
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Long_title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-long_title" class="form-control" name="row[long_title]" type="text" value="{$row.long_title|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/messagesys/index.html

@@ -18,8 +18,8 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>-->
-
+                        </div>
+-->
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"

+ 1 - 6
application/admin/view/paygoldconfig/add.html

@@ -66,12 +66,7 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" class="form-control" name="row[jewel]" type="number" value="0">
-        </div>
-    </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 6
application/admin/view/paygoldconfig/edit.html

@@ -66,12 +66,7 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-jewel" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 19 - 7
application/admin/view/payvipconfig/add.html

@@ -21,13 +21,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Info')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-info" class="form-control" name="row[info]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gold_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gold_num" class="form-control" name="row[gold_num]" type="number">
+            <input id="c-info" class="form-control" name="row[info]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -48,6 +42,24 @@
             <input id="c-weight" class="form-control" name="row[weight]" type="number" value="1">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Vip_level')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-vip_level" data-rule="required" class="form-control selectpicker" name="row[vip_level]">
+                {foreach name="vipLevelList" item="vo"}
+                    <option value="{$key}" {in name="key" value="10"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gold_num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gold_num" data-rule="required" class="form-control" name="row[gold_num]" type="number" value="0">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 18 - 6
application/admin/view/payvipconfig/edit.html

@@ -25,12 +25,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gold_num')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-gold_num" class="form-control" name="row[gold_num]" type="number" value="{$row.gold_num|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -48,6 +42,24 @@
             <input id="c-weight" class="form-control" name="row[weight]" type="number" value="{$row.weight|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Vip_level')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-vip_level" data-rule="required" class="form-control selectpicker" name="row[vip_level]">
+                {foreach name="vipLevelList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.vip_level"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Gold_num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-gold_num" data-rule="required" class="form-control" name="row[gold_num]" type="number" value="{$row.gold_num|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/payvipconfig/index.html

@@ -8,8 +8,8 @@
                     <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('payvipconfig/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('payvipconfig/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('payvipconfig/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('payvipconfig/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('payvipconfig/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('payvipconfig/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('payvipconfig/multi')?'':'hide'}">

+ 46 - 8
application/admin/view/startadvert/add.html

@@ -1,31 +1,69 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" class="form-control" size="50" name="row[image]" type="text">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-image"></span>
+                <span class="msg-box n-right" for="c-images"></span>
             </div>
-            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+            <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_file')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-video_file" data-rule="required" class="form-control" size="50" name="row[video_file]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-video_file" class="btn btn-danger faupload" data-input-id="c-video_file" data-multiple="false" data-preview-id="p-video_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-video_file" class="btn btn-primary fachoose" data-input-id="c-video_file" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-video_file"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-video_file"></ul>
+        </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">
+            <input id="c-url" data-rule="required" class="form-control" name="row[url]" type="text" value="">
+        </div>
+    </div>-->
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_show" class="form-control selectpicker" name="row[is_show]">
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
                 {foreach name="isShowList" item="vo"}
-                    <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>
+                    <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">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="2"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Minsecond')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-minsecond" data-rule="required" class="form-control" name="row[minsecond]" type="number" value="3">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 45 - 7
application/admin/view/startadvert/edit.html

@@ -1,24 +1,44 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-image"></span>
+                <span class="msg-box n-right" for="c-images"></span>
             </div>
-            <ul class="row list-inline faupload-preview" id="p-image"></ul>
+            <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_file')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-video_file" data-rule="required" class="form-control" size="50" name="row[video_file]" type="text" value="{$row.video_file|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-video_file" class="btn btn-danger faupload" data-input-id="c-video_file" data-multiple="false" data-preview-id="p-video_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-video_file" class="btn btn-primary fachoose" data-input-id="c-video_file" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-video_file"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-video_file"></ul>
+        </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">
+            <input id="c-url" data-rule="required" class="form-control" name="row[url]" type="text" value="{$row.url|htmlentities}">
+        </div>
+    </div>-->
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-is_show" class="form-control selectpicker" name="row[is_show]">
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
                 {foreach name="isShowList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.is_show"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -26,6 +46,24 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Minsecond')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-minsecond" data-rule="required" class="form-control" name="row[minsecond]" type="number" value="{$row.minsecond|htmlentities}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 1
application/admin/view/startadvert/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('startadvert/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('startadvert/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('startadvert/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('startadvert/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('startadvert/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 

+ 2 - 0
public/assets/js/backend/messagesys.js

@@ -29,6 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
 //                        {field: 'info', title: __('Info')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'long_title', title: __('Long_title'), operate: 'LIKE'},
+                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 0 - 1
public/assets/js/backend/paygoldconfig.js

@@ -35,7 +35,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'first_vipdays', title: __('First_vipdays')},
                         {field: 'vip_gold', title: __('Vip_gold')},
                         {field: 'is_default', title: __('Is_default'), searchList: {"0":__('Is_default 0'),"1":__('Is_default 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'jewel', title: __('Jewel')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 4 - 3
public/assets/js/backend/payvipconfig.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'payvipconfig/index' + location.search,
                     add_url: 'payvipconfig/add',
                     edit_url: 'payvipconfig/edit',
-//                    del_url: 'payvipconfig/del',
+                    del_url: 'payvipconfig/del',
                     multi_url: 'payvipconfig/multi',
                     import_url: 'payvipconfig/import',
                     table: 'payvip_config',
@@ -29,10 +29,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'money', title: __('Money'), operate:'BETWEEN'},
                         {field: 'days', title: __('Days')},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
-                        {field: 'info', title: __('Info'), operate: 'LIKE'},
-                        {field: 'gold_num', title: __('Gold_num')},
+                        {field: 'info', title: __('Info')},
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
                         {field: 'weight', title: __('Weight')},
+                        {field: 'vip_level', title: __('Vip_level'), searchList: {"10":__('Vip_level 10'),"20":__('Vip_level 20')}, formatter: Table.api.formatter.normal},
+                        {field: 'gold_num', title: __('Gold_num')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 5 - 1
public/assets/js/backend/startadvert.js

@@ -26,8 +26,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+                        {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+                        {field: 'video_file', title: __('Video_file'), operate: false},
+//                        {field: 'url', title: __('Url'), operate: 'LIKE', formatter: Table.api.formatter.url},
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'minsecond', title: __('Minsecond')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]