聚合服务端后台V1.0

app/admin/controller/system/Admin.php

@@ -128,7 +128,6 @@ class Admin extends AdminController
      */
     public function password($id)
     {
-        $this->checkPostRequest();
         $row = $this->model->find($id);
         empty($row) && $this->error('数据不存在');
         if ($this->request->isAjax()) {

app/admin/view/login/index.html

@@ -2,7 +2,7 @@
 <div class="main-body">
     <div class="login-main">
         <div class="login-top">
-            <span>聚合后台</span>
+            <span>FusionAdmin</span>
             <span class="bg1"></span>
             <span class="bg2"></span>
         </div>

public/static/admin/js/app/games.js

@@ -24,8 +24,30 @@ define(["jquery", "easy-admin"], function ($, ea) {
                     {field: 'app_name', title: '子游戏名称'},
                     {field: 'appkey', title: 'appkey',search:false},
                     {field: 'paykey', title: 'paykey',search:false},
-                    {field: 'status', title: '状态',search:false,selectList:{0:'未上线',1:'上线中'},templet: ea.table.switch,tips:"上线中|未上线",pk:init.table_pk},
-                    {field: 'is_test', title: '是否测试',search:false,selectList:{0:'否',1:'是'},templet: ea.table.switch,tips:"是|否",pk:init.table_pk},
+                    {
+                        field: 'status',
+                        title: '状态',
+                        search:false,
+                        templet: function (d) {
+                            if (d.status === 1) {
+                                return '<span class="layui-badge layui-bg-green">已上线</span>';
+                            }else {
+                                return '<span class="layui-badge layui-bg-red">未上线</span>';
+                            }
+                        }
+                    },
+                    {
+                        field: 'is_test',
+                        title: '是否测试',
+                        search:false,
+                        templet: function (d) {
+                            if (d.is_test === 1) {
+                                return '<span class="layui-badge layui-bg-green">否</span>';
+                            }else {
+                                return '<span class="layui-badge layui-bg-red">是</span>';
+                            }
+                        }
+                    },
                     {field: 'add_user', title: '创建人',search:false},
                     {field: 'add_time', title: '创建时间',search:false},
                     {width: 250, title: '操作', templet: ea.table.tool},

public/static/admin/js/app/memberloginlog.js

@@ -23,10 +23,10 @@ define(["jquery", "easy-admin"], function ($, ea) {
                     {field: 'uid', title: 'uid'},
                     {field: 'uname', title: '用户名称'},
                     {field: 'reg_ver', title: '注册渠道标识'},
-                    {field: 'reg_time', title: '注册时间'},
+                    {field: 'reg_time', title: '注册时间', search: 'range'},
                     {field: 'appid', title: '登录游戏'},
                     {field: 'login_ver', title: '登录渠道标识'},
-                    {field: 'login_time', title: '登录时间'},
+                    {field: 'login_time', title: '登录时间', search: 'range'},
                     {field: 'login_ip', title: '登录IP',search:false},
                 ]],
             });

public/static/admin/js/app/order.js

@@ -52,11 +52,11 @@ define(["jquery", "easy-admin"], function ($, ea) {
                         search: false,
                         templet: function (d) {
                             if (d.gstatus === 0) {
-                                return '<span class="layui-badge layui-bg-orange">未回调</span>';
+                                return '<span class="layui-badge layui-bg-orange">未发货</span>';
                             } else if (d.gstatus === 1) {
-                                return '<span class="layui-badge layui-bg-green">回调成功</span>';
+                                return '<span class="layui-badge layui-bg-green">发货成功</span>';
                             } else {
-                                return '<span class="layui-badge layui-bg-red">回调失败</span>';
+                                return '<span class="layui-badge layui-bg-red">发货失败</span>';
                             }
                         }
                     },
@@ -64,7 +64,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
                     {field: 'amount', title: '到账金额(元)', search: false},
                     {field: 'subject', title: '商品标题', search: false},
                     {field: 'wap_number', title: '补发次数', search: false},
-                    {field: 'create_time', title: '下单时间'},
+                    {field: 'create_time', title: '下单时间', search: 'range'},
                     {
                         title: '操作',
                         templet: ea.table.tool,

public/static/admin/js/app/ver.js

@@ -27,7 +27,6 @@ define(["jquery", "easy-admin"], function ($, ea) {
                         title: '状态',
                         search:false,
                         templet: function (d) {
-                            console.log(d);
                             if (d.ver_status === 1) {
                                 return '<span class="layui-badge layui-bg-green">已上线</span>';
                             }else {
@@ -35,7 +34,6 @@ define(["jquery", "easy-admin"], function ($, ea) {
                             }
                         }
                     },
-                    // {field: 'ver_type', title: '渠道类型',search:false},
                     {field: 'add_user', title: '创建人',search:false},
                     {field: 'add_time', title: '添加时间',search:false},
                     {width: 250, title: '操作', templet: ea.table.tool},