diff --git a/app/admin/controller/Appcenternav.php b/app/admin/controller/Appcenternav.php index b2a7dce34..7431fd6f0 100755 --- a/app/admin/controller/Appcenternav.php +++ b/app/admin/controller/Appcenternav.php @@ -59,6 +59,8 @@ class AppCenterNav extends Base { // 模板数据 $assign = [ + // 当前数据 + 'data' => $this->data_detail, // 静态数据 'common_platform_type' => MyConst('common_platform_type'), 'common_app_event_type' => MyConst('common_app_event_type'), diff --git a/app/admin/controller/Apphomenav.php b/app/admin/controller/Apphomenav.php index 68e41a331..1efb76267 100755 --- a/app/admin/controller/Apphomenav.php +++ b/app/admin/controller/Apphomenav.php @@ -59,6 +59,8 @@ class AppHomeNav extends Base { // 模板数据 $assign = [ + // 当前数据 + 'data' => $this->data_detail, // 静态数据 'common_platform_type' => MyConst('common_platform_type'), 'common_app_event_type' => MyConst('common_app_event_type'), diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index c9ff9b512..ceb80609d 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -356,9 +356,13 @@ class Common extends BaseController $this->data_total = $ret['data']['data_total']; $this->data_list = $ret['data']['data_list']; $this->data_detail = $ret['data']['data_detail']; + // 建议使用新的变量、避免冲突 $assign['form_table_data_total'] = $this->data_total; $assign['form_table_data_list'] = $this->data_list; $assign['form_table_data_detail'] = $this->data_detail; + // 兼容老版本的数据读取变量(永久保留) + $assign['data_list'] = $this->data_list; + $assign['data'] = $this->data_detail; // 分页数据 $this->page = $ret['data']['page']; diff --git a/app/admin/controller/Customview.php b/app/admin/controller/Customview.php index 2cfac9dfd..7a24cfb68 100755 --- a/app/admin/controller/Customview.php +++ b/app/admin/controller/Customview.php @@ -59,7 +59,10 @@ class CustomView extends Base // 参数 $params = $this->data_request; unset($params['id']); - MyViewAssign('params', $params); + MyViewAssign([ + 'data' => $this->data_detail, + 'params' => $params, + ]); return MyView(); } diff --git a/app/admin/controller/Design.php b/app/admin/controller/Design.php index 9352b5309..f3582df63 100644 --- a/app/admin/controller/Design.php +++ b/app/admin/controller/Design.php @@ -76,6 +76,7 @@ class Design extends Base // 模板数据 $assign = [ + // 当前数据 'layout_data' => $layout_data, 'data' => $data, diff --git a/app/admin/controller/Goodscomments.php b/app/admin/controller/Goodscomments.php index 5cb4a08db..931f48179 100644 --- a/app/admin/controller/Goodscomments.php +++ b/app/admin/controller/Goodscomments.php @@ -59,7 +59,7 @@ class Goodscomments extends Base { // 模板数据 $assign = [ - // 数据 + // 当前数据 'data' => $this->data_detail, // 静态数据 'common_is_show_list' => MyConst('common_is_show_list'), diff --git a/app/admin/controller/Payment.php b/app/admin/controller/Payment.php index 06a009319..1aadb614e 100755 --- a/app/admin/controller/Payment.php +++ b/app/admin/controller/Payment.php @@ -83,6 +83,7 @@ class Payment extends Base } // 模板数据 $assign = [ + // 当前数据 'data' => $data, // 适用平台 diff --git a/app/admin/controller/Quicknav.php b/app/admin/controller/Quicknav.php index 2f12393c3..9cc37857a 100755 --- a/app/admin/controller/Quicknav.php +++ b/app/admin/controller/Quicknav.php @@ -59,6 +59,9 @@ class QuickNav extends Base { // 模板数据 $assign = [ + // 当前数据 + 'data' => $this->data_detail, + // 静态数据 'common_platform_type' => MyConst('common_platform_type'), 'common_app_event_type' => MyConst('common_app_event_type'), diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index 7c3cc0133..6ebe7cff2 100755 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -59,6 +59,8 @@ class Slide extends Base { // 模板数据 $assign = [ + // 当前数据 + 'data' => $this->data_detail, // 静态资源 'common_is_enable_list' => MyConst('common_is_enable_list'), 'common_platform_type' => MyConst('common_platform_type'), diff --git a/app/admin/controller/Useraddress.php b/app/admin/controller/Useraddress.php index 2714c9967..26e5998ac 100644 --- a/app/admin/controller/Useraddress.php +++ b/app/admin/controller/Useraddress.php @@ -62,7 +62,7 @@ class UserAddress extends Base // 模板数据 $assign = [ - // 数据 + // 当前数据 'data' => $data, // 加载地图api diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 42d796221..5ded29839 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -435,9 +435,13 @@ class Common extends BaseController $this->data_total = $ret['data']['data_total']; $this->data_list = $ret['data']['data_list']; $this->data_detail = $ret['data']['data_detail']; + // 建议使用新的变量、避免冲突 $assign['form_table_data_total'] = $this->data_total; $assign['form_table_data_list'] = $this->data_list; $assign['form_table_data_detail'] = $this->data_detail; + // 兼容老版本的数据读取变量(永久保留) + $assign['data_list'] = $this->data_list; + $assign['data'] = $this->data_detail; // 分页数据 $this->page = $ret['data']['page'];