胖虎 3 years ago
parent
commit
61a744c154

+ 3 - 7
app/Http/Controllers/AdminApi/BannerController.php

@@ -23,7 +23,7 @@ class BannerController extends AdminController
         if($title) $where[] = ['title', 'like', "%$title%"];
         //获取数据
         $banner_list = Banner::where($where)
-            ->select(['id','cn_image','en_image','title','sort','link','created_at'])
+            ->select(['id','cn_image','en_image','title','sort','created_at'])
             ->orderBy('sort','asc')
             ->paginate(10);
 
@@ -57,7 +57,6 @@ class BannerController extends AdminController
         $cn_image = request()->input('cn_image', '');//图片
         $en_image = request()->input('en_image', '');//图片
         $title = request()->input('title', '');//标题
-        $link = request()->input('link', ' ');//外部链接
         $sort = request()->input('sort', '');//排序
         if(empty($cn_image) || empty($en_image) || empty($title)){
             return $this->apiResponseError('缺少必要参数');
@@ -65,7 +64,6 @@ class BannerController extends AdminController
         $data['cn_image'] = $cn_image;
         $data['en_image'] = $en_image;
         $data['title'] = $title;
-        $data['link'] = !empty($link) ? $link : ' ';
         $data['sort'] = !empty($sort) ? $sort : 50;
 
         if(empty($id)){//不存在id就创建
@@ -94,10 +92,8 @@ class BannerController extends AdminController
         $ids = request()->input('ids','');//获取需要删除的id
         if(empty($ids)) return $this->apiResponseError('缺少必要参数');
         //数据条件
-        //数据条件
-        if(!is_array($ids)){
-            $ids = array_filter(explode(',', $ids));
-        }
+        if(!is_array($ids)) return $this->apiResponseError('数据格式错误');
+
         $res = Banner::whereIn('id',$ids)->update(['is_del'=>1]);
         if ($res) {
             return $this->apiResponseSuccess('删除成功');

+ 20 - 0
app/Http/Controllers/AdminApi/ConfigController.php

@@ -29,6 +29,26 @@ class ConfigController extends AdminController
         }
     }
 
+    /**
+     * 获取&更新留言短信通知手机号
+     * @return \Illuminate\Http\JsonResponse
+     */
+    function setSmsPhone(){
+        if(request()->isMethod('post')){
+            $sms_phone = request()->input(['sms_phone']);
+            if(!is_array($sms_phone)) return $this->apiResponseError('数据格式错误');
+            $data['sms_phone'] = implode(',',$sms_phone);
+            //更新config数据
+            $this->update($data);
+
+            return $this->apiResponseSuccess('更新成功');
+        }else{
+            $sms_phone = Config::where('key','sms_phone')->value('value');
+            $data['sms_phone'] = array_filter(explode(',',$sms_phone));
+            return $this->apiResponseSuccess('获取成功',$data);
+        }
+    }
+
     /**
      * 更新config数据
      * @param $data

+ 3 - 11
app/Http/Controllers/AdminApi/UserController.php

@@ -18,7 +18,6 @@ class UserController extends AdminController
         $name = request()->input('name','');//获取搜索名称
         $phone = request()->input('phone','');//获取搜索手机号
         $status = request()->input('status',0);//获取状态
-        $roles_id = request()->input('roles_id','');//获取角色id
         $start = request()->input('start','');//获取开始时间
         $end = request()->input('end','');//获取结束时间
 
@@ -27,14 +26,13 @@ class UserController extends AdminController
         if ($name) $where[] = ['name', 'like', "%$name%"];
         if ($phone) $where[] = ['phone', 'like', "%$phone%"];
         if(in_array($status,[1,2])) $where[] = ['status','=',$status];
-        if ($roles_id) $where[] = ['roles_id', '=', $roles_id];
         if ($start) $where[] = ['created_at', '>=', $start];
         if ($end) $where[] = ['created_at', '<=', $end];
 
         //获取数据
         $list = User::where($where)
             ->orderBy('id','desc')
-            ->select(['id','name','phone','status','roles_id','created_at'])
+            ->select(['id','name','phone','status','created_at'])
             ->paginate(10);
 
         return $this->apiResponseSuccess('获取信息成功', [
@@ -55,7 +53,7 @@ class UserController extends AdminController
 
         //查询数据
         $where = [['id', $id], ['is_del',0]];
-        $info = User::where($where)->select(['id', 'name', 'phone', 'roles_id', 'status'])->first();
+        $info = User::where($where)->select(['id', 'name', 'phone', 'status'])->first();
 
         if (empty($info)) return $this->apiResponseError('没有找到该记录');
 
@@ -70,7 +68,6 @@ class UserController extends AdminController
         $id = request()->input('id', '');//记录id,更新时必须
         $phone = request()->input('phone', '');//登录手机号
         $name = request()->input('name', '');//姓名
-        $roles_id = request()->input('roles_id', 0);//角色id
         $password = request()->input('password', '');//密码
         $again_password = request()->input('again_password', '');//确认密码
         if (empty($phone))  return $this->apiResponseError( '登录手机号必填');
@@ -78,9 +75,6 @@ class UserController extends AdminController
         if(!CommonServer::creatServer()->verifyPhoneNumber($phone)){
             return $this->apiResponseError( '手机号不正确');
         }
-        if ($roles_id < 0 ) {
-            return $this->apiResponseError( '请选择角色');
-        }
 
         if(empty($id)){
             if (empty($password) || empty($again_password)) {
@@ -105,7 +99,6 @@ class UserController extends AdminController
                 'name'      => $name,
                 'phone'     => $phone,
                 'password'  => $new_pass['password'],
-                'roles_id'   => $roles_id,
                 'encrypt'   => $new_pass['encrypt']
             ]);
         }else{
@@ -140,7 +133,6 @@ class UserController extends AdminController
 
             $update['phone'] = $phone;
             $update['name'] = $name;
-            $update['roles_id'] = $roles_id;
             $res = $info->update($update);
         }
 
@@ -157,7 +149,7 @@ class UserController extends AdminController
      */
     function setStatus(){
         $id = request()->input('id','');//记录id
-        $status = request()->input('status', 0);//是否显示
+        $status = request()->input('status', 0);//状态 1启用 2停用
         if(empty($id) || !in_array($status,[1,2])){
             return $this->apiResponseError('缺少必要参数');
         }

+ 2 - 0
app/Models/SysModels/Banner.php

@@ -2,10 +2,12 @@
 
 namespace App\Models\SysModels;
 
+use App\Models\Traits\Timestamp;
 use Illuminate\Database\Eloquent\Model;
 
 class Banner extends Model
 {
+    use Timestamp;
     /**
      * 表名。
      *

+ 13 - 0
routes/adminApi/banner.php

@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+
+
+Route::group(['domain' => env('APP_HOST'), 'prefix' => 'adminApi/banner'],function (){
+    Route::match(['get','post'],'list', 'BannerController@getList')->name('adminApi.banner.list');//获取列表
+    Route::match(['get','post'],'info', 'BannerController@getInfo')->name('adminApi.banner.info');//获取详情
+    Route::match(['get','post'],'save', 'BannerController@save')->name('adminApi.banner.save');//新增&编辑
+    Route::match(['get','post'],'destroys', 'BannerController@destroys')->name('adminApi.banner.destroys');//删除
+
+});

+ 11 - 0
routes/adminApi/config.php

@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+
+
+Route::group(['domain' => env('APP_HOST'), 'prefix' => 'adminApi/config'],function (){
+    Route::match(['get','post'],'info', 'ConfigController@setConfig')->name('adminApi.config.info');//获取&更新基础配置信息
+    Route::match(['get','post'],'set_sms', 'ConfigController@setSmsPhone')->name('adminApi.config.set_sms');//获取&更新留言短信通知手机号
+
+});

+ 12 - 0
routes/adminApi/message.php

@@ -0,0 +1,12 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+
+
+Route::group(['domain' => env('APP_HOST'), 'prefix' => 'adminApi/message'],function (){
+    Route::match(['get','post'],'list', 'MessageController@getList')->name('adminApi.message.list');//获取列表
+    Route::match(['get','post'],'info', 'MessageController@getInfo')->name('adminApi.message.info');//获取详情
+    Route::match(['get','post'],'destroys', 'MessageController@destroys')->name('adminApi.banner.destroys');//删除
+
+});

+ 5 - 0
routes/adminApi/user.php

@@ -6,5 +6,10 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['domain' => env('APP_HOST'), 'prefix' => 'adminApi/user'],function (){
     Route::match(['get','post'],'list', 'UserController@getList')->name('adminApi.user.list');//获取后台账号列表
+    Route::match(['get','post'],'info', 'UserController@getInfo')->name('adminApi.user.info');//获取详情
+    Route::match(['get','post'],'save', 'UserController@save')->name('adminApi.user.save');//新增&编辑
+    Route::match(['get','post'],'set_status', 'UserController@setStatus')->name('adminApi.user.set_status');//状态更新
+    Route::match(['get','post'],'reset', 'UserController@resetPassword')->name('adminApi.user.reset');//重置密码
+    Route::match(['get','post'],'destroys', 'UserController@destroys')->name('adminApi.user.destroys');//删除
 
 });