diff --git a/js/public.js b/js/public.js
index 6ddfd47..fdfd9c3 100644
--- a/js/public.js
+++ b/js/public.js
@@ -23,6 +23,14 @@ $(function(){
 function cancelVoice(){
   $(".voicePanel").removeClass("active");
 }
+
+// 语音，点击确定
+function sureVoice(){
+  var name = "洞朗";
+  $(".fixed-left").addClass("collpased").css({left:"0px"});
+  window.initial && window.initial(name);
+  cancelVoice();
+}
 // ajax请求
 function ajax(mJson)
 {
diff --git a/map.html b/map.html
index 6ca4afe..144c017 100755
--- a/map.html
+++ b/map.html
@@ -19,7 +19,7 @@
             <img src="./image/voice.gif" alt="" width="100px"/>
             <p class="voice-btn">
                 <a href="javascript:void(0)" onclick="cancelVoice();">取消</a>
-                <a href="./machine.html?params=true" >确定</a>
+                <a href="javascript:void(0)" onclick="sureVoice();">确定</a>
             </p>
         </div>
     </div>
@@ -44,13 +44,13 @@
         </div>
         <ul class="user_info">
             <span class="search-Panel">
-                <input class="search-input-item prov" placeholder="请输入地点" />
+                <input class="search-input-item prov" placeholder="请输入关键字" />
                 <input onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" class="search-input-item lon" placeholder="经度" />
                 <input onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" class="search-input-item lon" placeholder="纬度" />
                 <div class="show_detail ml10">
                     <i class="iconfont icon-search"></i>
                     <ul class="detail_info">
-                        <li class="info_txt" data-key="prov">地点</li>
+                        <li class="info_txt" data-key="prov">关键字</li>
                         <li class="info_txt" data-key="lon">经纬度</li>
                         <li class="info_txt" data-key="voice">语音</li>
                     </ul>
@@ -128,16 +128,17 @@
   <script type="text/javascript" src="./js/demo.js"></script>
   <script>
     
+    
     $(document).ready(function () {
         //回车
         $(document).keydown(function(event)
         {
-        if(event.keyCode==13 && $(".search-input-item.prov").is(":focus"))
-        {
-            var name = $(".search-input-item.prov").val();
-            $(".fixed-left").addClass("collpased").css({left:"0px"});
-            init(name);
-        }
+            if(event.keyCode==13 && $(".search-input-item.prov").is(":focus"))
+            {
+                var name = $(".search-input-item.prov").val();
+                $(".fixed-left").addClass("collpased").css({left:"0px"});
+                init(name);
+            }
         });
       var graphContainer = document.getElementById('mainGraph');
       var myChartGraph = echarts.init(graphContainer);