完善功能

app/admin/controller/life/CinemaController.php

@@ -32,6 +32,8 @@ class CinemaController extends Curd
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['cinema_is_del'] = 0;
+        $order = $request->get('order', 'desc');
+        $field = $field ?? 'cinema_addTime';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }
@@ -46,15 +48,15 @@ class CinemaController extends Curd
      */
     public function afterQuery($items)
     {
-        foreach ($items as &$item){
-            $item->cinema_img = getenv('STORAGE_DOMAIN').$item->cinema_img;
-            $item->cinema_video = getenv('STORAGE_DOMAIN').$item->cinema_video;
-            $item->cinema_time = date('Y-m-d H:i:s',strtotime($item->cinema_time));
-            $item->cinema_label = !empty($item->cinema_label) ? explode(',',$item->cinema_label) : '';
-            $item->cinema_mold = !empty($item->cinema_mold) ? explode(',',$item->cinema_mold) : '';
-            $item->cinema_director = !empty($item->cinema_director) ? array_map('intval',explode(',',$item->cinema_director)) : '';
-            $item->cinema_star = !empty($item->cinema_star) ? array_map('intval',explode(',',$item->cinema_star)) : '';
-            $item->cinema_performers = !empty($item->cinema_performers) ? array_map('intval',explode(',',$item->cinema_performers)) : '';
+        foreach ($items as &$item) {
+            $item->cinema_img = !empty($item->cinema_img) ? getenv('STORAGE_DOMAIN') . $item->cinema_img : '';
+            $item->cinema_video = !empty($item->cinema_video) ? getenv('STORAGE_DOMAIN') . $item->cinema_video : '';
+            $item->cinema_time = !empty($item->cinema_time) ? date('Y-m-d H:i:s', strtotime($item->cinema_time)) : '';
+            $item->cinema_label = !empty($item->cinema_label) ? explode(',', $item->cinema_label) : '';
+            $item->cinema_mold = !empty($item->cinema_mold) ? explode(',', $item->cinema_mold) : '';
+            $item->cinema_director = !empty($item->cinema_director) ? array_map('intval', explode(',', $item->cinema_director)) : '';
+            $item->cinema_star = !empty($item->cinema_star) ? array_map('intval', explode(',', $item->cinema_star)) : '';
+            $item->cinema_performers = !empty($item->cinema_performers) ? array_map('intval', explode(',', $item->cinema_performers)) : '';
         }
 
         return $items;
@@ -72,8 +74,12 @@ class CinemaController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['cinema_img'] = str_replace(getenv('STORAGE_DOMAIN'),'',$data['cinema_img']);
-        $data['cinema_video'] = str_replace(getenv('STORAGE_DOMAIN'),'',$data['cinema_video']);
+        if (!empty($data['cinema_img'])) {
+            $data['cinema_img'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['cinema_img']);
+        }
+        if (!empty($data['cinema_video'])) {
+            $data['cinema_video'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['cinema_video']);
+        }
 
         return $data;
     }
@@ -83,8 +89,8 @@ class CinemaController extends Curd
         $primary_key = $this->model->getKeyName();
         $id = $request->post($primary_key);
         $data = $this->inputFilter($request->post());
-        $data['cinema_img'] = str_replace(getenv('STORAGE_DOMAIN'),'',$data['cinema_img']);
-        $data['cinema_video'] = str_replace(getenv('STORAGE_DOMAIN'),'',$data['cinema_video']);
+        $data['cinema_img'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['cinema_img']);
+        $data['cinema_video'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['cinema_video']);
 
         $model = $this->model->find($id);
         if (!$model) {

app/admin/controller/life/CollegeCoursesController.php

@@ -101,7 +101,7 @@ class CollegeCoursesController extends Curd
             $item->courses_week = !empty($item->courses_week) ? explode(',', $item->courses_week) : '';
             $item->courses_label = !empty($item->courses_label) ? explode(',', $item->courses_label) : '';
             $item->courses_time = !empty($item->courses_time) ? explode('~', $item->courses_time) : '';
-            $item->courses_type = self::COURSES_TYPE[$item->courses_type];
+            $item->courses_type = $item->courses_type;
         }
         return $items;
     }

app/admin/controller/member/MemberController.php

@@ -82,4 +82,9 @@ class MemberController
     {
         return MemberService::updateDevice($request);
     }
+
+    public function deleteDevice(Request $request)
+    {
+        return MemberService::deleteDevice($request);
+    }
 }

app/admin/controller/sys_manage/ArticleController.php

@@ -35,7 +35,7 @@ class ArticleController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['content_category'] = 'ARTICLE';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_sort';
+        $field = $field ?? 'content_addtimes';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

app/admin/controller/sys_manage/NewsController.php

@@ -35,7 +35,7 @@ class NewsController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $where['content_category'] = 'NEWS';
         $order = $request->get('order', 'desc');
-        $field = $field ?? 'content_sort';
+        $field = $field ?? 'content_addtimes';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

app/admin/service/member/MemberService.php

@@ -33,7 +33,7 @@ class MemberService
             },
             'cert' => function ($query) {
                 $query->select('join_cert_member_id', 'member_cert_birth', 'member_cert_gender', 'member_cert_name', 'member_cert_nbr',
-                    'member_cert_province', 'member_cert_city', 'member_cert_addr', 'member_cert_face', 'member_cert_photo','member_cert_nation');
+                    'member_cert_province', 'member_cert_city', 'member_cert_addr', 'member_cert_face', 'member_cert_photo', 'member_cert_nation');
             }
         ])->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes')
             ->orderBy('member_addtimes', 'DESC')
@@ -84,7 +84,7 @@ class MemberService
                 'member_cert_nation' => $params['member_cert_nation'] ?? '',
                 'member_cert_name' => $params['cert_name'] ?? '',
                 'member_cert_nbr' => $params['cert_nbr'] ?? '',
-                'member_cert_birth' => $params['birth'] ? date('Y-m-d',strtotime($params['birth'])) : '',
+                'member_cert_birth' => $params['birth'] ? date('Y-m-d', strtotime($params['birth'])) : '',
                 'member_cert_gender' => $params['gender'] ?? '',
                 'member_cert_province' => $params['province'] ?? '',
                 'member_cert_city' => $params['city'] ?? '',
@@ -183,6 +183,17 @@ class MemberService
         return json_success('绑定成功');
     }
 
+    public static function deleteDevice(Request $request)
+    {
+        try {
+            MemberDevice::where('member_device_id', $request->post('member_device_id'))->delete();
+
+            return json_success('解除绑定成功');
+        } catch (\Exception $e) {
+            return json_fail('绑定失败');
+        }
+    }
+
     private static function generateMemberId()
     {
         $id = SysSerial::getSerial();

app/admin/validate/life/CinemaPerformersValidate.php

@@ -10,7 +10,7 @@ class CinemaPerformersValidate extends Validate
         'performers_name|姓名' => 'require|chsDash',
         'performers_img|照片' => 'url',
         'performers_type|类型' => 'require|in:1,2',
-        'performers_introduction|简介' => 'chsDash',
+//        'performers_introduction|简介' => 'chsDash',
         'performers_is_del' => 'in:0,1'
     ];
 

app/model/GoodsDetail.php

@@ -10,6 +10,8 @@ class GoodsDetail extends Model
 
     protected $primaryKey = 'join_detail_goods_id';
 
+    protected $keyType = 'string';
+
     const CREATED_AT = null;
 
     const UPDATED_AT = null;

route/admin.php

@@ -530,7 +530,7 @@ Route::group('/admin', function () {
             Route::get('/{id:[0-9a-zA-Z]+}', [\app\admin\controller\member\MemberController::class, 'device']);
             Route::post('/add', [\app\admin\controller\member\MemberController::class, 'addDevice']);
             Route::post('/update', [\app\admin\controller\member\MemberController::class, 'updateDevice']);
-//            Route::delete('/delete', [\app\admin\controller\member\MemberController::class, 'delete']);
+            Route::delete('/delete', [\app\admin\controller\member\MemberController::class, 'deleteDevice']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);