add

application/Admin/common.php

@@ -50,4 +50,5 @@ function verifyToken($token){
     }else{
         return ["code"=>105,"msg"=>"账户token无效"];
     }
-}
+}
+

application/Admin/controller/Account.php

@@ -45,8 +45,8 @@ class Account extends Base
         $count= Db::name("account_list")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page>=$total? $total:$page;
-        $list = Db::name("account_list")->where($where)->page($page,$size)->select();
-        return app_show(0,"获取成功",["list"=>$list,"count"=>$total]);
+        $list = Db::name("account_list")->where($where)->page($page,$size)->order("addtime desc")->select();
+        return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
     /**
@@ -121,7 +121,7 @@ class Account extends Base
                     $rela=["accountid"=>$acccount,"account_info"=>$info];
                     $rela_acc=Db::name("rela_account")->insert($rela);
                     if($rela_acc){
-                        write_log("账户{$username}新建成功",$this->userinfo['id'],$this->userinfo['nickname']);
+                        write_log("账户{$username}新建成功",$this->userinfo,"account","add");
                         Db::commit();
                         return app_show(0,"账户新建成功");
                     }
@@ -200,7 +200,7 @@ class Account extends Base
             $info['expiretime'] = $expiretime;
         }
         $info['updatetime'] = date("Y-m-d H:i:s");
-        $rela = Db::name("account_info")->alias("a")->Join("fc_rela_account b","a.account_info=b.id","left")->where(["b.accountid"=>$id])->field("a.*")->find();
+        $rela = Db::name("account_info")->alias("a")->Join("fc_rela_account b","b.account_info=a.id","left")->where(["b.accountid"=>$id])->field("a.*")->find();
         $nickname =  isset($this->post['nickname'])&&$this->post['nickname']!=="" ? trim($this->post['nickname']) :"";
         if($nickname!=""){
             $rela['nickname']=$nickname;
@@ -219,7 +219,7 @@ class Account extends Base
             if($acccount){
                 $infoacc = Db::name("account_info")->update($rela);
                 if($infoacc){
-                        write_log("账户{$username}编辑成功",$this->userinfo['id'],$this->userinfo['nickname']);
+                        write_log("账户{$username}新建成功",$this->userinfo,"account","edit");
                         Db::commit();
                         return app_show(0,"账户编辑成功");
                 }else{

application/Admin/controller/Login.php

@@ -40,7 +40,7 @@ class Login
         $token = makeToken($account);
         $userinfo = Db::name("account_info")->alias("a")->join("fc_rela_account b","b.account_info=a.id")->where(["b.accountid"=>$account['id']])->field("a.*")->find();
         $userinfo['token'] = $token;
-        write_log("账户{$account['username']}登录系统","0");
+        write_log("账户{$account['username']}登录系统","","login","",0);
         return app_show(0,"登录成功",$userinfo);
      }
 
@@ -66,4 +66,9 @@ class Login
         }
      }
 
+     public function LastVersion(){
+         $version = Db::name("version")->order("addtime desc")->find();
+         return app_show(0,"获取成功",$version);
+     }
+
 }

application/Admin/controller/Menu.php

@@ -63,7 +63,6 @@ class Menu extends Base
              $value['child']=$temp;
              $list[]=$value;
          }
-         write_log("所有菜单查询",$this->userinfo,"菜单模块","菜单列表","后台管理员");
          return app_show(0,"获取成功",$list);
      }
 
@@ -82,7 +81,6 @@ class Menu extends Base
          $condition = ['menuid'=>$pageid,];
          $data=Db::name('action')->alias("a")->Join("fc_action_list l","a.action_code=l.action_code","left")->field
          ("a.*,action_name")->where($condition)->select();
-         write_log("菜单{$menu['menu_name']}功能查询",$this->userinfo,"菜单模块","菜单功能","后台管理员");
          return app_show(0,"获取成功",$data);
      }
 
@@ -126,7 +124,8 @@ class Menu extends Base
             $data = ['action_code'=>$code,'status'=>$status,"updatetime"=>date("Y-m-d H:i:s")];
             $result=Db::name("action")->where(["id"=>$actid])->update($data);
             if($result){
-                write_log("菜单{$menu['name']}功能{$action_info['action_name']}编辑成功",$this->userinfo,"菜单模块","菜单功能编辑","后台管理员");
+                write_log("菜单{$menu['menu_name']}功能{$action_info['action_name']}编辑成功",$this->userinfo,"orderaction",
+                    "edit","0");
                 return app_show(0,"更新成功");
             }else{
                 return error_show(1004,"更新失败");
@@ -149,7 +148,7 @@ class Menu extends Base
         if(empty($action)){
             return error_show(1001,'页面功能未找到数据');
         }
-        $action_info = Db::name("action_list")->where(["action_code"=>$action['code']])->find();
+        $action_info = Db::name("action_list")->where(["action_code"=>$action['action_code']])->find();
         if(empty($action_info)){
             return error_show(1003,'功能数据未找到');
         }
@@ -169,7 +168,8 @@ class Menu extends Base
             $result=Db::name("action")->where(["id"=>$actid])->update($data);
             $msg= $status==1?"启用":"禁用";
             if($result){
-                write_log("菜单{$menu['name']}功能{$action_info['action_name']}{$msg}成功",$this->userinfo,"菜单模块","菜单功能状态","后台管理员");
+                write_log("菜单{$menu['menu_name']}功能{$action_info['action_name']}{$msg}成功",$this->userinfo,
+                    "orderaction","status","0");
                 return app_show(0,"更新成功");
             }else{
                 return error_show(1004,"更新失败");
@@ -188,7 +188,7 @@ class Menu extends Base
         if(empty($action)){
             return error_show(1001,'页面功能未找到数据');
         }
-        $action_info = Db::name("action_list")->where(["action_code"=>$action['code']])->find();
+        $action_info = Db::name("action_list")->where(["action_code"=>$action['action_code']])->find();
         if(empty($action_info)){
             return error_show(1003,'功能数据未找到');
         }
@@ -204,7 +204,8 @@ class Menu extends Base
         }
         $result=Db::name("action")->where(["id"=>$actid])->delete();
         if($result){
-            write_log("菜单{$menu['name']}功能{$action_info['action_name']}删除成功",$this->userinfo,"菜单模块","菜单功能删除","后台管理员");
+            write_log("菜单{$menu['menu_name']}功能{$action_info['action_name']}删除成功",$this->userinfo,"orderaction",
+                "del","0");
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,"更新失败");
@@ -248,7 +249,8 @@ class Menu extends Base
                 return error_show(1003,'此功能已存在');
             }else{
                 Db::name("action")->insert($data);
-                write_log("菜单{$menu['name']}功能{$action_info['action_name']}新建成功",$this->userinfo,"菜单模块","菜单功能新建","后台管理员");
+                write_log("菜单{$menu['menu_name']}功能{$action_info['action_name']}新建成功",$this->userinfo,"orderaction",
+                    "add","0");
                 return app_show(0,"添加成功");
             }
         }catch (\Exception $e){
@@ -289,7 +291,7 @@ class Menu extends Base
 
         $result = Db::name("admin_menu")->insert($data);
         if($result){
-            write_log("菜单{$data['menu_name']}新建成功",$this->userinfo,"菜单模块","菜单新建","后台管理员");
+            write_log("菜单{$data['menu_name']}新建成功",$this->userinfo,"order","add","0");
             return app_show(0,"添加成功");
         }else{
             return error_show(1003,"添加失败");
@@ -319,7 +321,7 @@ class Menu extends Base
         $img = isset($this->post['img']) ?trim($this->post['img']) :"";
         $pid = isset($this->post['pid']) ?intval($this->post['pid']) :0;
         $weight = isset($this->post['weight']) ?floatval($this->post['weight']) :1;
-        $status = isset($this->post['is_show']) ? intval($this->post['is_show']) : 0;
+        $is_show = isset($this->post['is_show']) ? intval($this->post['is_show']) : 0;
         $private = isset($this->post['private']) ?intval($this->post['private']) :(isset($menu['is_private']) ?
             $menu['is_private'] : 0);
         if($pid!=0 && $route==""){
@@ -332,7 +334,7 @@ class Menu extends Base
             "menu_code"=>$code,
             "menu_img"=>$img,
             "pid"=>$pid,
-            'is_show'=>1,
+            'is_show'=>$is_show,
             "is_private"=>$private,
             'status'=>1,
             "weight"=>$weight,
@@ -345,7 +347,7 @@ class Menu extends Base
             $result = Db::name("admin_menu")->insert($data); $msh ="新建";
         }
         if($result){
-            write_log("菜单{$data['menu_name']}{$msh}成功",$this->userinfo,"菜单模块","菜单编辑","后台管理员");
+            write_log("菜单{$data['menu_name']}{$msh}成功",$this->userinfo,"order",$id==""?"add":"edit","0");
             return app_show(0,"{$msh}成功");
         }else{
             return error_show(1003,"{$msh}失败");
@@ -361,9 +363,9 @@ class Menu extends Base
         $menu['is_show']=0;
         $menu['status']=0;
         $menu['updatetime']=date("Y-m-d H:i:s");
-        $result =  Db::name("admin_menu")->save($menu);
+        $result =  Db::name("admin_menu")->update($menu);
         if($result){
-            write_log("菜单{$menu['menu_name']}删除成功",$this->userinfo,"菜单模块","菜单删除","后台管理员");
+            write_log("菜单{$menu['menu_name']}删除成功",$this->userinfo,"order","del","0");
             return app_show(0,"删除成功");
         }else{
             return error_show(1003,"删除失败");
@@ -386,7 +388,7 @@ class Menu extends Base
         $result = Db::name("admin_menu")->update($menu);
         $msg=$statu==1?"启用":"禁用";
         if($result){
-            write_log("菜单{$menu['menu_name']}{$msg}成功",$this->userinfo,"菜单模块","菜单状态","后台管理员");
+            write_log("菜单{$menu['menu_name']}{$msg}成功",$this->userinfo,"order","status","0");
             return app_show(0,"状态更新成功");
         }else{
             return error_show(1003,"状态更新失败");

application/Admin/controller/Order.php

@@ -23,7 +23,7 @@ class Order extends Base
      if($username!=""){
          $where['username'] = ["like"=>"%{$username}%"];
      }
-     $nickname =  isset($this->post['nickname'])&&$this->post['nickname']!=="" ? trim($this->post['nickname']) :"";
+     $nickname =  isset($this->post['nickname'])&&$this->post['nickname']!=="" ? trim($this->post['username']) :"";
      if($nickname!=""){
          $where['nickname'] = ["like"=>"%{$nickname}%"];
      }
@@ -44,8 +44,9 @@ class Order extends Base
      $page = $page>=$total? $total:$page;
      $list = Db::name("order_info")->where($where)->page($page,$size)->field("id,order_sn,username,nickname,order_num,
      post_code,post_name,status,contector,contector_mobile,provice_name,city_name,area_name,addr,delivery_time")
+         ->order("order_time desc")
          ->select();
-     return app_show(0,"获取成功",["list"=>$list,"count"=>$total]);
+     return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
  }
 
     /**
@@ -91,7 +92,7 @@ class Order extends Base
              $orderinfo['delivery_time']=date("Y-m-d H:i:s");
             $order= Db::name("order")->update($orderinfo);
             if($order){
-                write_log("订单{$ordersn}发货",$this->userinfo,"后台个人信息模块","个人信息编辑","后台管理员");
+                write_log("订单{$ordersn}发货",$this->userinfo,"order","edit","0");
                 Db::commit();
                 return app_show(0,"订单物流信息新建成功");
             }

application/Admin/controller/Stock.php

@@ -51,8 +51,8 @@ class Stock extends Base
         $count= Db::name("stock_list")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page>=$total? $total:$page;
-        $list = Db::name("stock_list")->where($where)->page($page,$size)->field("id,username,status,nickname,mobile,stock_balance,stock_update")->select();
-        return app_show(0,"获取成功",["list"=>$list,"count"=>$total]);
+        $list = Db::name("stock_list")->where($where)->page($page,$size)->field("id,username,status,nickname,mobile,stock_balance,stock_update")->order("stock_update desc")->select();
+        return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
     /**
@@ -90,7 +90,7 @@ class Stock extends Base
                 "type"=>$type,
                 "after_stock"=>isset($stockinfo['stock_balance']) ? $stockinfo['stock_balance']+$stock:$stock,
                 "before_stock"=>isset($stockinfo['stock_balance']) ? $stockinfo['stock_balance']:0,
-                "action_id"=>$this->userinfo['id'],
+                "action_uid"=>$this->userinfo['id'],
                 "action_name"=>$this->userinfo['nickname'],
                 "addtime"=>date("Y-m-d H:i:s")
             ];
@@ -130,7 +130,7 @@ class Stock extends Base
                  }
              }
              if($accstock){
-                 write_log("账户{$account['username']}{$msg}:{$stock}",$this->userinfo,"库存模块","库存修改","后台管理员");
+                 write_log("账户{$account['username']}{$msg}:{$stock}",$this->userinfo,"stock","edit","0");
                  Db::commit();
                  return app_show(0,"{$msg}成功");
              }
@@ -163,12 +163,12 @@ class Stock extends Base
         $count = Db::name("stock_log")->where(["accountid"=>$id])->count();
         $total = ceil($count/$size);
         $page = $page>=$total? $total:$page;
-        $list = Db::name("stock_log")->where(["accountid"=>$id])->page($page,$size)->select();
+        $list = Db::name("stock_log")->where(["accountid"=>$id])->page($page,$size)->order("addtime desc")->select();
         foreach ($list as $key=>$value){
             $list[$key]['username']=$account['username'];
             $list[$key]['nickname']=$account['nickname'];
         }
-        return app_show(0,"获取成功",['list'=>$list,"count"=>$total]);
+        return app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
     }
 
 }

application/Admin/controller/System.php

@@ -0,0 +1,89 @@
+<?php
+
+
+namespace app\Admin\controller;
+use think\Db;
+
+
+class System extends Base
+{
+    protected $role = ["0"=>'系统',"1"=>"超级管理员","2"=>"管理员","3"=>"用户"];
+    protected  $menu=[];
+    protected  $action=[];
+ public function __construct()
+ {
+     parent::__construct();
+     $this->menu=[
+         "login"=>"后台登录模块",
+         "menu"=>"菜单管理模块",
+         "menuaction"=>"菜单功能模块",
+         "order"=>"订单管理模块",
+         "stock"=>"库存管理模块",
+         "account"=>"用户管理模块",
+         "version"=>"版本管理模块",
+     ];
+     $this->action=[
+         "add"=>"新建",
+         "edit"=>"编辑",
+         "status"=>"状态",
+         "del"=>"删除"
+     ];
+ }
+
+ public function list(){
+     $page = isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) : 1;
+     $size = isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :10;
+     $where=[];
+     $role=isset($this->post['role'])&&$this->post['role']!=""?$this->post['role']:"";
+     if($role!=""){
+         $where['role']=$role;
+     }
+     $lowtime=isset($this->post['lowtime'])&&$this->post['lowtime']!=""?$this->post['lowtime']:"";
+     if($lowtime!=""){
+         $where['addtime']=[">=",$lowtime];
+     }
+     $uptime=isset($this->post['uptime'])&&$this->post['uptime']!=""?$this->post['uptime']:"";
+     if($uptime!=""){
+         $where['addtime']=["<=",$uptime];
+     }
+     $username=isset($this->post['username'])&&$this->post['username']!=""?$this->post['username']:"";
+     if($username!=""){
+         $where['username']=["like","%{$username}%"];
+     }
+     $moudel=isset($this->post['moudel'])&&$this->post['moudel']!=""?$this->post['moudel']:"";
+     if($moudel!=""){
+         $where['moudel|action']=["like","%{$username}%"];
+     }
+     $count= Db::name("system_log")->where($where)->count();
+     $total = ceil($count/$size);
+     $page = $page>=$total? $total:$page;
+     $list = Db::name("system_log")->where($where)->page($page,$size)->order("addtime desc")->select();
+     foreach ($list as $key=>$value){
+         $list[$key]['moudel'] = key_exists($value['moudel'],$this->menu)?$this->menu[ $value['moudel']] : $value['moudel'];
+         $list[$key]['action'] = key_exists($value['action'],$this->action)?$this->action[ $value['action']] : $value['action'];
+         $list[$key]['role'] = key_exists($value['role'],$this->role)?$this->role[ $value['role']] : $value['role'];
+     }
+     return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
+ }
+
+ public function GetMenu(){
+     $data=[];
+     foreach ($this->menu as $key=>$value){
+         $temp=[];
+         $temp["value"]=$value;
+         $temp["lable"]=$key;
+         $data[]=$temp;
+     }
+     return app_show(0,"获取成功",$data);
+ }
+    public function GetAction(){
+        $data=[];
+        foreach ($this->action as $key=>$value){
+            $temp=[];
+            $temp["value"]=$value;
+            $temp["lable"]=$key;
+            $data[]=$temp;
+        }
+        return app_show(0,"获取成功",$data);
+    }
+}

application/Admin/controller/User.php

@@ -20,7 +20,7 @@ class User extends Base
        $data=[];
        if($pasword!=""){
         $data['salt']=makeSalt();
-        $data['password']=hash($pasword.$data['salt']);
+        $data['password']=sha1($pasword.$data['salt']);
        }
        $nickname = isset($this->post['nickname'])&& $this->post['nickname']!="" ? trim($this->post['nickname']):"";
        if($nickname!=""){
@@ -37,7 +37,7 @@ class User extends Base
         $msg .=isset($data['nickname'])? "修改昵称为：{$nickname}":"";
         $msg .=isset($data['mobile'])? "修改手机号为：{$mobile}":"";
       if($result){
-            write_log("管理员{$this->userinfo['nickname']}修改个人信息成功{$msg}",$this->userinfo,"后台个人信息模块","个人信息编辑","后台管理员");
+            write_log("管理员{$this->userinfo['nickname']}修改个人信息成功{$msg}",$this->userinfo,"user","edit");
             return app_show(0,"信息修改成功");
         }else{
             return error_show(1003,"信息修改失败");

application/Admin/controller/Version.php

@@ -17,8 +17,8 @@ class Version extends Base
         $count= Db::name("version")->count();
         $total = ceil($count/$size);
         $page = $page>=$total? $total:$page;
-        $list = Db::name("version")->page($page,$size)->select();
-        return app_show(0,"获取成功",["list"=>$list,"count"=>$total]);
+        $list = Db::name("version")->page($page,$size)->order("addtime desc")->select();
+        return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
     public function create(){
@@ -38,9 +38,12 @@ class Version extends Base
             "title"=>$title,
             "content"=>$content,
             "version"=>$version,
+            "addtime"=>date("Y-m-d H:i:s")
         ];
+
         $inert= Db::name("version")->insert($data);
         if($inert){
+            write_log("版本{$version}新建成功",$this->userinfo,"version","add");
             return app_show(0,"版本信息新建成功");
         }else{
             return app_show(0,"版本信息新建失败");

application/common.php

@@ -35,7 +35,7 @@ function uplaod_avatar($file){
  * @param $log
  * @param $id
  */
-function write_log($log,$userinfo,$module="",$action="",$role=""){
+function write_log($log,$userinfo,$module="",$action="",$role=0){
     $data=[
         "action_id"=>isset($userinfo['id'])? $userinfo['id']:"",
         "msg"=>$log,
@@ -44,7 +44,7 @@ function write_log($log,$userinfo,$module="",$action="",$role=""){
         "module"=>$module,
         "action"=>$action,
         "username"=>isset($userinfo['username'])? $userinfo['username']:"sys",
-        "role"=>$role,
+        "role"=>$role==0?(isset($userinfo['role'])&&$userinfo['role']!=1?2:1):3,
     ];
     Db::name("system_log")->insert($data);
 }

application/route.php

@@ -14,6 +14,7 @@ use think\Route;
 
 Route::rule('admin/login','Admin/Login/index');
 Route::rule('admin/logout','Admin/Login/logout');
+Route::rule('admin/version','Admin/Login/LastVersion');
 
 Route::rule('admin/menulist', 'Admin/Menu/MenuList');
 Route::rule('admin/menuadd', 'Admin/Menu/MenuAdd');
@@ -30,6 +31,25 @@ Route::rule('admin/menuall', 'Admin/Menu/MenuAll');
 Route::rule('admin/reset','Admin/User/ResetInfo');
 Route::rule('admin/userinfo','Admin/User/UserInfo');
 
-Route::rule('admin/userinfo','Admin/Account/UserInfo');
+Route::rule('admin/accountinfo','Admin/Account/Read');
 Route::rule('admin/accountlist','Admin/Account/List');
-Route::rule('login','Home/Login/index');
+Route::rule('admin/accountadd','Admin/Account/Create');
+Route::rule('admin/accountsave','Admin/Account/Save');
+
+Route::rule('admin/orderlist','Admin/Order/list');
+Route::rule('admin/orderdelivery','Admin/Order/OrderDelivery');
+
+Route::rule('admin/stocklist','Admin/Stock/StockList');
+Route::rule('admin/stocksave','Admin/Stock/Save');
+Route::rule('admin/stocklog','Admin/Stock/StockLog');
+
+Route::rule('admin/versionlist','Admin/Version/list');
+Route::rule('admin/versionadd','Admin/Version/create');
+
+Route::rule('admin/systemlist','Admin/System/list');
+Route::rule('admin/getmoudel','Admin/System/GetMenu');
+Route::rule('admin/getaction','Admin/System/GetAction');
+
+
+
+

public/index.php

@@ -10,7 +10,9 @@
 // +----------------------------------------------------------------------
 
 // [ 应用入口文件 ]
-
+header('Access-Control-Allow-Origin:*');
+header('Access-Control-Allow-Methods:POST,GET,OPTIONS,DELETE');
+header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
 // 定义应用目录
 define('APP_PATH', __DIR__ . '/../application/');
 // 加载框架引导文件

thinkphp/library/think/db/Connection.php

@@ -117,7 +117,7 @@ abstract class Connection
         PDO::ATTR_CASE              => PDO::CASE_NATURAL,
         PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_ORACLE_NULLS      => PDO::NULL_NATURAL,
-        PDO::ATTR_STRINGIFY_FETCHES => false,
+        PDO::ATTR_STRINGIFY_FETCHES => true,
         PDO::ATTR_EMULATE_PREPARES  => false,
     ];