完善活动

application/admin/controller/Acitve.php → application/admin/controller/Active.php

@@ -11,19 +11,19 @@ use wxpay;
  *
  * @icon fa fa-circle-o
  */
-class Acitve extends Backend
+class Active extends Backend
 {
 
     /**
-     * Acitve模型对象
-     * @var \app\admin\model\Acitve
+     * Active模型对象
+     * @var \app\admin\model\Active
      */
     protected $model = null;
 
     public function _initialize()
     {
         parent::_initialize();
-        $this->model = new \app\admin\model\Acitve;
+        $this->model = new \app\admin\model\Active;
         $this->view->assign("typeList", $this->model->getTypeList());
         $this->view->assign("isFreeList", $this->model->getIsFreeList());
         $this->view->assign("isOverlyingList", $this->model->getIsOverlyingList());

application/admin/model/Acitve.php → application/admin/model/Active.php

@@ -5,7 +5,7 @@ namespace app\admin\model;
 use think\Model;
 
 
-class Acitve extends Model
+class Active extends Model
 {
 
     

application/admin/validate/Acitve.php → application/admin/validate/Active.php

@@ -4,7 +4,7 @@ namespace app\admin\validate;
 
 use think\Validate;
 
-class Acitve extends Validate
+class Active extends Validate
 {
     /**
      * 验证规则

application/admin/view/acitve/index.html → application/admin/view/active/index.html

@@ -17,12 +17,12 @@
                 <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('acitve/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('acitve/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('acitve/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('active/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('active/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('active/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
-                        <!--<div class="dropdown btn-group {:$auth->check('acitve/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('active/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <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>
@@ -33,8 +33,8 @@
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('acitve/edit')}"
-                           data-operate-del="{:$auth->check('acitve/del')}"
+                           data-operate-edit="{:$auth->check('active/edit')}"
+                           data-operate-del="{:$auth->check('active/del')}"
                            width="100%">
                     </table>
                 </div>

public/assets/js/backend/acitve.js → public/assets/js/backend/active.js

@@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格参数配置
             Table.api.init({
                 extend: {
-                    index_url: 'acitve/index' + location.search,
-                    add_url: 'acitve/add',
-                    edit_url: 'acitve/edit',
-                    del_url: 'acitve/del',
-                    multi_url: 'acitve/multi',
-                    import_url: 'acitve/import',
+                    index_url: 'active/index' + location.search,
+                    add_url: 'active/add',
+                    edit_url: 'active/edit',
+                    del_url: 'active/del',
+                    multi_url: 'active/multi',
+                    import_url: 'active/import',
                     table: 'active',
                 }
             });
@@ -56,6 +56,72 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
                             buttons: [
                                 {
+                                    name: 'activeorder',
+                                    text: '活动订单',
+                                    title: __('活动订单'),
+                                    extend: 'data-area=\'["85%", "85%"]\'',
+                                    classname: 'btn btn-xs btn-success btn-dialog',
+                                    icon: 'fa fa-list',
+                                    url: 'activeorder/index',
+                                    // callback: function (data) {
+                                    //     Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                    // }
+                                    // success: function (data, ret) {
+                                    //     // Layer.alert(ret.msg + ",返回数据：" + JSON.stringify(data));
+                                    //     Layer.alert(ret.msg);
+                                    //     //如果需要阻止成功提示，则必须使用return false;
+                                    //     return false;
+                                    // },
+                                    // error: function (data, ret) {
+                                    //     // console.log(data, ret);
+                                    //     Layer.alert(ret.msg);
+                                    //     return false;
+                                    // },
+                                    // callback: function (data) {
+                                    //     Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                    // },
+                                    // visible: function (row) {
+                                    //     if (row.status == 1 && row.purpose == 3) {
+                                    //         return true;
+                                    //     } else  {
+                                    //         return false;
+                                    //     }
+                                    // }
+                                },
+                                {
+                                    name: 'activeorder',
+                                    text: '报名人员',
+                                    title: __('报名人员'),
+                                    extend: 'data-area=\'["85%", "85%"]\'',
+                                    classname: 'btn btn-xs btn-success btn-dialog',
+                                    icon: 'fa fa-list',
+                                    url: 'activepeople/index',
+                                    // callback: function (data) {
+                                    //     Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                    // }
+                                    // success: function (data, ret) {
+                                    //     // Layer.alert(ret.msg + ",返回数据：" + JSON.stringify(data));
+                                    //     Layer.alert(ret.msg);
+                                    //     //如果需要阻止成功提示，则必须使用return false;
+                                    //     return false;
+                                    // },
+                                    // error: function (data, ret) {
+                                    //     // console.log(data, ret);
+                                    //     Layer.alert(ret.msg);
+                                    //     return false;
+                                    // },
+                                    // callback: function (data) {
+                                    //     Layer.alert("接收到回传数据：" + JSON.stringify(data), {title: "回传数据"});
+                                    // },
+                                    // visible: function (row) {
+                                    //     if (row.status == 1 && row.purpose == 3) {
+                                    //         return true;
+                                    //     } else  {
+                                    //         return false;
+                                    //     }
+                                    // }
+                                },
+                                {
                                     name: 'edit',
                                     text: '',
                                     title: __('编辑'),