目录结构调整

app/mobile/controller/Account.php

@@ -48,24 +48,6 @@ class Account extends BaseController
         return AccountLogic::updatePassword($param);
     }
 
-    //省市区编码
-    public function area()
-    {
-        $parent_code = $this->request->post('parent_code', '');
-        return CommonLogic::getAddr($parent_code);
-    }
 
-    //视频列表
-    public function getVideoList()
-    {
-        $param = $this->request->only(['page' => 1, 'size' => 10], 'post');
-        return AccountLogic::getVideoList($param);
-    }
-
-    //手机主题
-    public function theme()
-    {
-        return AccountLogic::theme();
-    }
 
 }

app/mobile/controller/Common.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\mobile\controller;
+
+use app\mobile\logic\CommonLogic;
+use app\admin\logic\CommonLogic as AdminCommonLogic;
+use app\BaseController;
+use app\mobile\logic\AccountLogic;
+
+//公共
+class Common extends BaseController
+{
+
+    //省市区编码
+    public function area()
+    {
+        $parent_code = $this->request->post('parent_code', '');
+        return AdminCommonLogic::getAddr($parent_code);
+    }
+
+    //视频列表
+    public function getVideoList()
+    {
+        $param = $this->request->only(['page' => 1, 'size' => 10], 'post');
+        return CommonLogic::getVideoList($param);
+    }
+
+    //手机主题
+    public function theme()
+    {
+        return CommonLogic::theme();
+    }
+
+}

app/mobile/logic/AccountLogic.php

@@ -99,7 +99,7 @@ class AccountLogic extends BaseLogic
             ->getData();//password,salt这两个字段在模型里定义了隐藏，所以要在这里使用getData方法获取原始数据
 
         if (empty($rs)) return json_show(CommonModel::$error_token, '该账户不存在');
-        
+
         if (getPassword($data['old_password'], $rs['salt']) != $rs['password']) return json_show(CommonModel::$error_param, '密码错误');
 
         $salt = randomkeys(6);
@@ -117,66 +117,10 @@ class AccountLogic extends BaseLogic
         $rs = AccountModel::where(['id' => self::$aid, 'is_del' => CommonModel::$del_normal])
             ->save($da);
 
-        return $rs ? json_show(CommonModel::$success, '更改密码成功') : json_show(CommonModel::$error_param, '更改密码失败');
-
-    }
-
-    //视频列表
-    public static function getVideoList(array $data = []): Json
-    {
-        $rs = AccountModel::field('id,video_ids')
-            ->where(['id' => self::$aid, 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty()
-            ->toArray();
-
-        if (empty($rs)) return json_show(CommonModel::$error_param, '该账户不存在');
+        return $rs ? json_show(CommonModel::$success, '修改密码成功') : json_show(CommonModel::$error_param, '修改密码失败');
 
-        $db = VideoModel::where(['is_del' => CommonModel::$del_normal, 'status' => CommonModel::$status_normal])
-            ->whereIn('id', $rs['video_ids']);
-
-        $count = $db->count('id');
-
-        $list = $db
-            ->field('id,video_sn,video_name,video_url,video_img')
-            ->page($data['page'], $data['size'])
-            ->order(['weight' => 'desc', 'id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        return json_show(CommonModel::$success, '获取视频列表成功', ['count' => $count, 'list' => $list]);
     }
 
-    //手机主题
-    public static function theme(): Json
-    {
-        $group_id = GroupModel::where(['is_del' => CommonModel::$del_normal, 'company_id' => self::$company_id, 'card_id' => self::$card_id])
-            ->value('id', 0);
-        if (!$group_id) return json_show(CommonModel::$error_param, '该账户所对应的分组不存在');
-
-        $rs = ThemeModel::field('id,code')
-            ->where(['is_del' => CommonModel::$del_normal, 'group_id' => $group_id, 'status' => CommonModel::$status_normal])
-            ->append(['modular'])
-            ->withAttr('modular', function ($val, $data) {
-                return Db::name('theme_modular')
-                    ->field('id,title,type')
-                    ->where(['is_del' => CommonModel::$del_normal, 'theme_id' => $data['id'], 'status' => CommonModel::$status_normal])
-                    ->order(['addtime' => 'desc', 'id' => 'desc'])
-                    ->append(['data'])
-                    ->withAttr('data', function ($v, $d) {
-                        return Db::name('theme_modular_data')
-                            ->field('id,img,jump_type,jump_param,good_name,good_id,style_type')
-                            ->where(['is_del' => CommonModel::$del_normal, 'theme_modular_id' => $d['id']])
-                            ->order(['addtime' => 'desc', 'id' => 'desc'])
-                            ->select()
-                            ->toArray();
-                    })
-                    ->select()
-                    ->toArray();
-            })
-            ->findOrEmpty()
-            ->toArray();
-        return empty($rs) ? json_show(CommonModel::$error_param, '该手机主题不存在') : json_show(CommonModel::$success, '获取手机主题成功', $rs);
-    }
 
 
 }

app/mobile/logic/CommonLogic.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace app\mobile\logic;
+
+use app\model\AccountModel;
+use app\model\CommonModel;
+use app\model\GroupModel;
+use app\model\ThemeModel;
+use app\model\VideoModel;
+use think\facade\Db;
+use think\response\Json;
+
+//公共
+class CommonLogic extends BaseLogic
+{
+    //视频列表
+    public static function getVideoList(array $data = []): Json
+    {
+        $rs = AccountModel::field('id,video_ids')
+            ->where(['id' => self::$aid, 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty()
+            ->toArray();
+
+        if (empty($rs)) return json_show(CommonModel::$error_param, '该账户不存在');
+
+        $db = VideoModel::where(['is_del' => CommonModel::$del_normal, 'status' => CommonModel::$status_normal])
+            ->whereIn('id', $rs['video_ids']);
+
+        $count = $db->count('id');
+
+        $list = $db
+            ->field('id,video_sn,video_name,video_url,video_img')
+            ->page($data['page'], $data['size'])
+            ->order(['weight' => 'desc', 'id' => 'desc'])
+            ->select()
+            ->toArray();
+
+        return json_show(CommonModel::$success, '获取视频列表成功', ['count' => $count, 'list' => $list]);
+    }
+
+    //手机主题
+    public static function theme(): Json
+    {
+        $group_id = GroupModel::where(['is_del' => CommonModel::$del_normal, 'company_id' => self::$company_id, 'card_id' => self::$card_id])
+            ->value('id', 0);
+        if (!$group_id) return json_show(CommonModel::$error_param, '该账户所对应的分组不存在');
+
+        $rs = ThemeModel::field('id,code')
+            ->where(['is_del' => CommonModel::$del_normal, 'group_id' => $group_id, 'status' => CommonModel::$status_normal])
+            ->append(['modular'])
+            ->withAttr('modular', function ($val, $data) {
+                return Db::name('theme_modular')
+                    ->field('id,title,type')
+                    ->where(['is_del' => CommonModel::$del_normal, 'theme_id' => $data['id'], 'status' => CommonModel::$status_normal])
+                    ->order(['addtime' => 'desc', 'id' => 'desc'])
+                    ->append(['data'])
+                    ->withAttr('data', function ($v, $d) {
+                        return Db::name('theme_modular_data')
+                            ->field('id,img,jump_type,jump_param,good_name,good_id,style_type')
+                            ->where(['is_del' => CommonModel::$del_normal, 'theme_modular_id' => $d['id']])
+                            ->order(['addtime' => 'desc', 'id' => 'desc'])
+                            ->select()
+                            ->toArray();
+                    })
+                    ->select()
+                    ->toArray();
+            })
+            ->findOrEmpty()
+            ->toArray();
+        return empty($rs) ? json_show(CommonModel::$error_param, '该手机主题不存在') : json_show(CommonModel::$success, '获取手机主题成功', $rs);
+    }
+
+
+}

app/mobile/route/app.php

@@ -6,9 +6,9 @@ Route::rule('login', 'Account/login');//登录
 Route::rule('logout', 'Account/logout');//登出
 Route::rule('info', 'Account/info');//账户详情
 Route::rule('updatePassword', 'Account/updatePassword');//修改密码
-Route::rule('video', 'Account/getVideoList');//视频列表
-Route::rule('area', 'Account/area');//省市区编码
-Route::rule('theme', 'Account/theme');//手机主题
+Route::rule('video', 'Common/getVideoList');//视频列表
+Route::rule('area', 'Common/area');//省市区编码
+Route::rule('theme', 'Common/theme');//手机主题
 
 //【地址】
 Route::rule('addrList', 'Addr/list');//列表