sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

地图查看优化

feat/task1-c-wallet
gongfuxiang 2022-07-07 20:27:16 +08:00
parent ea709dc097
commit 1b781a5a76
30 changed files with 231 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/admin/controller/Map.php Normal file
View File

@ -0,0 +1,54 @@
<?php
// +----------------------------------------------------------------------
// | ShopXO 国内领先企业级B2C免费开源电商系统
// +----------------------------------------------------------------------
// | Copyright (c) 2011~2099 http://shopxo.net All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( https://opensource.org/licenses/mit-license.php )
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
namespace app\admin\controller;
/**
* 地图
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
class Map extends Common
{
/**
* 构造方法
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-03T12:39:08+0800
*/
public function __construct()
{
// 调用父类前置方法
parent::__construct();
// 登录校验
$this->IsLogin();
}
/**
* 地图插件页面
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
public function Index()
{
// 加载地图
MyViewAssign('is_load_baidu_map_api', 1);
return MyView();
}
}
?>

6
app/admin/controller/Order.php
View File

@ -91,9 +91,6 @@ class Order extends Common
// 快递公司
MyViewAssign('express_list', ExpressService::ExpressList());
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 基础参数赋值
MyViewAssign('params', $this->data_request);
MyViewAssign('page_html', $page->GetPageHtml());
@ -130,9 +127,6 @@ class Order extends Common
$ret = OrderService::OrderList($data_params);
$data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
MyViewAssign('data', $data);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
}
return MyView();
}

2
app/admin/controller/Site.php
View File

@ -77,7 +77,7 @@ class Site extends Common
// 数据处理
switch($this->nav_type)
{
// 自提点
// 站点类型
case 'sitetype' :
// 地址处理
if(!empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value']))

12
app/admin/controller/Useraddress.php
View File

@ -72,9 +72,6 @@ class UserAddress extends Common
];
$ret = UserAddressService::UserAddressAdminList($data_params);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 基础参数赋值
MyViewAssign('params', $this->data_request);
MyViewAssign('page_html', $page->GetPageHtml());
@ -91,6 +88,7 @@ class UserAddress extends Common
*/
public function Detail()
{
$data = [];
if(!empty($this->data_request['id']))
{
// 条件
@ -106,11 +104,8 @@ class UserAddress extends Common
];
$ret = UserAddressService::UserAddressAdminList($data_params);
$data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
MyViewAssign('data', $data);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
}
MyViewAssign('data', $data);
return MyView();
}
@ -140,6 +135,7 @@ class UserAddress extends Common
$ret = UserAddressService::UserAddressAdminList($data_params);
$data = empty($ret['data'][0]) ? [] : $ret['data'][0];
}
MyViewAssign('data', $data);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
@ -150,9 +146,7 @@ class UserAddress extends Common
MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($data['user_id'])));
}
// 数据
unset($params['id']);
MyViewAssign('data', $data);
MyViewAssign('params', $params);
return MyView();
}

9
app/admin/controller/Warehouse.php
View File

@ -61,9 +61,6 @@ class Warehouse extends Common
$ret = WarehouseService::WarehouseList($data_params);
MyViewAssign('data_list', $ret['data']);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 基础参数赋值
MyViewAssign('params', $this->data_request);
return MyView();
@ -78,6 +75,7 @@ class Warehouse extends Common
*/
public function Detail()
{
$data = [];
if(!empty($this->data_request['id']))
{
// 条件
@ -93,11 +91,8 @@ class Warehouse extends Common
];
$ret = WarehouseService::WarehouseList($data_params);
$data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
MyViewAssign('data', $data);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
}
MyViewAssign('data', $data);
return MyView();
}

22
app/admin/view/default/map/index.html Normal file
View File

@ -0,0 +1,22 @@
{{include file="public/header" /}}
<!-- content start -->
{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}}
<div id="map" data-level="17"></div>
{{else /}}
<div class="table-no"><i class="am-icon-warning"></i> 坐标有误</div>
{{/if}}
<!-- content end -->
<!-- footer start -->
{{include file="public/footer" /}}
<!-- footer end -->
{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}}
<script type="text/javascript">
$(function()
{
// 百度地图初始化
MapInit({{$params['lng']}}, {{$params['lat']}}, null, null, false);
});
</script>
{{/if}}

2
app/admin/view/default/order/detail.html
View File

@ -80,7 +80,7 @@
<span>{{$data.address_data.county_name}}</span>
<span>{{$data.address_data.address}}</span>
</p>
{{if !empty($data['address_data']['lng']) and !empty($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
{{if isset($data['address_data']['lng']) and isset($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
<div class="am-margin-top-xs">
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
</div>

2
app/admin/view/default/order/module/address.html
View File

@ -27,7 +27,7 @@
</div>
</div>
{{/if}}
{{if !empty($module_data['address_data']['lng']) and !empty($module_data['address_data']['lat']) and $module_data['address_data']['lng'] neq 0 and $module_data['address_data']['lat'] neq 0}}
{{if isset($module_data['address_data']['lng']) and isset($module_data['address_data']['lat']) and $module_data['address_data']['lng'] neq 0 and $module_data['address_data']['lat'] neq 0}}
<div class="am-margin-top-xs">
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.address_data.lng}}" data-lat="{{$module_data.address_data.lat}}"> 查看位置</button>
</div>

3
app/admin/view/default/public/header.html
View File

@ -75,10 +75,13 @@
var __my_url__ = '{{$my_url}}';
var __my_public_url__ = '{{$my_public_url}}';
var __public__ = '{{$public_host}}';
var __default_theme__ = '{{$default_theme}}';
var __attachment_host__ = '{{$attachment_host}}';
var __seo_url_suffix__ = '{{:MyC("home_seo_url_html_suffix", "html", true)}}';
var __currency_symbol__ = '{{$currency_symbol}}';
var __is_mobile__ = '{{if IsMobile()}}1{{else}}0{{/if}}';
var __env_max_input_vars_count__ = '{{$env_max_input_vars_count}}';
var __map_view_url__ = '{{:MyUrl("admin/map/index")}}';
</script>
<body>
{{if $module_name.$controller_name.$action_name neq 'adminindexindex'}}

2
app/admin/view/default/useraddress/module/position.html
View File

@ -5,7 +5,7 @@
{{if !empty($module_data['lat'])}}
<p class="am-margin-top-xs"><span>纬度：</span>{{$module_data.lat}}</p>
{{/if}}
{{if !empty($module_data['lng']) and !empty($module_data['lat']) and $module_data['lng'] neq 0 and $module_data['lat'] neq 0}}
{{if isset($module_data['lng']) and isset($module_data['lat']) and $module_data['lng'] neq 0 and $module_data['lat'] neq 0}}
<div class="am-margin-top-xs">
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.lng}}" data-lat="{{$module_data.lat}}"> 查看位置</button>
</div>

2
app/admin/view/default/warehouse/module/position.html
View File

@ -5,7 +5,7 @@
{{if !empty($module_data['lat'])}}
<p class="am-margin-top-xs"><span>纬度：</span>{{$module_data.lat}}</p>
{{/if}}
{{if !empty($module_data['lng']) and !empty($module_data['lat'])}}
{{if isset($module_data['lng']) and isset($module_data['lat']) and $module_data['lng'] neq 0 and $module_data['lat'] neq 0}}
<div class="am-margin-top-xs">
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.lng}}" data-lat="{{$module_data.lat}}"> 查看位置</button>
</div>

3
app/index/controller/Buy.php
View File

@ -108,9 +108,6 @@ class Buy extends Common
unset($params['address_id']);
}
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 钩子
$this->PluginsHook($ret['data'], $params);

6
app/index/controller/Common.php
View File

@ -358,12 +358,6 @@ class Common extends BaseController
$admin = AdminService::LoginInfo();
MyViewAssign('is_load_upload_editor', (!empty($this->user) || !empty($admin)) ? 1 : 0);
// 存在地图事件则载入
if(in_array(3, array_column($this->nav_quick, 'event_type')))
{
MyViewAssign('is_load_baidu_map_api', 1);
}
// 登录/注册方式
MyViewAssign('home_user_login_type', MyC('home_user_login_type', [], true));
MyViewAssign('home_user_reg_type', MyC('home_user_reg_type', [], true));

7
app/index/controller/Index.php
View File

@ -142,13 +142,6 @@ class Index extends Common
$link_list = LinkService::HomeLinkList();
MyViewAssign('link_list', $link_list);
// 加载百度地图api
// 存在地图事件则载入
if((!empty($banner) && in_array(3, array_column($banner, 'event_type'))) || (!empty($navigation) && in_array(3, array_column($navigation, 'event_type'))))
{
MyViewAssign('is_load_baidu_map_api', 1);
}
// 钩子
$this->PluginsHook();

53
app/index/controller/Map.php Normal file
View File

@ -0,0 +1,53 @@
<?php
// +----------------------------------------------------------------------
// | ShopXO 国内领先企业级B2C免费开源电商系统
// +----------------------------------------------------------------------
// | Copyright (c) 2011~2099 http://shopxo.net All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( https://opensource.org/licenses/mit-license.php )
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
namespace app\index\controller;
/**
* 地图
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
class Map extends Common
{
/**
* 构造方法
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-03T12:39:08+0800
*/
public function __construct()
{
// 调用父类前置方法
parent::__construct();
}
/**
* 地图插件页面
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
public function Index()
{
// 加载地图
MyViewAssign('is_load_baidu_map_api', 1);
MyViewAssign('is_header', 0);
MyViewAssign('is_footer', 0);
return MyView();
}
}
?>

6
app/index/controller/Order.php
View File

@ -83,9 +83,6 @@ class Order extends Common
// 发起支付 - 支付方式
MyViewAssign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]));
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 浏览器名称
MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('我的订单', 1));
@ -125,9 +122,6 @@ class Order extends Common
// 支付参数
$pay_params = OrderService::PayParamsHandle($this->data_request);
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
// 浏览器名称
MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('订单详情', 1));

13
app/index/controller/Useraddress.php
View File

@ -67,9 +67,7 @@ class UserAddress extends Common
*/
public function SaveInfo()
{
MyViewAssign('is_header', 0);
MyViewAssign('is_footer', 0);
// 地址数据
$data = [];
if(!empty($this->data_request))
{
@ -78,13 +76,16 @@ class UserAddress extends Common
$ret = UserAddressService::UserAddressRow($params);
$data = $ret['data'];
}
MyViewAssign('data', $data);
// 加载地图
MyViewAssign('is_load_baidu_map_api', 1);
// 编辑器文件存放地址
MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($this->user['id'])));
// 加载百度地图api
MyViewAssign('is_load_baidu_map_api', 1);
MyViewAssign('data', $data);
MyViewAssign('is_header', 0);
MyViewAssign('is_footer', 0);
return MyView();
}

83
app/index/view/default/buy/index.html
View File

@ -165,53 +165,48 @@
<!-- 自提地址选择弹层 -->
<div class="am-popup" id="extraction-address-popup">
<div class="am-popup-inner">
<div class="am-popup-hd">
<h4 class="am-popup-title">自提点选择</h4>
<span class="am-close" data-am-modal-close>&times;</span>
</div>
<div class="am-popup-bd">
<ul class="am-list">
{{foreach $base.extraction_address as $key=>$address}}
<li class="extraction-address-item am-nbfc" data-value="{{$key}}">
{{if !empty($address['logo'])}}
<div class="am-fl am-margin-right-xs">
<img src="{{$address.logo}}" alt="{{$address.name}}" class="am-img-thumbnail am-radius address-logo" />
<div class="am-popup-inner">
<div class="am-popup-hd">
<h4 class="am-popup-title">自提点选择</h4>
<span class="am-close" data-am-modal-close>&times;</span>
</div>
<div class="am-popup-bd">
<ul class="am-list">
{{foreach $base.extraction_address as $key=>$address}}
<li class="extraction-address-item am-nbfc" data-value="{{$key}}">
{{if !empty($address['logo'])}}
<div class="am-fl am-margin-right-xs">
<img src="{{$address.logo}}" alt="{{$address.name}}" class="am-img-thumbnail am-radius address-logo" />
</div>
{{/if}}
<div class="am-fl">
<p>
{{if !empty($address['alias'])}}
<span class="am-badge am-badge-secondary-plain am-radius am-margin-right-xs">{{$address.alias}}</span>
{{/if}}
<span>{{$address.name}}</span>
<span>{{$address.tel}}</span>
</p>
<p class="address-detail">
<span>{{$address.province_name}}</span>
<span>{{$address.city_name}}</span>
<span>{{$address.county_name}}</span>
<span>{{$address.address}}</span>
{{if isset($address['lng']) and isset($address['lat']) and $address['lng'] neq 0 and $address['lat'] neq 0}}
<a href="javascript:;" class="am-badge am-badge-default am-radius am-icon-map-marker am-margin-left-sm submit-map-popup" data-lng="{{$address.lng}}" data-lat="{{$address.lat}}"> 查看地图</a>
{{/if}}
</p>
</div>
{{/if}}
<div class="am-fl">
<p>
{{if !empty($address['alias'])}}
<span class="am-badge am-badge-secondary-plain am-radius am-margin-right-xs">{{$address.alias}}</span>
{{/if}}
<span>{{$address.name}}</span>
<span>{{$address.tel}}</span>
</p>
<p class="address-detail">
<span>{{$address.province_name}}</span>
<span>{{$address.city_name}}</span>
<span>{{$address.county_name}}</span>
<span>{{$address.address}}</span>
{{if !empty($address['lng']) and !empty($address['lat'])}}
<a href="javascript:;" class="am-badge am-badge-default am-radius extraction-address-map-submit am-icon-map-marker am-margin-left-sm" data-lng="{{$address.lng}}" data-lat="{{$address.lat}}"> 查看地图</a>
{{/if}}
</p>
</div>
{{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}}
<button type="button" class="am-btn am-btn-default am-radius" disabled>已选</button>
{{else /}}
<button type="button" class="am-btn am-btn-default am-radius" data-value="{{$key}}">选择</button>
{{/if}}
</li>
{{/foreach}}
</ul>
<!-- 地图 -->
<div class="extraction-address-map-container popup-not-title">
<span class="am-close am-close-alt am-icon-times"></span>
<div id="extraction-map"></div>
{{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}}
<button type="button" class="am-btn am-btn-default am-radius" disabled>已选</button>
{{else /}}
<button type="button" class="am-btn am-btn-default am-radius" data-value="{{$key}}">选择</button>
{{/if}}
</li>
{{/foreach}}
</ul>
</div>
</div>
</div>
</div>
{{/if}}
</div>

22
app/index/view/default/map/index.html Normal file
View File

@ -0,0 +1,22 @@
{{include file="public/header" /}}
<!-- content start -->
{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}}
<div id="map" data-level="17"></div>
{{else /}}
<div class="table-no"><i class="am-icon-warning"></i> 坐标有误</div>
{{/if}}
<!-- content end -->
<!-- footer start -->
{{include file="public/footer" /}}
<!-- footer end -->
{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}}
<script type="text/javascript">
$(function()
{
// 百度地图初始化
MapInit({{$params['lng']}}, {{$params['lat']}}, null, null, false);
});
</script>
{{/if}}

2
app/index/view/default/order/detail.html
View File

@ -410,7 +410,7 @@
</div>
<div>
<span>{{$data.address_data.province_name}} {{$data.address_data.city_name}} {{$data.address_data.county_name}} {{$data.address_data.address}}</span>
{{if !empty($data['address_data']['lng']) and !empty($data['address_data']['lat'])}}
{{if isset($data['address_data']['lng']) and isset($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
<button type="button" class="am-btn am-btn-success am-radius am-icon-map-marker submit-map-popup" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
{{/if}}
</div>

2
app/index/view/default/order/module/address.html
View File

@ -12,7 +12,7 @@
<span>{{$module_data.address_data.city_name}}</span>
<span>{{$module_data.address_data.county_name}}</span>
<span>{{$module_data.address_data.address}}</span>
{{if !empty($module_data['address_data']['lng']) and !empty($module_data['address_data']['lat'])}}
{{if isset($module_data['address_data']['lng']) and isset($module_data['address_data']['lat']) and $module_data['address_data']['lng'] neq 0 and $module_data['address_data']['lat'] neq 0 }}
<div class="am-margin-top-xs">
<button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.address_data.lng}}" data-lat="{{$module_data.address_data.lat}}"> 查看位置</button>
</div>

1
app/index/view/default/public/header.html
View File

@ -86,6 +86,7 @@
var __currency_symbol__ = '{{$currency_symbol}}';
var __is_mobile__ = '{{if IsMobile()}}1{{else}}0{{/if}}';
var __env_max_input_vars_count__ = '{{$env_max_input_vars_count}}';
var __map_view_url__ = '{{:MyUrl("index/map/index")}}';
</script>
<!-- 公共header内钩子 -->

2
app/index/view/default/public/home_banner.html
View File

@ -8,7 +8,7 @@
{{switch banner.event_type}}
{{case 3}}
<!-- 地图 -->
<a href="javascript:;" {{if !empty($banner['event_value_data']) and !empty($banner['event_value_data'][2]) and !empty($banner['event_value_data'][3])}}class="submit-map-popup" data-lng="{{$banner['event_value_data'][2]}}" data-lat="{{$banner['event_value_data'][3]}}"{{/if}}><img src="{{$banner.images_url}}" alt="{{$banner.name}}" /></a>
<a href="javascript:;" {{if !empty($banner['event_value_data']) and isset($banner['event_value_data'][2]) and isset($banner['event_value_data'][3]) and $banner['event_value_data'][2] neq 0 and $banner['event_value_data'][3] neq 0}}class="submit-map-popup" data-lng="{{$banner['event_value_data'][2]}}" data-lat="{{$banner['event_value_data'][3]}}"{{/if}}><img src="{{$banner.images_url}}" alt="{{$banner.name}}" /></a>
{{/case}}
{{case 4}}
<!-- 电话 -->

2
app/index/view/default/public/home_nav.html
View File

@ -5,7 +5,7 @@
{{switch nav.event_type}}
{{case 3}}
<!-- 地图 -->
<a href="javascript:;" {{if $nav['is_need_login'] eq 1 and empty($user)}} class="login-event" {{else /}}{{if !empty($nav['event_value_data']) and !empty($nav['event_value_data'][2]) and !empty($nav['event_value_data'][3])}}class="submit-map-popup" data-lng="{{$nav['event_value_data'][2]}}" data-lat="{{$nav['event_value_data'][3]}}"{{/if}}{{/if}}>
<a href="javascript:;" {{if $nav['is_need_login'] eq 1 and empty($user)}} class="login-event" {{else /}}{{if !empty($nav['event_value_data']) and isset($nav['event_value_data'][2]) and isset($nav['event_value_data'][3]) and $nav['event_value_data'][2] neq 0 and $nav['event_value_data'][3] neq 0}}class="submit-map-popup" data-lng="{{$nav['event_value_data'][2]}}" data-lat="{{$nav['event_value_data'][3]}}"{{/if}}{{/if}}>
{{/case}}
{{case 4}}
<!-- 电话 -->

2
app/index/view/default/public/quick.html
View File

@ -12,7 +12,7 @@
{{switch nav.event_type}}
{{case 3}}
<!-- 地图 -->
<a href="javascript:;" {{if !empty($nav['event_value_data']) and !empty($nav['event_value_data'][2]) and !empty($nav['event_value_data'][3])}}class="submit-map-popup" data-lng="{{$nav['event_value_data'][2]}}" data-lat="{{$nav['event_value_data'][3]}}"{{/if}}>
<a href="javascript:;" {{if !empty($nav['event_value_data']) and isset($nav['event_value_data'][2]) and isset($nav['event_value_data'][3]) and $nav['event_value_data'][2] neq 0 and $nav['event_value_data'][3] neq 0}}class="submit-map-popup" data-lng="{{$nav['event_value_data'][2]}}" data-lat="{{$nav['event_value_data'][3]}}"{{/if}}>
<p class="nav-icon" style="{{if !empty($nav['bg_color'])}}background:{{$nav.bg_color}};{{/if}}">
<img src="{{$nav.images_url}}" alt="{{$nav.name}}" />
</p>

4
public/static/admin/default/css/map.index.css Normal file
View File

@ -0,0 +1,4 @@
#map {
width: 100%;
height: 100vh;
}

16
public/static/common/js/common.js
View File

@ -1540,8 +1540,8 @@ function UrlFieldReplace(field, value, url)
if(url.indexOf('?') >= 0)
{
var str = url.substr(0, url.lastIndexOf('.'));
var ext = url.substr(url.lastIndexOf('.'));
var str = url.substr(0, url.lastIndexOf('.'+__seo_url_suffix__));
var ext = url.substr(url.lastIndexOf('.'+__seo_url_suffix__));
if(str.indexOf(field) >= 0)
{
var first = str.substr(0, str.lastIndexOf(field));
@ -3276,14 +3276,12 @@ $(function()
// 基础参数
var title = $(this).data('title') || '';
var class_tag = $(this).data('class') || '';
var full = parseInt($(this).data('full')) || 0;
var full_max = parseInt($(this).data('full-max')) || 0;
// 弹窗
AMUI.dialog.popup({
title: title,
content: '<div id="map" data-level="17"></div>',
class: 'map-popup '+class_tag
});
MapInit(lng, lat, null, null, false);
// 调用弹窗方法
var url = UrlFieldReplace('lat', lat, UrlFieldReplace('lng', lng, __map_view_url__));
ModalLoad(url, title, class_tag, full, full_max);
});
// 弹窗全屏

33
public/static/index/default/css/buy.css
View File

@ -244,39 +244,6 @@ ul.address-list, .business-item ul { overflow: hidden; }
top: 15px;
right: 5px;
}
/**
* 自提地址-弹层-查看地图
*/
.extraction-address-map-container {
position: fixed;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.3);
z-index: 1001;
padding: 50px;
width: 100%;
height: 100%;
display: none;
}
.extraction-address-map-container .am-close {
position: absolute;
right: 35px;
top: 35px;
-webkit-box-shadow: 0 0 6px rgba(0, 0, 0, 0.4);
-moz-box-shadow: 0 0 6px rgba(0, 0, 0, 0.4);
box-shadow: 0 0 6px rgba(0, 0, 0, 0.4);
opacity: 1;
background: #767676;
color: #fff;
border: 3px solid #f4f4f4;
width: 32px;
height: 32px;
z-index: 1;
}
#extraction-map {
width: 100%;
height: 100%;
}
/**
* 销售+自提导航

4
public/static/index/default/css/map.index.css Normal file
View File

@ -0,0 +1,4 @@
#map {
width: 100%;
height: 100vh;
}

20
public/static/index/default/js/buy.js
View File

@ -135,26 +135,6 @@ $(function()
}
});
// 自提点地址 - 查看地图/关闭地图
var $extraction_map_container = $('.extraction-address-map-container');
$extraction_popup.find('.extraction-address-map-submit').on('click', function()
{
var lng = $(this).data('lng') || null;
var lat = $(this).data('lat') || null;
if(lng == null || lat == null)
{
Prompt('坐标有误');
return false;
}
$extraction_map_container.show();
MapInit(lng, lat, null, null, false, 'extraction-map');
});
$extraction_map_container.find('.am-close').on('click', function()
{
$extraction_map_container.hide();
});
// 销售+自提 切换
$('.buy-header-nav li a').on('click', function()
{