diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 1608ce42783354d59f375fdbad7fb312f627e988..9f6cc9bce97a02897897215eb07336e2757af074 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -49,7 +49,8 @@ class Index extends Common public function Index() { // 首页轮播 - $this->assign('banner_list', BannerService::Banner()); + $banner = BannerService::Banner(); + $this->assign('banner_list', $banner); // H5导航 $this->assign('navigation', AppHomeNavService::AppHomeNav()); @@ -71,6 +72,13 @@ class Index extends Common $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); $this->assign('user_order_status', $user_order_status['data']); + // 加载百度地图api + // 存在地图事件则载入 + if(in_array(3, array_column($banner, 'event_type'))) + { + $this->assign('is_load_baidu_map_api', 1); + } + // 钩子 $this->PluginsHook(); diff --git a/application/index/view/default/public/home_banner.html b/application/index/view/default/public/home_banner.html index 7e726a9d1cc874c5d375834d03cee5bec67ea487..f0fd2f4777b52992d5bcfea3f83b42a694dd86ed 100755 --- a/application/index/view/default/public/home_banner.html +++ b/application/index/view/default/public/home_banner.html @@ -6,7 +6,19 @@ {{foreach $banner_list as $banner}} {{if !empty($banner['images_url'])}}
  • - + {{switch banner.event_type}} + {{case 3}} + + + {{/case}} + {{case 4}} + + + {{/case}} + {{default /}} + + + {{/switch}}
  • {{/if}} {{/foreach}} diff --git a/application/index/view/default/search/index.html b/application/index/view/default/search/index.html index 4af486c2edc1308797e98de7bfe1dab4ee7813e1..f85383c293a5a03f7b849bd5598753878a7b2745 100755 --- a/application/index/view/default/search/index.html +++ b/application/index/view/default/search/index.html @@ -160,12 +160,24 @@ +
  • + + 热度 + + +
  • 价格
  • +
  • + + 最新 + + +
  • {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} diff --git a/application/service/BannerService.php b/application/service/BannerService.php index 3c158eb36fd34a11ce6c53b964ade6b27e2ae314..2eedaf35ec5ef92250abbf1072dcda7ac5359e64 100755 --- a/application/service/BannerService.php +++ b/application/service/BannerService.php @@ -56,9 +56,22 @@ class BannerService { foreach($data as &$v) { + // 图片地址 $v['images_url_old'] = $v['images_url']; $v['images_url'] = ResourcesService::AttachmentPathViewHandle($v['images_url']); - $v['event_value'] = empty($v['event_value']) ? null : $v['event_value']; + + // 事件值 + if(!empty($v['event_value'])) + { + // 地图 + if($v['event_type'] == 3) + { + $v['event_value_data'] = explode('|', $v['event_value']); + } + $v['event_value'] = $v['event_value']; + } else { + $v['event_value'] = null; + } } } diff --git a/changelog.txt b/changelog.txt index 3f433389740c1ac5d90ca97c8cea51e628656bed..139ee71f726d6e1ebaa1a6e203cb8e0d70db7005 100755 --- a/changelog.txt +++ b/changelog.txt @@ -10,6 +10,8 @@ 6. 新增 Ipay88 支付方式 7. 订单新增批量合并支付 8. 支付日志、退款日志、用户消息优化 + 9. 商品封面图片优化 + 10. 搜索支持空格多个关键字 web端 1. 所有条件、数据列表、新增、编辑、删除 新增钩子(公共 form 表单封装) @@ -25,12 +27,16 @@ web端 11. 后台新增商品复制功能 12. 后台小程序配置集中管理 13. 品牌支持关联多个分类 + 14. 首页轮播支持电话、地图事件方式 + 小程序端 1. 支持商品自定义销售类型模式 插件 - 1. 分销插件新增返积分模块 + 1. 分销插件新增返积分模块、海报高清 + 2. 会员等级推广海报高清 + 3. 运费插件支持单独每一个仓库独立配置 diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index b1b17ffe0912dc8d13eb960b63d6311080ed4a69..bb65d3bf111525451c23abdda5fe2f1efb85a2f6 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -3,7 +3,6 @@ ul, li, ol {list-style: none;} [class*="am-u-"] {padding-left:0rem;padding-right:0rem;} .am-container {padding-left:0px;padding-right:0px ;} .am-container > .am-g {margin-left: 0px;margin-right:0px ;} -img{max-width:100%;} .small-nav img,.small-nav a,.am-g.small-nav {border:none;} /*手机导航*/ diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css index 2efd202c0dfc86ea4308d282adadb2257b6b0d52..33d19cccab51d3cf8c887c42ea3b0aa169c790f8 100755 --- a/public/static/index/default/css/search.css +++ b/public/static/index/default/css/search.css @@ -31,7 +31,7 @@ li.select-result dt {left:-26px; top:0;font-weight:bold;width:50px;} /*排序*/ .sort-nav { width:100%; background: #fff; overflow: hidden; height: 30px; } -.sort-nav li{ float:left;width:33.33%;height:30px; line-height:30px; text-align:center; padding:0px 0px;cursor: pointer;} +.sort-nav li{ float:left;width:20%;height:30px; line-height:30px; text-align:center; padding:0px 0px;cursor: pointer;} .sort-nav li a{font-size:14px; text-decoration: none;} .sort-nav li.first {color: #F03726;}