diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index f120f66badee4c4bce537df33daf1cfa693dc2b3..de6a3795261f3ebf2c36ee1e12e35371b0b6aecc 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -117,6 +117,7 @@ class Admin extends Common } // 管理员编辑 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -124,13 +125,14 @@ class Admin extends Common 'm' => 0, 'n' => 1, ]; - $data = AdminService::AdminList($data_params); - if(empty($data[0])) + $ret = AdminService::AdminList($data_params); + if(empty($ret[0])) { return $this->error('管理员信息不存在', MyUrl('admin/index/index')); } - $this->assign('data', $data[0]); + $data = $ret[0]; } + $this->assign('data', $data); // 角色 $role_params = [ diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index b4c6e79202a891d69f9bf51caf628960137cb6c6..d2c3db9b68cd020e7fe1219f4f879a0733c2fa23 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -109,6 +109,7 @@ class AppHomeNav extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -118,9 +119,10 @@ class AppHomeNav extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = AppNavService::AppHomeNavList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = AppNavService::AppHomeNavList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 所属平台 $this->assign('common_platform_type', lang('common_platform_type')); diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 3987ef52549c78c408aa700989b94289590db2f3..5b8332464018a4a1706e019ee396492637b443d1 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -110,6 +110,7 @@ class Article extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -119,9 +120,10 @@ class Article extends Common 'where' => ['a.id'=>intval($params['id'])], 'field' => 'a.*', ); - $data = ArticleService::ArticleList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = ArticleService::ArticleList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index 3f356d345be0861671279fb4ecee669c1c4b1003..6593f0de999a8554285a9c11f31312a58bc50e22 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -107,6 +107,7 @@ class Brand extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -116,9 +117,10 @@ class Brand extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = BrandService::BrandList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = BrandService::BrandList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index 314f2c1249b7227cf1a6fb4e8bc53f3831fe83f1..785ba0311c4addc642aff4584ab2a3e6ba6e257c 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -112,6 +112,7 @@ class CustomView extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -121,9 +122,10 @@ class CustomView extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = CustomViewService::CustomViewList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = CustomViewService::CustomViewList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index bbbc699781f34835553980bec7c2895c9b3f79fc..803bafcf3945e86f13398de3e4158096601ede83 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -107,6 +107,7 @@ class Goods extends Common $params = input(); // 商品信息 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -122,12 +123,13 @@ class Goods extends Common { return $this->error('商品信息不存在', MyUrl('admin/goods/index')); } - $this->assign('data', $ret['data'][0]); + $data = $ret['data'][0]; // 获取商品编辑规格 $specifications = GoodsService::GoodsEditSpecifications($ret['data'][0]['id']); $this->assign('specifications', $specifications); } + $this->assign('data', $data); // 地区信息 $this->assign('region_province_list', RegionService::RegionItems(['pid'=>0])); diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 129289c587b2fb2231c40e2b177fbc742eee867a..5ee0aff6887a33152da3a3f811114eb9b32f0c4e 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -134,20 +134,22 @@ class Power extends Common $params = input(); // 角色组 + $data = []; if(!empty($params['id'])) { $data_params = [ 'where' => ['id'=>intval($params['id'])], ]; - $data = AdminPowerService::RoleList($data_params); - if(!empty($data[0]['id'])) + $ret = AdminPowerService::RoleList($data_params); + if(!empty($ret[0]['id'])) { - $this->assign('data', $data[0]); + $data = $ret[0]; // 权限关联数据 - $params['role_id'] = $data[0]['id']; + $params['role_id'] = $ret[0]['id']; } } + $this->assign('data', $data); // 菜单列表 $power = AdminPowerService::RolePowerEditData($params); diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index 41f7e380906522159d89c37162d5618b2b5253f3..bfed445e79ed8e7386cefefc30c0d44f54d1e71e 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -109,6 +109,7 @@ class Slide extends Common $params = input(); // 数据 + $data = []; if(!empty($params['id'])) { // 获取列表 @@ -118,9 +119,10 @@ class Slide extends Common 'where' => ['id'=>intval($params['id'])], 'field' => '*', ); - $data = SlideService::SlideList($data_params); - $this->assign('data', empty($data['data'][0]) ? [] : $data['data'][0]); + $ret = SlideService::SlideList($data_params); + $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } + $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index d7d5f1a5bd7339a4ef1f9b4e79fe33751a93d25d..f44fd205419801c9805c5b64f302c39bb2e40215 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -131,6 +131,7 @@ class User extends Common $params = input(); // 用户编辑 + $data = []; if(!empty($params['id'])) { $data_params = [ @@ -138,14 +139,18 @@ class User extends Common 'm' => 0, 'n' => 1, ]; - $data = UserService::UserList($data_params); - if(empty($data['data'][0])) + $ret = UserService::UserList($data_params); + if(empty($ret['data'][0])) { return $this->error('用户信息不存在', MyUrl('admin/user/index')); } - $data['data'][0]['birthday_text'] = empty($data['data'][0]['birthday']) ? '' : date('Y-m-d', $data['data'][0]['birthday']); - $this->assign('data', $data['data'][0]); + + // 生日 + $ret['data'][0]['birthday_text'] = empty($ret['data'][0]['birthday']) ? '' : date('Y-m-d', $ret['data'][0]['birthday']); + + $data = $ret['data'][0]; } + $this->assign('data', $data); // 性别 $this->assign('common_gender_list', lang('common_gender_list')); diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html index 1f9c9e5d7dae1abdb98c56e510bf2253e11b2c9f..061e06020b898c8fd6ed958ee1b9fab7bdd66848 100755 --- a/application/admin/view/default/answer/index.html +++ b/application/admin/view/default/answer/index.html @@ -48,6 +48,7 @@