From 1b781a5a76c39ce9332944c28507b5f36a0f4131 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 7 Jul 2022 20:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=9F=A5=E7=9C=8B=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Map.php | 54 ++++++++++++ app/admin/controller/Order.php | 6 -- app/admin/controller/Site.php | 2 +- app/admin/controller/Useraddress.php | 12 +-- app/admin/controller/Warehouse.php | 9 +- app/admin/view/default/map/index.html | 22 +++++ app/admin/view/default/order/detail.html | 2 +- .../view/default/order/module/address.html | 2 +- app/admin/view/default/public/header.html | 3 + .../default/useraddress/module/position.html | 2 +- .../default/warehouse/module/position.html | 2 +- app/index/controller/Buy.php | 3 - app/index/controller/Common.php | 6 -- app/index/controller/Index.php | 7 -- app/index/controller/Map.php | 53 ++++++++++++ app/index/controller/Order.php | 6 -- app/index/controller/Useraddress.php | 13 +-- app/index/view/default/buy/index.html | 83 +++++++++---------- app/index/view/default/map/index.html | 22 +++++ app/index/view/default/order/detail.html | 2 +- .../view/default/order/module/address.html | 2 +- app/index/view/default/public/header.html | 1 + .../view/default/public/home_banner.html | 2 +- app/index/view/default/public/home_nav.html | 2 +- app/index/view/default/public/quick.html | 2 +- public/static/admin/default/css/map.index.css | 4 + public/static/common/js/common.js | 16 ++-- public/static/index/default/css/buy.css | 33 -------- public/static/index/default/css/map.index.css | 4 + public/static/index/default/js/buy.js | 20 ----- 30 files changed, 231 insertions(+), 166 deletions(-) create mode 100644 app/admin/controller/Map.php create mode 100644 app/admin/view/default/map/index.html create mode 100644 app/index/controller/Map.php create mode 100644 app/index/view/default/map/index.html create mode 100644 public/static/admin/default/css/map.index.css create mode 100644 public/static/index/default/css/map.index.css diff --git a/app/admin/controller/Map.php b/app/admin/controller/Map.php new file mode 100644 index 000000000..bfafd4b71 --- /dev/null +++ b/app/admin/controller/Map.php @@ -0,0 +1,54 @@ +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(); + } +} +?> \ No newline at end of file diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index 61fc24917..5f8d834e4 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -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(); } diff --git a/app/admin/controller/Site.php b/app/admin/controller/Site.php index 1589cc93e..91672a289 100755 --- a/app/admin/controller/Site.php +++ b/app/admin/controller/Site.php @@ -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'])) diff --git a/app/admin/controller/Useraddress.php b/app/admin/controller/Useraddress.php index 1aeb0cca1..a90d21591 100644 --- a/app/admin/controller/Useraddress.php +++ b/app/admin/controller/Useraddress.php @@ -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(); } diff --git a/app/admin/controller/Warehouse.php b/app/admin/controller/Warehouse.php index 90061d2eb..e8819552b 100644 --- a/app/admin/controller/Warehouse.php +++ b/app/admin/controller/Warehouse.php @@ -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(); } diff --git a/app/admin/view/default/map/index.html b/app/admin/view/default/map/index.html new file mode 100644 index 000000000..5b7fa6212 --- /dev/null +++ b/app/admin/view/default/map/index.html @@ -0,0 +1,22 @@ +{{include file="public/header" /}} + + +{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}} +
+{{else /}} +
坐标有误
+{{/if}} + + + +{{include file="public/footer" /}} + +{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}} + +{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/order/detail.html b/app/admin/view/default/order/detail.html index e967d31f0..580c81347 100644 --- a/app/admin/view/default/order/detail.html +++ b/app/admin/view/default/order/detail.html @@ -80,7 +80,7 @@ {{$data.address_data.county_name}} {{$data.address_data.address}}

- {{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}}
diff --git a/app/admin/view/default/order/module/address.html b/app/admin/view/default/order/module/address.html index c12f9c941..3c5147731 100644 --- a/app/admin/view/default/order/module/address.html +++ b/app/admin/view/default/order/module/address.html @@ -27,7 +27,7 @@ {{/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}}
diff --git a/app/admin/view/default/public/header.html b/app/admin/view/default/public/header.html index 19e07acb5..ee759c36d 100755 --- a/app/admin/view/default/public/header.html +++ b/app/admin/view/default/public/header.html @@ -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")}}'; {{if $module_name.$controller_name.$action_name neq 'adminindexindex'}} diff --git a/app/admin/view/default/useraddress/module/position.html b/app/admin/view/default/useraddress/module/position.html index 5508cbe5c..09ff3bac0 100644 --- a/app/admin/view/default/useraddress/module/position.html +++ b/app/admin/view/default/useraddress/module/position.html @@ -5,7 +5,7 @@ {{if !empty($module_data['lat'])}}

纬度：{{$module_data.lat}}

{{/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}}
diff --git a/app/admin/view/default/warehouse/module/position.html b/app/admin/view/default/warehouse/module/position.html index 92afe207c..09ff3bac0 100644 --- a/app/admin/view/default/warehouse/module/position.html +++ b/app/admin/view/default/warehouse/module/position.html @@ -5,7 +5,7 @@ {{if !empty($module_data['lat'])}}

纬度：{{$module_data.lat}}

{{/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}}
diff --git a/app/index/controller/Buy.php b/app/index/controller/Buy.php index ea0a672cd..6a30839ad 100755 --- a/app/index/controller/Buy.php +++ b/app/index/controller/Buy.php @@ -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); diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 34caf84f0..e3e9e8231 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -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)); diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 89350bd15..d48e28a29 100755 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -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(); diff --git a/app/index/controller/Map.php b/app/index/controller/Map.php new file mode 100644 index 000000000..c16b16061 --- /dev/null +++ b/app/index/controller/Map.php @@ -0,0 +1,53 @@ + \ No newline at end of file diff --git a/app/index/controller/Order.php b/app/index/controller/Order.php index 3ecf005f5..273fa507c 100755 --- a/app/index/controller/Order.php +++ b/app/index/controller/Order.php @@ -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)); diff --git a/app/index/controller/Useraddress.php b/app/index/controller/Useraddress.php index 8dd7ae0fd..d82662bb0 100755 --- a/app/index/controller/Useraddress.php +++ b/app/index/controller/Useraddress.php @@ -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(); } diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index cf75a879f..9425e1625 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -165,53 +165,48 @@
-
-
-

自提点选择

- × -
-
-
    - {{foreach $base.extraction_address as $key=>$address}} -
  • - {{if !empty($address['logo'])}} -
    - +
    +
    +

    自提点选择

    + × +
    +
    +
      + {{foreach $base.extraction_address as $key=>$address}} +
    • + {{if !empty($address['logo'])}} +
      + +
      + {{/if}} +
      +

      + {{if !empty($address['alias'])}} + {{$address.alias}} + {{/if}} + {{$address.name}} + {{$address.tel}} +

      +

      + {{$address.province_name}} + {{$address.city_name}} + {{$address.county_name}} + {{$address.address}} + {{if isset($address['lng']) and isset($address['lat']) and $address['lng'] neq 0 and $address['lat'] neq 0}} + 查看地图 + {{/if}} +

      - {{/if}} -
      -

      - {{if !empty($address['alias'])}} - {{$address.alias}} - {{/if}} - {{$address.name}} - {{$address.tel}} -

      -

      - {{$address.province_name}} - {{$address.city_name}} - {{$address.county_name}} - {{$address.address}} - {{if !empty($address['lng']) and !empty($address['lat'])}} - 查看地图 - {{/if}} -

      -
      - {{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}} - - {{else /}} - - {{/if}} -
      • - {{/foreach}} -
    - -
    - -
    + {{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}} + + {{else /}} + + {{/if}} +
    • + {{/foreach}} +
-
{{/if}} diff --git a/app/index/view/default/map/index.html b/app/index/view/default/map/index.html new file mode 100644 index 000000000..5b7fa6212 --- /dev/null +++ b/app/index/view/default/map/index.html @@ -0,0 +1,22 @@ +{{include file="public/header" /}} + + +{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}} +
+{{else /}} +
坐标有误
+{{/if}} + + + +{{include file="public/footer" /}} + +{{if isset($params['lng']) and isset($params['lat']) and $params['lng'] neq 0 and $params['lat'] neq 0}} + +{{/if}} \ No newline at end of file diff --git a/app/index/view/default/order/detail.html b/app/index/view/default/order/detail.html index 2487421c5..562a9c750 100755 --- a/app/index/view/default/order/detail.html +++ b/app/index/view/default/order/detail.html @@ -410,7 +410,7 @@
{{$data.address_data.province_name}} {{$data.address_data.city_name}} {{$data.address_data.county_name}} {{$data.address_data.address}} - {{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}} {{/if}}
diff --git a/app/index/view/default/order/module/address.html b/app/index/view/default/order/module/address.html index b697d2bf9..02669fd56 100644 --- a/app/index/view/default/order/module/address.html +++ b/app/index/view/default/order/module/address.html @@ -12,7 +12,7 @@ {{$module_data.address_data.city_name}} {{$module_data.address_data.county_name}} {{$module_data.address_data.address}} - {{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 }}
diff --git a/app/index/view/default/public/header.html b/app/index/view/default/public/header.html index ffcb0cdcd..c2684d352 100755 --- a/app/index/view/default/public/header.html +++ b/app/index/view/default/public/header.html @@ -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")}}'; diff --git a/app/index/view/default/public/home_banner.html b/app/index/view/default/public/home_banner.html index 8af2e3db9..6d3bf9097 100755 --- a/app/index/view/default/public/home_banner.html +++ b/app/index/view/default/public/home_banner.html @@ -8,7 +8,7 @@ {{switch banner.event_type}} {{case 3}} - {{$banner.name}} + {{$banner.name}} {{/case}} {{case 4}} diff --git a/app/index/view/default/public/home_nav.html b/app/index/view/default/public/home_nav.html index 60bcd90fd..4c7676ab0 100644 --- a/app/index/view/default/public/home_nav.html +++ b/app/index/view/default/public/home_nav.html @@ -5,7 +5,7 @@ {{switch nav.event_type}} {{case 3}} - + {{/case}} {{case 4}} diff --git a/app/index/view/default/public/quick.html b/app/index/view/default/public/quick.html index 90f7bbb32..9775061e4 100644 --- a/app/index/view/default/public/quick.html +++ b/app/index/view/default/public/quick.html @@ -12,7 +12,7 @@ {{switch nav.event_type}} {{case 3}} - +

{{$nav.name}}

diff --git a/public/static/admin/default/css/map.index.css b/public/static/admin/default/css/map.index.css new file mode 100644 index 000000000..b43e3dcd9 --- /dev/null +++ b/public/static/admin/default/css/map.index.css @@ -0,0 +1,4 @@ +#map { + width: 100%; + height: 100vh; +} \ No newline at end of file diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index b9441538f..f43f58ddc 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -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: '
', - 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); }); // 弹窗全屏 diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css index 5415ab770..f9e45e3c5 100755 --- a/public/static/index/default/css/buy.css +++ b/public/static/index/default/css/buy.css @@ -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%; -} /** * 销售+自提导航 diff --git a/public/static/index/default/css/map.index.css b/public/static/index/default/css/map.index.css new file mode 100644 index 000000000..b43e3dcd9 --- /dev/null +++ b/public/static/index/default/css/map.index.css @@ -0,0 +1,4 @@ +#map { + width: 100%; + height: 100vh; +} \ No newline at end of file diff --git a/public/static/index/default/js/buy.js b/public/static/index/default/js/buy.js index 847d3ec83..a920492bf 100755 --- a/public/static/index/default/js/buy.js +++ b/public/static/index/default/js/buy.js @@ -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() {