diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index eaecc60ad..aa0acff11 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -11,6 +11,8 @@ namespace app\api\controller; use app\service\GoodsService; +use app\service\BannerService; +use app\service\AppNavService; /** * 首页 @@ -44,6 +46,8 @@ class Index extends Common public function Index() { $result = [ + 'navigation' => AppNavService::AppHomeNav(), + 'banner_list' => BannerService::Banner(), 'data_list' => GoodsService::HomeFloorList(), 'common_shop_notice' => MyC('common_shop_notice', null, true), 'common_app_is_enable_search' => (int) MyC('common_app_is_enable_search', 1), diff --git a/public/appmini/old/wechat/pages/index/index.js b/public/appmini/old/wechat/pages/index/index.js index 6b8cf7253..e4cbdfe53 100755 --- a/public/appmini/old/wechat/pages/index/index.js +++ b/public/appmini/old/wechat/pages/index/index.js @@ -9,6 +9,7 @@ Page({ data_list_loding_status: 1, data_bottom_line_status: false, data_list: [], + banner_list: [], common_shop_notice: null, common_app_is_enable_search: 1, common_app_is_enable_answer: 1, @@ -41,6 +42,10 @@ Page({ if (res.data.code == 0) { var data = res.data.data; self.setData({ + banner_list: data.banner_list, + indicator_dots: (data.banner_list.length > 1), + autoplay: (data.banner_list.length > 1), + data_list: data.data_list, indicator_dots: (data.data_list.length > 1), autoplay: (data.data_list.length > 1), diff --git a/public/appmini/old/wechat/pages/index/index.wxml b/public/appmini/old/wechat/pages/index/index.wxml index 508d34375..3548fba14 100755 --- a/public/appmini/old/wechat/pages/index/index.wxml +++ b/public/appmini/old/wechat/pages/index/index.wxml @@ -11,14 +11,21 @@ {{common_shop_notice}} - - - - - - - - + + diff --git a/public/appmini/old/wechat/pages/index/index.wxss b/public/appmini/old/wechat/pages/index/index.wxss index b3127290b..9d231f81f 100755 --- a/public/appmini/old/wechat/pages/index/index.wxss +++ b/public/appmini/old/wechat/pages/index/index.wxss @@ -26,6 +26,13 @@ line-height: 70rpx; } + /** + * 轮播 + */ +.banner { + height: 320rpx!important; +} + /** * 楼层数据 */