Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/guangdongVR_museum

backstage/src/pages/content/museum/componets/detail.vue

@@ -49,7 +49,7 @@
 
         <el-form-item label="纬度：" prop="lng">
           <el-input
-            :onkeyup="(form.lat = form.lat.replace(/^(0+)|[^\d\.]+/g, ''))"
+            :onkeyup="(form.lng = form.lng.replace(/^(0+)|[^\d\.]+/g, ''))"
             v-model="form.lng"
             maxlength="20"
             show-word-limit

backstage/src/pages/content/museum/index.vue

@@ -11,7 +11,7 @@
           <div slot="content" class="searchslot">
             <span>博物馆名称：</span>
             <el-input class="elInput paddingmore" :maxlength="25" show-word-limit v-model="search.inputKey"
-              @keydown.enter.native="getList" placeholder="请输入场景名称"></el-input>
+              @keydown.enter.native="getList" placeholder="请输入博物馆名称"></el-input>
             <el-button @click="getList" type="primary">查询</el-button>
             <el-button @click="
               search = {