完善表单器

application/admin/controller/AdminMenu.php

@@ -54,13 +54,13 @@ class AdminMenu extends AdminBase
 	    $table = Tabel::make($listdb,$tab)
 	    ->addTopButton('add',['title'=>'添加菜单','url'=>url('add',['gid'=>$gid])])
 	    ->addTopButton('delete')
-// 	    ->addRightButton('edit')
-// 	    ->addRightButton('delete')	    
+	    ->addRightButton('add',['title'=>'添加下级菜单','href'=>url('add',['pid'=>'__id__','gid'=>'__groupid__'])])
+	    ->addRightButton('delete')
+	    ->addRightButton('edit')	    	    
 	    //->addPageTips('省份管理')
 	    //->addOrder('id,list')
 	    ->addPageTitle('网站菜单管理')
-	    ->addNav($this->group_nav,$gid)
-	    ->addRightButton('add',['title'=>'添加下级菜单','href'=>url('add',['pid'=>'__id__','gid'=>'__groupid__'])]);
+	    ->addNav($this->group_nav,$gid) ;   
 
         return $table::fetchs();
 	}

application/admin/controller/Webmenu.php

@@ -44,9 +44,10 @@ class Webmenu extends AdminBase
 
 	    $table = Tabel::make($listdb,$tab)
 	    ->addTopButton('add',['title'=>'添加菜单','href'=>url('add',['type'=>$type])])
-	    ->addTopButton('delete')
-// 	    ->addRightButton('edit')
-// 	    ->addRightButton('delete')	    
+	    ->addTopButton('delete')	    
+	    ->addRightButton('add',['title'=>'添加下级菜单','href'=>url('add',['pid'=>'__id__'])])
+	    ->addRightButton('delete')	    
+	    ->addRightButton('edit')
 	    //->addPageTips('省份管理')
 	    //->addOrder('id,list')
 	    ->addPageTitle('网站菜单管理')
@@ -56,8 +57,7 @@ class Webmenu extends AdminBase
 	            2=>['title' => 'wap头部菜单', 'url' =>url('index',['type'=>2])],
 	            3=>['title' => 'wap底部菜单', 'url' =>url('index',['type'=>3])],
 	            
-	    ],$type)
-	    ->addRightButton('add',['title'=>'添加下级菜单','href'=>url('add',['pid'=>'__id__'])]);
+	    ],$type);
 
         return $table::fetchs();
 	}

application/common/field/file/form.php

@@ -175,10 +175,10 @@ jQuery(document).ready(function() {
         uploader.on('error', function (type) {
             switch (type) {
                 case 'Q_TYPE_DENIED':
-                    Dolphin.notify('文件类型不正确，只允许上传后缀名为：'+f_ext+'，请重新上传！', 'danger');
+                    layer.alert('文件类型不正确，只允许上传后缀名为：'+f_ext+'，请重新上传！');
                     break;
                 case 'F_EXCEED_SIZE':
-                    Dolphin.notify('文件不得超过'+ (f_size/1024) +'kb，请重新上传！', 'danger');
+                    layer.alert('文件不得超过'+ (f_size/1024) +'kb，请重新上传！');
                     break;
             }
         });

application/common/upgrade/U6.php

@@ -0,0 +1,10 @@
+<?php
+namespace app\common\upgrade;
+
+class U6{
+	public function up(){
+		 copy('https://x1.php168.com/public/static/images/recom.png',
+		         ROOT_PATH.'public/static/images/recom.png');
+		 
+	}
+}

plugins/area/admin/City.php

@@ -39,7 +39,7 @@ class City extends AdminBase
 	            ['name','名称','text.edit'],
 	            ['pid','所属'.$this->cfg_fname,'select',$array],
 	            ['list','排序值','text.edit'],
-	            ['right_button', '操作', 'btn'],
+// 	            ['right_button', '操作', 'btn'],
 	    ];
 	    
 	    if($this->cfg_level==1){

plugins/comment/admin/Content.php

@@ -30,7 +30,7 @@ class Content extends AdminBase
 	            ['sysid','所属模块','text'],
 	            //['pid','所属'.$this->cfg_fname,'select',$array],
 	            ['list','排序值','text.edit'],
-	            ['right_button', '操作', 'btn'],
+// 	            ['right_button', '操作', 'btn'],
 	    ];
 	    
 	    $table = Tabel::make($listdb,$tab)

plugins/log/admin/Action.php

@@ -18,7 +18,8 @@ class Action extends AdminBase
 	protected $tab_ext = [
 			'page_title'=>'后台操作日志管理',
 	        'top_button'=>[ ['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	protected function getOrder(){
 	    return 'id desc';

plugins/log/admin/Login.php

@@ -18,7 +18,8 @@ class Login extends AdminBase
 	protected $tab_ext = [
 			'page_title'=>'后台登录日志管理',
 	        'top_button'=>[ ['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	
 	protected function getOrder(){

plugins/marketing/admin/Moneylog.php

@@ -19,7 +19,8 @@ class Moneylog extends AdminBase
 	protected $tab_ext = [
 			'page_title'=>'用户积分使用消费记录与赚取记录',
 	        'top_button'=>[ ['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	
 	protected function _initialize()

plugins/marketing/admin/RmbConsume.php

@@ -18,7 +18,8 @@ class RmbConsume extends AdminBase
 	protected $tab_ext = [
 	        'page_title'=>'用户人民币消费记录与充值记录',
 	        'top_button'=>[ ['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	
 	protected function _initialize()

plugins/marketing/admin/RmbGetout.php

@@ -18,7 +18,8 @@ class RmbGetout extends AdminBase
 	protected $tab_ext = [
 			'page_title'=>'会员提现管理',
 	        'top_button'=>[ ['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	
 	protected function _initialize()

plugins/marketing/admin/RmbInfull.php

@@ -18,7 +18,8 @@ class RmbInfull extends AdminBase
 	protected $tab_ext = [
 	        'page_title'=>'人民币充值管理',
 	        'top_button'=>[['type'=>'delete']],
-	        'hidden_edit'=>true,	
+	        'right_button'=>[ ['type'=>'delete']],
+// 	        'hidden_edit'=>true,	
 	];
 	protected function _initialize()
     {

template/admin_style/default/admin/common/form.htm

@@ -4,7 +4,7 @@
 }
 </style>
 <div class="MainContainers">
-<form name="form2" method="post" action="" class="{notempty name='$tab_ext.trigger'} form-trigger {else /}  layui-form  {/notempty}">
+<form name="form2" method="post" action="{:request()->url(true)}" onSubmit="return post_content(this);" class="{notempty name='$tab_ext.trigger'} form-trigger {else /}  layui-form  {/notempty}">
   <div class="Header"><span class="tag">{if ($tab_ext['page_title'])} {$tab_ext.page_title} {elseif (empty($info))}添加{else /}修改{/if}</span> </div>
   <div class="Conter">	
 	<!-- 功能接口钩子 -->
@@ -73,6 +73,37 @@
 </form>
 </div>
 
+<script type="text/javascript">
+var havepost = true;
+function post_content(opt){
+	var form = $(opt);
+	var form_data = form.serialize();
+	var url = form.attr('action');
+
+	if(havepost==false){
+		layer.alert('请不要重复提交');
+	}
+	var index = layer.load(1);
+	havepost = false;
+    $.post(url, form_data).success(function (res) {
+		layer.close(index);
+        if(res.code==1){
+			layer.msg(res.msg);
+			setTimeout(function(){
+				window.location.href = res.url;
+			},200);
+		}else{
+			layer.open({title: '提交失败',content:res.msg});
+		}
+    }).fail(function () {
+		layer.open({title: '提示',content: '服务器发生错误'});
+    });
+
+	return false;
+	
+}
+</script>
+
 {notempty name="$tab_ext.trigger"}
 <script type="text/javascript">
 var trigger_config = {