diff --git a/CoreCms.Net.Web.Admin/wwwroot/index.html b/CoreCms.Net.Web.Admin/wwwroot/index.html
index 60d65206..70fed8a3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/index.html
@@ -17,8 +17,7 @@
     <script type="text/javascript" src="/lib/ckeditor/ckeditor.js"></script>
     <link href="/static/css/documentEditor.min.css" rel="stylesheet" />
 
-
-    <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&libraries=place&key=225d6c323c15ed3391a890f834bc4533"></script>
+    <script src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=225d6c323c15ed3391a890f834bc4533"></script>
 
     <!-- 让IE8/9支持媒体查询，从而兼容栅格 -->
     <!--[if lt IE 9]>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/common/getQQMap.html b/CoreCms.Net.Web.Admin/wwwroot/views/common/getQQMap.html
index 7b3938eb..517e5383 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/common/getQQMap.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/common/getQQMap.html
@@ -5,6 +5,8 @@
         .warning-msg-content p { display: inline-block; }
         .warning-msg-content a { color: #20a53a; }
             .warning-msg-content a:hover { color: #23527c; }
+    #container { width: 100%; height: 450px; }
+    #suggestionList { position: absolute; z-index: 999999; background: #fff; padding: 10px; }
 </style>
 <body>
     <script type="text/html" template lay-done="layui.data.done(d);">
@@ -12,10 +14,18 @@
             <input type="hidden" name="coordinate" value="{{d.params.data.oldData}}">
 
             <div class="layui-form-item">
-                <label for="tags" class="layui-form-label">请输入地址</label>
-                <div class="layui-input-inline layui-inline-10">
-                    <input name="tags" class="layui-input" lay-reqText="请输入标签" placeholder="请输入标签" id="place" style="z-index: 99999999" />
+                <label for="tags" class="layui-form-label">区域</label>
+                <div class="layui-input-inline layui-inline-2">
+                    <input id="areaName" name="areaName" value="怀化" class="layui-input" lay-reqText="请输入标签" placeholder="请输入标签" />
                 </div>
+                <label for="tags" class="layui-form-label">详细地址</label>
+                <div class="layui-input-inline layui-inline-6">
+                    <input id="keyword" name="keyword" oninput="getSuggestions()" class="layui-input" lay-reqText="请输入标签" placeholder="请输入标签" id="place" style="z-index: 99999999" />
+                    <ul id="suggestionList">
+                    </ul>
+                </div>
+                <div class="layui-form-mid layui-text-em">先输入区域，再输入模糊地址</div>
+
                 <div class="layui-form-mid" style="padding: 0 !important;float: right">
                     <button type="button" id="save-map" class="layui-btn" lay-submit lay-filter="formDemo">保存当前位置</button>
                 </div>
@@ -32,6 +42,11 @@
     var debug = layui.setter.debug;
     var coordinateBoxIdName;
     var addressBoxIdName;
+    var suggest;
+    var map;
+    var markerLayer;
+    var infoWindowList = Array(10);
+
     layui.data.done = function (d) {
         //开启调试情况下获取接口赋值数据
         if (debug) { console.log(d.params.data); }
@@ -39,115 +54,171 @@
         coordinateBoxIdName = d.params.data.coordinateBoxIdName;
         addressBoxIdName = d.params.data.addressBoxIdName;
 
+        console.log(addressBoxIdName);
+
         layui.use(['admin', 'form', 'coreHelper'], function () {
             $ = layui.$;
             var setter = layui.setter, admin = layui.admin, coreHelper = layui.coreHelper, form = layui.form;
             var layer = layui.layer;
 
-            var cityLocation, map, marker, center = null;
-            var markerImage = "http://api.map.baidu.com/images/marker_red_sprite.png";
+            var center = null;
             var preLocationCenter = $("input[name=coordinate]").val();
             if (preLocationCenter == '') {
-                cityLocation = new qq.maps.CityService({
-                    complete: function (result) {
-                        center = new qq.maps.LatLng(result.detail.latLng.lat, result.detail.latLng.lng);
-                        setMap(center);
-                    }
-                });
-                cityLocation.searchLocalCity();
+                //定义地图中心点坐标
+                center = new TMap.LatLng(27.551849, 109.983969)
             } else {
                 var arr = preLocationCenter.split(',');
                 if (arr.length < 2) {
                     parent.layer.msg("坐标位置错误");
                     return false;
                 }
-                center = new qq.maps.LatLng(arr[0], arr[1]);
-                setMap(center);
+                center = new TMap.LatLng(arr[0], arr[1])
             }
-            function setMap(center) {
 
-                map = new qq.maps.Map(document.getElementById('container'), {
-                    center: center,
-                    zoom: 13
-                });
+            //定义map变量，调用 TMap.Map() 构造函数创建地图
+            map = new TMap.Map(document.getElementById('container'), {
+                center: center,//设置地图中心点坐标
+                zoom: 17.2,   //设置地图缩放级别
+                pitch: 43.5,  //设置俯仰角
+                rotation: 0    //设置地图旋转角度
+            });
+            var geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
 
-                var size = new qq.maps.Size(20, 27);
-                var origin = new qq.maps.Point(0, 0);
-                var icon = new qq.maps.MarkerImage(markerImage, size, origin);
-                //创建一个Marker
-                marker = new qq.maps.Marker({
-                    icon: icon,
-                    position: center,
-                    animation: qq.maps.MarkerAnimation.DOWN,
-                    map: map,
-                    title: '选择企业位置'
-                });
+            //创建并初始化MultiMarker
+            markerLayer = new TMap.MultiMarker({
+                map: map,  //指定地图容器
+                //样式定义
+                styles: {
+                    marker: new TMap.MarkerStyle({
+                        width: 20, // 样式宽
+                        height: 30, // 样式高
+                        anchor: { x: 10, y: 30 }, // 描点位置
+                    }),
+                },
+                geometries: [
+                    {
+                        // 标记位置(纬度，经度，高度)
+                        position: center,
+                        id: 'marker',
+                    },
+                ],
+            });
 
-                var jump = function (event) {
-                    marker.setPosition(event.latLng);
-                };
-                qq.maps.event.addListener(map, 'click', jump);
-
-                //搜索框提示
-                var ap = new qq.maps.place.Autocomplete(document.getElementById('place'), {
-                    offset: new qq.maps.Size(0, 5),
-                    location: '北京市',
-                    zIndex: 99999999
-                });
-                var keyword = "";
-
-                //调用Poi检索类。用于进行本地检索、周边检索等服务。
-                var searchService = new qq.maps.SearchService({
-                    complete: function (results) {
-                        if (results.type === "CITY_LIST") {
-                            searchService.setLocation(results.detail.cities[0].cityName);
-                            searchService.search(keyword);
-                            return;
-                        }
-                        var pois = results.detail.pois;
-                        var latlngBounds = new qq.maps.LatLngBounds();
-                        for (var i = 0, l = pois.length; i < l; i++) {
-                            var poi = pois[i];
-                            latlngBounds.extend(poi.latLng);
-                            var marker = new qq.maps.Marker({
-                                map: map,
-                                position: poi.latLng
-                            });
-
-                            marker.setTitle(poi.name);
-                        }
-                        map.fitBounds(latlngBounds);
-                    }
-                });
-                //添加监听事件
-                qq.maps.event.addListener(ap, "confirm", function (res) {
-                    console.log('查询地址');
-                    keyword = res.value;
-                    searchService.search(keyword);
-                });
+            //移除marker事件
+            function removeMarker() {
+                markerLayer.setGeometries([])
             }
 
+            //监听点击事件添加marker
+            map.on("click", (evt) => {
+                removeMarker();
+                markerLayer.add({
+                    position: evt.latLng
+                });
+            });
+
+            //定义事件处理方法
+            var clickHandler = function (evt) {
+                var lat = evt.latLng.getLat().toFixed(6);
+                var lng = evt.latLng.getLng().toFixed(6);
+                console.log("您点击的的坐标是：" + lat + "," + lng);
+
+            }
+            //Map实例创建后，通过on方法绑定点击事件
+            map.on("click", clickHandler)
+
             $("#save-map").on('click', function () {
-                parent.$("#" + coordinateBoxIdName).val(marker.position.lat + ',' + marker.position.lng);
+
+                console.log(markerLayer.geometries);
+
+                parent.$("#" + coordinateBoxIdName).val(markerLayer.geometries[0].position.lat + ',' + markerLayer.geometries[0].position.lng);
                 if (addressBoxIdName) {
-                    setName(marker.position.lat, marker.position.lng);
+
+                    var location = new TMap.LatLng(Number(markerLayer.geometries[0].position.lat), Number(markerLayer.geometries[0].position.lng));
+                    geocoder.getAddress({ location: location }) // 将给定的坐标位置转换为地址
+                        .then((result) => {
+                            console.log(result.result.address);
+                            parent.$("#" + addressBoxIdName).val(result.result.address);
+                            // 显示搜索到的地址
+                        });
                 }
                 //parent.layer.closeAll();
                 parent.layer.close(layer.index);
             });
 
+
             form.render(null, 'LAY-app-CoreCmsEnterprise-MapForm');
         });
+
+        // 新建一个地点搜索类
+        //suggest = new TMap.service.Suggestion({
+        //    // 新建一个关键字输入提示类
+        //    pageSize: 10, // 返回结果每页条目数
+        //    region: '北京', // 限制城市范围
+        //    regionFix: true, // 搜索无结果时是否固定在当前城市
+        //});
+
+
+
     };
-
-    function setName(lat, lng) {
-        geocoder = new qq.maps.Geocoder({
-            complete: function (result) {
-                parent.$("#"+addressBoxIdName).val(result.detail.address);
-            }
+    function setSuggestion(index) {
+        // 点击输入提示后，于地图中用点标记绘制该地点，并显示信息窗体，包含其名称、地址等信息
+        infoWindowList.forEach((infoWindow) => {
+            infoWindow.close();
         });
-        var coord = new qq.maps.LatLng(lat, lng);
-        geocoder.getAddress(coord);
+        infoWindowList.length = 0;
+        document.getElementById('keyword').value = suggestionList[index].title;
+        document.getElementById('suggestionList').innerHTML = '';
+        markerLayer.setGeometries([]);
+        markerLayer.updateGeometries([
+            {
+                id: '0', // 点标注数据数组
+                position: suggestionList[index].location,
+            },
+        ]);
+        var infoWindow = new TMap.InfoWindow({
+            map: map,
+            position: suggestionList[index].location,
+            content: `<h3>${suggestionList[index].title}</h3><p>地址：${suggestionList[index].address}</p>`,
+            offset: { x: 0, y: -50 },
+        });
+        infoWindowList.push(infoWindow);
+        map.setCenter(suggestionList[index].location);
+        markerLayer.on('click', (e) => {
+            infoWindowList[Number(e.geometry.id)].open();
+        });
+    }
 
+
+    function getSuggestions() {
+        var areaName = document.getElementById('areaName').value;
+        if (!areaName) {
+            areaName = "怀化";
+        }
+        suggest = new TMap.service.Suggestion({
+            // 新建一个关键字输入提示类
+            pageSize: 30, // 返回结果每页条目数
+            region: areaName, // 限制城市范围
+            regionFix: true, // 搜索无结果时是否固定在当前城市
+        });
+        // 使用者在搜索框中输入文字时触发
+        var suggestionListContainer = document.getElementById('suggestionList');
+        suggestionListContainer.innerHTML = '';
+        var keyword = document.getElementById('keyword').value;
+        if (keyword) {
+            suggest
+                .getSuggestions({ keyword: keyword, location: map.getCenter() })
+                .then((result) => {
+                    // 以当前所输入关键字获取输入提示
+                    suggestionListContainer.innerHTML = '';
+                    suggestionList = result.data;
+                    suggestionList.forEach((item, index) => {
+                        suggestionListContainer.innerHTML += `<li><a onclick="setSuggestion(${index})">${item.title}<span class="item_info">${item.address}</span></a></li>`;
+                    });
+                })
+                .catch((error) => {
+                    console.log(error);
+                });
+        }
     }
 </script>
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
index fde86dea..ca7e6e5b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
@@ -406,7 +406,7 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['reshipAddress']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-5">
-                                                <input type="text" name="reshipAddress" value="{{d.data.configs['reshipAddress']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="退货地址" class="layui-input">
+                                                <input type="text" id="reshipAddress"  name="reshipAddress" value="{{d.data.configs['reshipAddress']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="退货地址" class="layui-input">
                                             </div>
                                             <div class="layui-form-mid layui-word-aux">商家的详细地址</div>
                                         </div>
@@ -1332,7 +1332,7 @@
                     let data = {
                         oldData: oldData,
                         coordinateBoxIdName: 'coordinateBox',
-                        addressBoxIdName: 'addressBox'
+                        addressBoxIdName: 'reshipAddress'
                     }
 
                     admin.popup({
