Browse Source

wesmiler 报恩寺项目

wesmiler 3 years ago
parent
commit
add08216b4

File diff suppressed because it is too large
+ 0 - 1
addons/web/static/js/index.aaae2404.js


+ 1 - 1
app/Helpers/common.php

@@ -706,7 +706,7 @@ if (!function_exists('get_image_url')) {
      */
     function get_image_url($image_url)
     {
-        return IMG_URL . $image_url;
+        return strpos($image_url,'http') === false? IMG_URL . $image_url : $image_url;
     }
 }
 

+ 1 - 1
app/Http/Controllers/BaseController.php

@@ -80,7 +80,7 @@ class BaseController extends \Illuminate\Routing\Controller
         defined('IMG_PATH') or define('IMG_PATH', base_path('public/uploads/images'));
 
         // 临时存放目录
-        defined('UPLOAD_TEMP_PATH') or define('UPLOAD_TEMP_PATH', ATTACHMENT_PATH . "/temp");
+        defined('UPLOAD_TEMP_PATH') or define('UPLOAD_TEMP_PATH', ATTACHMENT_PATH . "/img");
 
         // 定义普通图片域名
         defined('IMG_URL') or define('IMG_URL', env('IMG_URL'));

+ 37 - 0
app/Http/Controllers/DevicesController.php

@@ -0,0 +1,37 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 南京Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Http\Controllers;
+
+use App\Services\DevicesService;
+
+/**
+ * 供灯设备管理-控制器
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class DevicesController
+ * @package App\Http\Controllers
+ */
+class DevicesController extends Backend
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * DevicesController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->service = new DevicesService();
+    }
+
+}

+ 42 - 0
app/Models/DevicesModel.php

@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 南京Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 供灯设备管理-模型
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class DevicesModel
+ * @package App\Models
+ */
+class DevicesModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'devices';
+
+    /**
+     * 获取记录信息
+     * @param int $id 记录ID
+     * @return array|string
+     * @author wesmiler
+     * @since 2020/11/11
+     */
+    public function getInfo($id)
+    {
+        $info = parent::getInfo($id); // TODO: Change the autogenerated stub
+        if ($info) {
+
+        }
+        return $info;
+    }
+
+}

+ 42 - 0
app/Models/LampMealsModel.php

@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 南京Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 供灯套餐管理-模型
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class LampMealsModel
+ * @package App\Models
+ */
+class LampMealsModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'gongdeng_meals';
+
+    /**
+     * 获取记录信息
+     * @param int $id 记录ID
+     * @return array|string
+     * @author wesmiler
+     * @since 2020/11/11
+     */
+    public function getInfo($id)
+    {
+        $info = parent::getInfo($id); // TODO: Change the autogenerated stub
+        if ($info) {
+
+        }
+        return $info;
+    }
+
+}

+ 46 - 0
app/Models/MemberModel.php

@@ -56,4 +56,50 @@ class MemberModel extends BaseModel
         return $info;
     }
 
+    public function getSengrenList($params){
+        $page = isset($params['pageSize'])? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize'])? intval($params['pageSize']) : PERPAGE;
+
+        $dataList = MemberModel::from('master as ms')
+            ->leftJoin('member as m','m.id','=', 'ms.user_id')
+            ->where(function($query) use($params){
+                $type = isset($params['type'])? intval($params['type']) : 0;
+                if($type>0){
+                    $query->where('ms.type',$type);
+                }
+
+                $onSiyuan = isset($params['on_siyuan'])? intval($params['on_siyuan']) : 0;
+                if($onSiyuan>0){
+                    $query->where('ms.on_siyuan',$onSiyuan);
+                }
+
+                $status = isset($params['status'])? $params['status'] : 0;
+                if($status>0){
+                    $query->where('ms.status', $status);
+                }else{
+                    $query->whereIn('ms.status', [1,2]);
+                }
+
+                $realname = isset($params['realname'])? trim($params['realname']) : '';
+                if(!empty($realname)){
+                    $query->where('ms.realname','like',"%{$realname}%");
+                }
+            })
+            ->select(['ms.id','m.avatar','ms.user_id','ms.realname','ms.type','ms.idcard_front','ms.idcard_back','ms.contact_phone','ms.master_type','ms.master_no','ms.on_siyuan','ms.siyuan','ms.siyuan_address','ms.status','ms.create_time','ms.update_time'])
+            ->orderBy('ms.id','desc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList? $dataList->toArray() : [];
+        if($dataList){
+            foreach ($dataList['data'] as &$item) {
+                $item['idcard_front'] = $item['idcard_front'] ? get_image_url($item['idcard_front']) : '';
+                $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
+                $item['idcard_back'] = $item['idcard_back'] ? get_image_url($item['idcard_back']) : '';
+                $item['create_time'] = $item['create_time']? datetime($item['create_time'], 'Y-m-d H:i') : '';
+            }
+        }
+
+        return $dataList;
+    }
+
 }

+ 3 - 0
app/Models/UserModel.php

@@ -12,6 +12,7 @@
 namespace App\Models;
 
 use App\Services\UserRoleService;
+use phpDocumentor\Reflection\Types\Parent_;
 
 /**
  * 人员管理-模型
@@ -66,4 +67,6 @@ class UserModel extends BaseModel
         }
         return $info;
     }
+
+
 }

+ 5 - 0
app/Services/BaseService.php

@@ -67,6 +67,11 @@ class BaseService
                 $map[] = ['title', 'like', "%{$param['title']}%"];
             }
 
+            // 筛选标题
+            if (isset($param['code']) && $param['code']) {
+                $map[] = ['code', '=', "{$param['code']}"];
+            }
+
             // 筛选类型
             if (isset($param['type']) && $param['type']) {
                 $map[] = ['type', '=', $param['type']];

+ 75 - 0
app/Services/DevicesService.php

@@ -0,0 +1,75 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 南京Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services;
+
+use App\Models\DevicesModel;
+
+/**
+ * 供灯设备管理-服务类
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class DevicesService
+ * @package App\Services
+ */
+class DevicesService extends BaseService
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * DevicesService constructor.
+     */
+    public function __construct()
+    {
+        $this->model = new DevicesModel();
+    }
+
+    /**
+     * 获取友链列表
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function getList()
+    {
+        $params = request()->all();
+
+        return parent::getList();
+    }
+
+    /**
+     * 添加或编辑
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function edit()
+    {
+        $data = request()->all();
+        $code = isset($data['code'])? $data['code'] : '';
+        $id = isset($data['id'])? $data['id'] : 0;
+        if($code && $checkId = $this->model->where('code', $code)->value('id')){
+            if(($checkId && !$id) || ($id && $checkId != $id) ){
+                return message("设备编号[{$code}]已存在",false);
+            }
+        }
+        $startNum = isset($data['start_num'])? $data['start_num'] : 0;
+        $endNum = isset($data['end_num'])? $data['end_num'] : 0;
+        if($endNum<=$startNum){
+            return message("截止可选灯号必须大于开始可选灯号",false);
+        }
+
+        $data['update_time'] = time();
+        return parent::edit($data); // TODO: Change the autogenerated stub
+    }
+
+}

+ 62 - 0
app/Services/LampMealsService.php

@@ -0,0 +1,62 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 南京Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services;
+
+use App\Models\LampMealsModel;
+
+/**
+ * 供灯套餐管理-服务类
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class LampMealsService
+ * @package App\Services
+ */
+class LampMealsService extends BaseService
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * LampMealsService constructor.
+     */
+    public function __construct()
+    {
+        $this->model = new LampMealsModel();
+    }
+
+    /**
+     * 获取友链列表
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function getList()
+    {
+        $params = request()->all();
+
+        return parent::getList();
+    }
+
+    /**
+     * 添加或编辑
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function edit()
+    {
+        $data = request()->all();
+        $data['update_time'] = time();
+        return parent::edit($data); // TODO: Change the autogenerated stub
+    }
+
+}

+ 12 - 7
app/Services/SengrenService.php

@@ -11,7 +11,7 @@
 
 namespace App\Services;
 
-use App\Models\SengrenModel;
+use App\Models\MemberModel;
 
 /**
  * 僧人管理-服务类
@@ -30,7 +30,7 @@ class SengrenService extends BaseService
      */
     public function __construct()
     {
-        $this->model = new SengrenModel();
+        $this->model = new MemberModel();
     }
 
     /**
@@ -43,10 +43,15 @@ class SengrenService extends BaseService
     {
         $param = request()->all();
 
-        // 查询条件
-        $map = [];
+        $dataList =  $this->model->getSengrenList($param);
 
-        return parent::getList($map); // TODO: Change the autogenerated stub
+        return [
+            'code'=> 0,
+            'success'=> true,
+            'msg'=> '操作成功',
+            'count'=> isset($dataList['total'])? $dataList['total'] : 0,
+            'data'=> isset($dataList['data'])? $dataList['data'] : 0,
+        ];
     }
 
     /**
@@ -60,7 +65,7 @@ class SengrenService extends BaseService
         $data = request()->all();
 
         // 图片处理
-        $image = trim($data['image']);
+        /*$image = trim($data['image']);
         $id = isset($data['id'])? $data['id'] : 0;
         if (!$id && !$image) {
             return message('请上传僧人头像', false);
@@ -69,7 +74,7 @@ class SengrenService extends BaseService
             $data['image'] = save_image($image, 'item');
         } else {
             $data['image'] = str_replace(IMG_URL, "", $data['image']);
-        }
+        }*/
         return parent::edit($data); // TODO: Change the autogenerated stub
     }
 

+ 43 - 1
routes/web.php

@@ -38,6 +38,11 @@ use App\Http\Controllers\UploadController;
 use App\Http\Controllers\UserController;
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\LoginController;
+use App\Http\Controllers\GoodsController;
+use App\Http\Controllers\GoodsCatesController;
+use App\Http\Controllers\SiyuanController;
+use App\Http\Controllers\DevicesController;
+use App\Http\Controllers\LampMealsController;
 
 /*
 |--------------------------------------------------------------------------
@@ -114,7 +119,7 @@ Route::get('/dept/info', [DeptController::class, 'info']);
 Route::post('/dept/edit', [DeptController::class, 'edit']);
 Route::post('/dept/delete', [DeptController::class, 'delete']);
 
-// 部门管理
+// 城市管理
 Route::get('/city/index', [CityController::class, 'index']);
 Route::get('/city/info', [CityController::class, 'info']);
 Route::post('/city/edit', [CityController::class, 'edit']);
@@ -220,6 +225,43 @@ Route::post('/sengren/edit', [SengrenController::class, 'edit']);
 Route::post('/sengren/delete', [SengrenController::class, 'delete']);
 Route::post('/sengren/status', [SengrenController::class, 'status']);
 
+// 商品管理
+Route::get('/goods/index', [GoodsController::class, 'index']);
+Route::get('/goods/info', [GoodsController::class, 'info']);
+Route::post('/goods/edit', [GoodsController::class, 'edit']);
+Route::post('/goods/delete', [GoodsController::class, 'delete']);
+Route::post('/goods/status', [GoodsController::class, 'status']);
+
+// 商品分类管理
+Route::get('/goodscates/index', [GoodsCatesController::class, 'index']);
+Route::get('/goodscates/info', [GoodsCatesController::class, 'info']);
+Route::post('/goodscates/edit', [GoodsCatesController::class, 'edit']);
+Route::post('/goodscates/delete', [GoodsCatesController::class, 'delete']);
+Route::post('/goodscates/status', [GoodsCatesController::class, 'status']);
+Route::post('/goodscates/options', [GoodsCatesController::class, 'getOptions']);
+
+// 寺院管理
+Route::get('/siyuan/index', [SiyuanController::class, 'index']);
+Route::get('/siyuan/info', [SiyuanController::class, 'info']);
+Route::post('/siyuan/edit', [SiyuanController::class, 'edit']);
+Route::post('/siyuan/delete', [SiyuanController::class, 'delete']);
+Route::post('/siyuan/status', [SiyuanController::class, 'status']);
+
+
+// 供灯设备管理
+Route::get('/devices/index', [DevicesController::class, 'index']);
+Route::get('/devices/info', [DevicesController::class, 'info']);
+Route::post('/devices/edit', [DevicesController::class, 'edit']);
+Route::post('/devices/delete', [DevicesController::class, 'delete']);
+Route::post('/devices/status', [DevicesController::class, 'status']);
+
+// 供灯设备管理
+Route::get('/lampmeals/index', [LampMealsController::class, 'index']);
+Route::get('/lampmeals/info', [LampMealsController::class, 'info']);
+Route::post('/lampmeals/edit', [LampMealsController::class, 'edit']);
+Route::post('/lampmeals/delete', [LampMealsController::class, 'delete']);
+Route::post('/lampmeals/status', [LampMealsController::class, 'status']);
+
 // 登录日志
 Route::get('/loginlog/index', [LoginLogController::class, 'index']);
 Route::post('/loginlog/delete', [LoginLogController::class, 'delete']);