Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

addons/address/.addonrc

@@ -0,0 +1 @@
+{"files":[],"license":"regular","licenseto":"19079","licensekey":"vPLQn1XRtIhwNC8S YTKV1JyBX7YJ1wmZUCdTBA==","domains":["lanjingling.com"],"licensecodes":[],"validations":["aa0a952b40dfeeac95e01a44890881cd"]}

addons/address/Address.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace addons\address;
+
+use think\Addons;
+
+/**
+ * 地址选择
+ * @author [MiniLing] <[laozheyouxiang@163.com]>
+ */
+class Address extends Addons
+{
+
+    /**
+     * 插件安装方法
+     * @return bool
+     */
+    public function install()
+    {
+        return true;
+    }
+
+    /**
+     * 插件卸载方法
+     * @return bool
+     */
+    public function uninstall()
+    {
+        return true;
+    }
+
+}

addons/address/bootstrap.js

@@ -0,0 +1,30 @@
+require([], function () {
+    //绑定data-toggle=addresspicker属性点击事件
+
+    $(document).on('click', "[data-toggle='addresspicker']", function () {
+        var that = this;
+        var callback = $(that).data('callback');
+        var input_id = $(that).data("input-id") ? $(that).data("input-id") : "";
+        var lat_id = $(that).data("lat-id") ? $(that).data("lat-id") : "";
+        var lng_id = $(that).data("lng-id") ? $(that).data("lng-id") : "";
+        var lat = lat_id ? $("#" + lat_id).val() : '';
+        var lng = lng_id ? $("#" + lng_id).val() : '';
+        var url = "/addons/address/index/select";
+        url += (lat && lng) ? '?lat=' + lat + '&lng=' + lng : '';
+        Fast.api.open(url, '位置选择', {
+            callback: function (res) {
+                input_id && $("#" + input_id).val(res.address).trigger("change");
+                lat_id && $("#" + lat_id).val(res.lat).trigger("change");
+                lng_id && $("#" + lng_id).val(res.lng).trigger("change");
+                try {
+                    //执行回调函数
+                    if (typeof callback === 'function') {
+                        callback.call(that, res);
+                    }
+                } catch (e) {
+
+                }
+            }
+        });
+    });
+});

addons/address/config.php

@@ -0,0 +1,116 @@
+<?php
+
+return [
+    [
+        'name' => 'maptype',
+        'title' => '默认地图类型',
+        'type' => 'radio',
+        'content' => [
+            'baidu' => '百度地图',
+            'amap' => '高德地图',
+            'tencent' => '腾讯地图',
+        ],
+        'value' => 'baidu',
+        'rule' => 'required',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'zoom',
+        'title' => '默认缩放级别',
+        'type' => 'string',
+        'content' => [],
+        'value' => '11',
+        'rule' => 'required',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'lat',
+        'title' => '默认Lat',
+        'type' => 'string',
+        'content' => [],
+        'value' => '39.919990',
+        'rule' => 'required',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'lng',
+        'title' => '默认Lng',
+        'type' => 'string',
+        'content' => [],
+        'value' => '116.456270',
+        'rule' => 'required',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'baidukey',
+        'title' => '百度地图KEY',
+        'type' => 'string',
+        'content' => [],
+        'value' => '1cylidr91giazBbd0isROxctZ5HzRNFK',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'amapkey',
+        'title' => '高德地图KEY',
+        'type' => 'string',
+        'content' => [],
+        'value' => '',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'amapsecurityjscode',
+        'title' => '高德地图安全密钥',
+        'type' => 'string',
+        'content' => [],
+        'value' => '',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => 'tencentkey',
+        'title' => '腾讯地图KEY',
+        'type' => 'string',
+        'content' => [],
+        'value' => '',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => '',
+    ],
+    [
+        'name' => '__tips__',
+        'title' => '温馨提示',
+        'type' => '',
+        'content' => [],
+        'value' => '请先申请对应地图的Key，配置后再使用',
+        'rule' => '',
+        'msg' => '',
+        'tip' => '',
+        'ok' => '',
+        'extend' => 'alert-danger-light',
+    ],
+];

addons/address/controller/Index.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace addons\address\controller;
+
+use think\addons\Controller;
+use think\Config;
+use think\Hook;
+
+class Index extends Controller
+{
+
+    // 首页
+    public function index()
+    {
+        // 语言检测
+        $lang = $this->request->langset();
+        $lang = preg_match("/^([a-zA-Z\-_]{2,10})\$/i", $lang) ? $lang : 'zh-cn';
+
+        $site = Config::get("site");
+
+        // 配置信息
+        $config = [
+            'site'           => array_intersect_key($site, array_flip(['name', 'cdnurl', 'version', 'timezone', 'languages'])),
+            'upload'         => null,
+            'modulename'     => 'addons',
+            'controllername' => 'index',
+            'actionname'     => 'index',
+            'jsname'         => 'addons/address',
+            'moduleurl'      => '',
+            'language'       => $lang
+        ];
+        $config = array_merge($config, Config::get("view_replace_str"));
+
+        // 配置信息后
+        Hook::listen("config_init", $config);
+        // 加载当前控制器语言包
+        $this->view->assign('site', $site);
+        $this->view->assign('config', $config);
+
+        return $this->view->fetch();
+    }
+
+    // 选择地址
+    public function select()
+    {
+        $config = get_addon_config('address');
+        $lng = $this->request->get('lng');
+        $lat = $this->request->get('lat');
+        $lng = $lng ? $lng : $config['lng'];
+        $lat = $lat ? $lat : $config['lat'];
+        $this->view->assign('lng', $lng);
+        $this->view->assign('lat', $lat);
+        $maptype = $config['maptype'];
+        if (!isset($config[$maptype . 'key']) || !$config[$maptype . 'key']) {
+            $this->error("请在配置中配置对应类型地图的密钥");
+        }
+        return $this->view->fetch('index/' . $maptype);
+    }
+
+}

addons/address/info.ini

@@ -0,0 +1,10 @@
+name = address
+title = 地址位置选择插件
+intro = 地图位置选择插件，可返回地址和经纬度
+author = FastAdmin
+website = https://www.fastadmin.net
+version = 1.0.10
+state = 1
+url = /addons/address
+license = regular
+licenseto = 19079

addons/address/view/index/amap.html

@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <title>地址选择器</title>
+    <link rel="stylesheet" href="__CDN__/assets/css/frontend.min.css"/>
+    <link rel="stylesheet" href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css"/>
+    <style type="text/css">
+        body {
+            margin: 0;
+            padding: 0;
+        }
+
+        #container {
+            position: absolute;
+            left: 0;
+            top: 0;
+            right: 0;
+            bottom: 0;
+        }
+
+        .confirm {
+            position: absolute;
+            bottom: 30px;
+            right: 4%;
+            z-index: 99;
+            height: 50px;
+            width: 50px;
+            line-height: 50px;
+            font-size: 15px;
+            text-align: center;
+            background-color: white;
+            background: #1ABC9C;
+            color: white;
+            border: none;
+            cursor: pointer;
+            border-radius: 50%;
+        }
+
+        .search {
+            position: absolute;
+            width: 400px;
+            top: 0;
+            left: 50%;
+            padding: 5px;
+            margin-left: -200px;
+        }
+
+        .amap-marker-label {
+            border: 0;
+            background-color: transparent;
+        }
+
+        .info {
+            padding: .75rem 1.25rem;
+            margin-bottom: 1rem;
+            border-radius: .25rem;
+            position: fixed;
+            top: 2rem;
+            background-color: white;
+            width: auto;
+            min-width: 22rem;
+            border-width: 0;
+            left: 1.8rem;
+            box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+        }
+    </style>
+</head>
+<body>
+<div class="search">
+    <div class="input-group">
+        <input type="text" id="place" name="q" class="form-control" placeholder="输入地点"/>
+        <span class="input-group-btn">
+            <button type="submit" name="search" id="search-btn" class="btn btn-success">
+                <i class="fa fa-search"></i>
+            </button>
+        </span>
+    </div>
+</div>
+<div class="confirm">确定</div>
+<div id="container"></div>
+<script type="text/javascript">
+    window._AMapSecurityConfig = {
+        securityJsCode: "{$config.amapsecurityjscode|default=''}",
+    }
+</script>
+<script type="text/javascript" src="//webapi.amap.com/maps?v=1.4.11&key={$config.amapkey|default=''}&plugin=AMap.ToolBar,AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder"></script>
+<!-- UI组件库 1.0 -->
+<script src="//webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
+<script src="__CDN__/assets/libs/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript">
+    $(function () {
+        var as, address, map, lat, lng, geocoder;
+        var init = function () {
+            AMapUI.loadUI(['misc/PositionPicker', 'misc/PoiPicker'], function (PositionPicker, PoiPicker) {
+                //加载PositionPicker，loadUI的路径参数为模块名中 'ui/' 之后的部分
+                map = new AMap.Map('container', {
+                    zoom: parseInt('{$config.zoom}')
+                });
+                geocoder = new AMap.Geocoder({
+                    radius: 1000 //范围，默认：500
+                });
+                var positionPicker = new PositionPicker({
+                    mode: 'dragMarker',//设定为拖拽地图模式，可选'dragMap'、'dragMarker'，默认为'dragMap'
+                    map: map//依赖地图对象
+                });
+                //输入提示
+                var autoOptions = {
+                    input: "place"
+                };
+
+                var relocation = function (lnglat) {
+                    lng = lnglat.lng;
+                    lat = lnglat.lat;
+                    map.panTo([lng, lat]);
+                    positionPicker.start(lnglat);
+                    geocoder.getAddress(lng + ',' + lat, function (status, result) {
+                        if (status === 'complete' && result.regeocode) {
+                            var address = result.regeocode.formattedAddress;
+                            var label = '<div class="info">地址:' + address + '<br>经度:' + lng + '<br>纬度:' + lat + '</div>';
+                            positionPicker.marker.setLabel({
+                                content: label //显示内容
+                            });
+                        } else {
+                            console.log(JSON.stringify(result));
+                        }
+                    });
+                };
+                var auto = new AMap.Autocomplete(autoOptions);
+
+                //构造地点查询类
+                var placeSearch = new AMap.PlaceSearch({
+                    map: map
+                });
+                //注册监听，当选中某条记录时会触发
+                AMap.event.addListener(auto, "select", function (e) {
+                    placeSearch.setCity(e.poi.adcode);
+                    placeSearch.search(e.poi.name);  //关键字查询查询
+                });
+                AMap.event.addListener(map, 'click', function (e) {
+                    relocation(e.lnglat);
+                });
+
+                //加载工具条
+                var tool = new AMap.ToolBar();
+                map.addControl(tool);
+
+                var poiPicker = new PoiPicker({
+                    input: 'place',
+                    placeSearchOptions: {
+                        map: map,
+                        pageSize: 6 //关联搜索分页
+                    }
+                });
+                poiPicker.on('poiPicked', function (poiResult) {
+                    poiPicker.hideSearchResults();
+                    $('.poi .nearpoi').text(poiResult.item.name);
+                    $('.address .info').text(poiResult.item.address);
+                    $('#address').val(poiResult.item.address);
+                    $("#place").val(poiResult.item.name);
+
+                    relocation(poiResult.item.location);
+                });
+
+                positionPicker.on('success', function (positionResult) {
+                    as = positionResult.position;
+                    address = positionResult.address;
+                    lat = as.lat;
+                    lng = as.lng;
+                });
+                positionPicker.on('fail', function (positionResult) {
+                    address = '';
+                });
+                positionPicker.start();
+
+                var defaultLng = {$lng}, defaultLat = {$lat};
+                if (defaultLng && defaultLat) {
+                    relocation(new AMap.LngLat(Number(defaultLng), Number(defaultLat)));
+                }
+            });
+        };
+
+        //点击确定后执行回调赋值
+        var close = function (data) {
+            var index = parent.Layer.getFrameIndex(window.name);
+            var callback = parent.$("#layui-layer" + index).data("callback");
+            //再执行关闭
+            parent.Layer.close(index);
+            //再调用回传函数
+            if (typeof callback === 'function') {
+                callback.call(undefined, data);
+            }
+        };
+
+        var getParam = function (name, url) {
+            url = url || location.href;
+            return url.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+        };
+
+        //点击搜索按钮
+        $(document).on('click', '.confirm', function () {
+            var zoom = map.getZoom();
+            var data = {lat: lat, lng: lng, zoom: zoom, address: address};
+            close(data);
+        });
+        init();
+    });
+</script>
+</body>
+</html>

addons/address/view/index/baidu.html

@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <title>地址选择器</title>
+    <link rel="stylesheet" href="__CDN__/assets/css/frontend.min.css"/>
+    <link rel="stylesheet" href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css"/>
+    <style type="text/css">
+        body {
+            margin: 0;
+            padding: 0;
+        }
+
+        #container {
+            position: absolute;
+            left: 0;
+            top: 0;
+            right: 0;
+            bottom: 0;
+        }
+
+        .confirm {
+            position: absolute;
+            bottom: 30px;
+            right: 4%;
+            z-index: 99;
+            height: 50px;
+            width: 50px;
+            line-height: 50px;
+            font-size: 15px;
+            text-align: center;
+            background-color: white;
+            background: #1ABC9C;
+            color: white;
+            border: none;
+            cursor: pointer;
+            border-radius: 50%;
+        }
+
+        .search {
+            position: absolute;
+            width: 400px;
+            top: 0;
+            left: 50%;
+            padding: 5px;
+            margin-left: -200px;
+        }
+
+        label.BMapLabel {
+            max-width: inherit;
+            padding: .75rem 1.25rem;
+            margin-bottom: 1rem;
+            background-color: white;
+            width: auto;
+            min-width: 22rem;
+            border: none;
+            box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+        }
+
+    </style>
+</head>
+<body>
+<div class="search">
+    <div class="input-group">
+        <input type="text" id="place" name="q" class="form-control" placeholder="输入地点"/>
+        <div id="searchResultPanel" style="border:1px solid #C0C0C0;width:150px;height:auto; display:none;"></div>
+        <span class="input-group-btn">
+            <button type="button" name="search" id="address" class="btn btn-success">
+                <i class="fa fa-search"></i>
+            </button>
+        </span>
+    </div>
+</div>
+<div class="confirm">确定</div>
+<div id="container"></div>
+<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak={$config.baidukey|default=''}"></script>
+<script src="__CDN__/assets/libs/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript">
+    $(function () {
+        // 百度地图API功能
+        function G(id) {
+            return document.getElementById(id);
+        }
+
+        var map, marker, searchService, address = null, lng, lat;
+
+        var init = function () {
+            map = new BMap.Map("container"); // 创建地图实例
+            var point = new BMap.Point({$lng}, {$lat}); // 创建点坐标
+            map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
+            map.centerAndZoom(point, parseInt("{$config.zoom}")); // 初始化地图，设置中心点坐标和地图级别
+
+            var size = new BMap.Size(10, 20);
+            map.addControl(new BMap.CityListControl({
+                anchor: BMAP_ANCHOR_TOP_LEFT,
+                offset: size,
+            }));
+
+            var geoc = new BMap.Geocoder();
+
+            var addpoint = function (point) {
+                //通过点击百度地图，可以获取到对应的point, 由point的lng、lat属性就可以获取对应的经度纬度
+                var pt = point;
+                geoc.getLocation(pt, function (rs) {
+                    //对象可以获取到详细的地址信息
+                    address = rs.address;
+                    deletePoint();
+                    var mk = new BMap.Marker(pt);
+                    map.addOverlay(mk);
+                    map.panTo(pt);
+                    var label = new BMap.Label('<div class="info">地址:' + address + '<br>经度:' + pt.lng + '<br>纬度:' + pt.lat + '</div>', {offset: new BMap.Size(16, 20)});
+                    label.setStyle({
+                        border: 'none',
+                        padding: '.75rem 1.25rem'
+                    });
+                    mk.setLabel(label);
+                    //将对应的HTML元素设置值
+                    lng = pt.lng;
+                    lat = pt.lat;
+                });
+            };
+
+            if ("{$lng}" != '' && "{$lat}" != '') {
+                addpoint(point);
+            }
+
+            ac = new BMap.Autocomplete({"input": "place", "location": map}); //建立一个自动完成的对象
+            ac.addEventListener("onhighlight", function (e) {  //鼠标放在下拉列表上的事件
+                var str = "";
+                var _value = e.fromitem.value;
+                var value = "";
+                if (e.fromitem.index > -1) {
+                    value = _value.province + _value.city + _value.district + _value.street + _value.business;
+                }
+                str = "FromItem<br />index = " + e.fromitem.index + "<br />value = " + value;
+
+                value = "";
+                if (e.toitem.index > -1) {
+                    _value = e.toitem.value;
+                    value = _value.province + _value.city + _value.district + _value.street + _value.business;
+                }
+                str += "<br />ToItem<br />index = " + e.toitem.index + "<br />value = " + value;
+                G("searchResultPanel").innerHTML = str;
+            });
+            ac.addEventListener("onconfirm", function (e) {    //鼠标点击下拉列表后的事件
+                var _value = e.item.value;
+                myValue = _value.province + _value.city + _value.district + _value.street + _value.business;
+                G("searchResultPanel").innerHTML = "onconfirm<br />index = " + e.item.index + "<br />myValue = " + myValue;
+                setPlace();
+            });
+
+            function setPlace() {
+                map.clearOverlays();    //清除地图上所有覆盖物
+                function myFun() {
+                    var result = local.getResults().getPoi(0);
+                    var pp = result.point;    //获取第一个智能搜索的结果
+                    map.centerAndZoom(pp, 18);
+                    map.addOverlay(new BMap.Marker(pp));    //添加标注
+                    lng = pp.lng;
+                    lat = pp.lat;
+                    address = result.address;
+                }
+
+                var local = new BMap.LocalSearch(map, { //智能搜索
+                    onSearchComplete: myFun
+                });
+                local.search(myValue);
+            }
+
+            map.addEventListener("click", function (e) {
+                //通过点击百度地图，可以获取到对应的point, 由point的lng、lat属性就可以获取对应的经度纬度
+                var pt = e.point;
+                addpoint(e.point);
+            });
+
+            /**
+             * 清除覆盖物
+             */
+            function deletePoint() {
+                var allOverlay = map.getOverlays();
+                for (var i = 0; i < allOverlay.length; i++) {
+                    map.removeOverlay(allOverlay[i]);
+                }
+            }
+        };
+
+        var close = function (data) {
+            var index = parent.Layer.getFrameIndex(window.name);
+            var callback = parent.$("#layui-layer" + index).data("callback");
+            //再执行关闭
+            parent.Layer.close(index);
+            //再调用回传函数
+            if (typeof callback === 'function') {
+                callback.call(undefined, data);
+            }
+        };
+
+        //点击确定后执行回调赋值
+        $(document).on('click', '.confirm', function () {
+            var zoom = map.getZoom();
+            var data = {lat: lat, lng: lng, zoom: zoom, address: address};
+            close(data);
+        });
+
+        init();
+    });
+</script>
+</body>
+</html>

addons/address/view/index/index.html

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <title>地图位置(经纬度)选择插件</title>
+    <link rel="stylesheet" href="__CDN__/assets/css/frontend.min.css"/>
+    <link rel="stylesheet" href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css"/>
+</head>
+<body>
+<div class="container">
+
+    <div class="bs-docs-section clearfix">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="page-header">
+                    <h2>地图位置(经纬度)选择示例</h2>
+                </div>
+
+                <div class="bs-component">
+                    <form action="" method="post" role="form">
+                        <div class="form-group">
+                            <label for=""></label>
+                            <input type="text" class="form-control" name="" id="address" placeholder="地址">
+                        </div>
+                        <div class="form-group">
+                            <label for=""></label>
+                            <input type="text" class="form-control" name="" id="lng" placeholder="经度">
+                        </div>
+                        <div class="form-group">
+                            <label for=""></label>
+                            <input type="text" class="form-control" name="" id="lat" placeholder="纬度">
+                        </div>
+
+                        <button type="button" class="btn btn-primary" data-toggle='addresspicker' data-input-id="address" data-lng-id="lng" data-lat-id="lat">点击选择</button>
+                    </form>
+                </div>
+
+                <div class="page-header">
+                    <h2 id="code">调用代码</h2>
+                </div>
+                <div class="bs-component">
+                        <textarea class="form-control" rows="17">
+                            <form action="" method="post" role="form">
+                                <div class="form-group">
+                                    <label for=""></label>
+                                    <input type="text" class="form-control" name="" id="address" placeholder="地址">
+                                </div>
+                                <div class="form-group">
+                                    <label for=""></label>
+                                    <input type="text" class="form-control" name="" id="lng" placeholder="经度">
+                                </div>
+                                <div class="form-group">
+                                    <label for=""></label>
+                                    <input type="text" class="form-control" name="" id="lat" placeholder="纬度">
+                                </div>
+
+                                <button type="button" class="btn btn-primary" data-toggle='addresspicker' data-input-id="address" data-lng-id="lng" data-lat-id="lat">点击选择地址获取经纬度</button>
+                            </form>
+                        </textarea>
+                </div>
+                <div class="page-header">
+                    <h2>参数说明</h2>
+                </div>
+
+                <div class="bs-component">
+                    <table class="table table-condensed table-hover">
+                        <thead>
+                        <tr>
+                            <th>参数</th>
+                            <th>释义</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr>
+                            <td>data-input-id</td>
+                            <td>填充地址的文本框ID</td>
+                        </tr>
+                        <tr>
+                            <td>data-lng-id</td>
+                            <td>填充经度的文本框ID</td>
+                        </tr>
+                        <tr>
+                            <td>data-lat-id</td>
+                            <td>填充纬度的文本框ID</td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+</div>
+<!--@formatter:off-->
+<script type="text/javascript">
+    var require = {
+        config: {$config|json_encode}
+    };
+</script>
+<!--@formatter:on-->
+
+<script>
+    require.callback = function () {
+        define('addons/address', ['jquery', 'bootstrap', 'frontend', 'template'], function ($, undefined, Frontend, Template) {
+            var Controller = {
+                index: function () {
+                }
+            };
+            return Controller;
+        });
+        define('lang', function () {
+            return [];
+        });
+    }
+</script>
+
+<script src="__CDN__/assets/js/require.min.js" data-main="__CDN__/assets/js/require-frontend.min.js?v={$site.version}"></script>
+</body>
+</html>

addons/address/view/index/tencent.html

@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <title>地址选择器</title>
+    <link rel="stylesheet" href="__CDN__/assets/css/frontend.min.css"/>
+    <link rel="stylesheet" href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css"/>
+    <style type="text/css">
+        body {
+            margin: 0;
+            padding: 0;
+        }
+
+        #container {
+            position: absolute;
+            left: 0;
+            top: 0;
+            right: 0;
+            bottom: 0;
+        }
+
+        .confirm {
+            position: absolute;
+            bottom: 30px;
+            right: 4%;
+            z-index: 99;
+            height: 50px;
+            width: 50px;
+            line-height: 50px;
+            font-size: 15px;
+            text-align: center;
+            background-color: white;
+            background: #1ABC9C;
+            color: white;
+            border: none;
+            cursor: pointer;
+            border-radius: 50%;
+        }
+
+        .search {
+            position: absolute;
+            width: 400px;
+            top: 0;
+            left: 50%;
+            padding: 5px;
+            margin-left: -200px;
+        }
+    </style>
+</head>
+<body>
+<div class="search">
+    <div class="input-group">
+        <input type="text" id="place" name="q" class="form-control" placeholder="输入地点"/>
+        <span class="input-group-btn">
+            <button type="submit" name="search" id="search-btn" class="btn btn-success">
+                <i class="fa fa-search"></i>
+            </button>
+        </span>
+    </div>
+</div>
+<div class="confirm">确定</div>
+<div id="container"></div>
+
+<script charset="utf-8" src="//map.qq.com/api/js?v=2.exp&libraries=place&key={$config.tencentkey|default=''}"></script>
+<script src="__CDN__/assets/libs/jquery/dist/jquery.min.js"></script>
+
+<script type="text/javascript">
+    $(function () {
+        var map, marker, geocoder, infoWin, searchService, address = null;
+        var init = function () {
+            var center = new qq.maps.LatLng({$lat}, {$lng});
+            map = new qq.maps.Map(document.getElementById('container'), {
+                center: center,
+                zoom: parseInt("{$config.zoom}")
+            });
+            //初始化marker
+            initmarker(center);
+
+            //实例化信息窗口
+            infoWin = new qq.maps.InfoWindow({
+                map: map
+            });
+            geocoder = new qq.maps.Geocoder({
+                complete: function (result) {
+                    infoWin.open();
+                    address = result.detail.addressComponents.province +
+                        result.detail.addressComponents.city +
+                        result.detail.addressComponents.district;
+                    if (result.detail.addressComponents.streetNumber == '') {
+                        address += result.detail.addressComponents.street;
+                    } else {
+                        address += result.detail.addressComponents.streetNumber;
+                    }
+                    infoWin.setContent(address);
+                    infoWin.setPosition(result.detail.location);
+                }
+            });
+            //显示当前marker的位置信息窗口
+            geocoder.getAddress(center);
+
+            var latlngBounds = new qq.maps.LatLngBounds();
+            //查询poi类信息
+            searchService = new qq.maps.SearchService({
+                complete: function (results) {
+                    console.log(results);
+                    if (typeof results.detail.pois === 'undefined') {
+                        alert("未搜索到相关信息");
+                        return;
+                    }
+                    var pois = results.detail.pois;
+                    for (var i = 0, l = pois.length; i < l; i++) {
+                        var poi = pois[i];
+                        latlngBounds.extend(poi.latLng);
+                        initmarker(poi.latLng);
+                        //显示当前marker的位置信息窗口
+                        geocoder.getAddress(poi.latLng);
+                    }
+                    map.fitBounds(latlngBounds);
+                }
+            });
+            //实例化自动完成
+            var ap = new qq.maps.place.Autocomplete(document.getElementById('place'));
+            //添加监听事件
+            qq.maps.event.addListener(ap, "confirm", function (res) {
+                searchKeyword.call(this, res.value);
+            });
+            qq.maps.event.addListener(
+                map,
+                'click',
+                function (event) {
+                    try {
+                        infoWin.setContent('<div style="text-align:center;white-space:nowrap;margin:10px;">加载中</div>');
+                        var latLng = event.latLng,
+                            lat = latLng.getLat().toFixed(5),
+                            lng = latLng.getLng().toFixed(5);
+                        var location = new qq.maps.LatLng(lat, lng);
+                        //调用获取位置方法
+                        geocoder.getAddress(location);
+                        infoWin.setPosition(location);
+                        marker.setPosition(location);
+                    } catch (e) {
+                        console.log(e);
+                    }
+                }
+            );
+        };
+
+        //实例化marker和监听拖拽结束事件
+        var initmarker = function (latLng) {
+            marker = new qq.maps.Marker({
+                map: map,
+                position: latLng,
+                draggable: true,
+                title: '拖动图标选择位置'
+            });
+            //监听拖拽结束
+            qq.maps.event.addListener(marker, 'dragend', function (event) {
+                var latLng = event.latLng,
+                    lat = latLng.getLat().toFixed(5),
+                    lng = latLng.getLng().toFixed(5);
+                var location = new qq.maps.LatLng(lat, lng);
+                //调用获取位置方法
+                geocoder.getAddress(location);
+            });
+        };
+
+        var close = function (data) {
+            var index = parent.Layer.getFrameIndex(window.name);
+            var callback = parent.$("#layui-layer" + index).data("callback");
+            //再执行关闭
+            parent.Layer.close(index);
+            //再调用回传函数
+            if (typeof callback === 'function') {
+                callback.call(undefined, data);
+            }
+        };
+
+        //执行搜索方法
+        var searchKeyword = function () {
+            searchService.clear();//先清除
+            marker.setMap(null);
+            infoWin.close();
+            var keyword = $("#place").val();
+            // searchService.setLocation("北京");//设置默认检索范围（默认为全国），类型可以是坐标或指定的城市名称。
+            searchService.setPageIndex(0);//设置检索的特定页数。
+            searchService.setPageCapacity(1);//设置每页返回的结果数量。
+            searchService.search(this.place.address + " " + keyword);//开始查询
+        };
+
+        //点击确定后执行回调赋值
+        $(document).on('click', '.confirm', function () {
+            var as = marker.getPosition();
+            var x = as.getLat().toFixed(5);
+            var y = as.getLng().toFixed(5);
+            var zoom = map.getZoom();
+            var data = {lat: x, lng: y, zoom: zoom, address: address};
+            close(data);
+        });
+
+        //点击搜索按钮
+        $(document).on('click', '#search-btn', function () {
+            if ($("#place").val() == '')
+                return;
+            searchKeyword();
+        });
+
+        init();
+    });
+</script>
+</body>
+</html>

application/admin/view/company/add.html

@@ -87,6 +87,12 @@
         </div>
     </div>-->
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">地图选点(坐标):</label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" data-toggle="addresspicker" class="btn btn-primary btn-embossed disabled" data-lng-id="c-longitude" data-lat-id="c-latitude">获取位置</button>
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-longitude" class="form-control" step="0.000001" name="row[longitude]" type="number" value="0.000000">

application/admin/view/company/edit.html

@@ -86,7 +86,8 @@
             <input id="c-full_address" class="form-control" name="row[full_address]" type="text" value="{$row.full_address|htmlentities}">
         </div>
     </div>-->
-    <!--<div class="form-group">
+   <!--
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-longitude" class="form-control" step="0.000001" name="row[longitude]" type="number" value="{$row.longitude|htmlentities}">

application/admin/view/company/guanlian.html

@@ -87,6 +87,12 @@
         </div>
     </div>-->
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">地图选点(坐标):</label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="button" data-toggle="addresspicker" class="btn btn-primary btn-embossed disabled" data-lng-id="c-longitude" data-lat-id="c-latitude">获取位置</button>
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-longitude" class="form-control" step="0.000001" name="row[longitude]" type="number" value="{$row.longitude|htmlentities}">

application/api/controller/Pay.php

@@ -342,7 +342,7 @@ class Pay extends Api
         $userParams = [
             'user_id' => $orderInfo['user_id'],
             'company_id' => $orderInfo['company_id'],
-            'comefrom' => '',//来源
+            'comefrom' => '平台引流',//来源
         ];
         $userBindRes = $userService->userWallet($userParams);
         if (!$userBindRes['status']) {
@@ -496,7 +496,7 @@ class Pay extends Api
         $userParams = [
             'user_id' => $orderInfo['user_id'],
             'company_id' => $orderInfo['company_id'],
-            'comefrom' => '',//来源
+            'comefrom' => '平台引流',//来源
         ];
         $userBindRes = $userService->userWallet($userParams);
         if (!$userBindRes['status']) {

public/assets/js/addons.js

@@ -1,5 +1,36 @@
 define([], function () {
-    if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'alioss') {
+    require([], function () {
+    //绑定data-toggle=addresspicker属性点击事件
+
+    $(document).on('click', "[data-toggle='addresspicker']", function () {
+        var that = this;
+        var callback = $(that).data('callback');
+        var input_id = $(that).data("input-id") ? $(that).data("input-id") : "";
+        var lat_id = $(that).data("lat-id") ? $(that).data("lat-id") : "";
+        var lng_id = $(that).data("lng-id") ? $(that).data("lng-id") : "";
+        var lat = lat_id ? $("#" + lat_id).val() : '';
+        var lng = lng_id ? $("#" + lng_id).val() : '';
+        var url = "/addons/address/index/select";
+        url += (lat && lng) ? '?lat=' + lat + '&lng=' + lng : '';
+        Fast.api.open(url, '位置选择', {
+            callback: function (res) {
+                input_id && $("#" + input_id).val(res.address).trigger("change");
+                lat_id && $("#" + lat_id).val(res.lat).trigger("change");
+                lng_id && $("#" + lng_id).val(res.lng).trigger("change");
+                try {
+                    //执行回调函数
+                    if (typeof callback === 'function') {
+                        callback.call(that, res);
+                    }
+                } catch (e) {
+
+                }
+            }
+        });
+    });
+});
+
+if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'alioss') {
     require(['upload'], function (Upload) {
         //获取文件MD5值
         var getFileMd5 = function (file, cb) {

public/assets/js/backend/company.js

@@ -116,6 +116,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 $("#c-area_id").data("params",function(){
                     return {custom:{pid:$("#c-city_id").val()}};
                 });
+                $("[data-toggle='addresspicker']").data("callback", function(res){
+                    //其中res则是包含了address/lat/lng等信息的JSON对象
+                });
                 Form.api.bindevent($("form[role=form]"));
             }
         }