Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Restaurant/demesticRestaurantInfoManage.vue

@@ -668,7 +668,7 @@
 
 .restaurantInfo .mapList {
   width: 850px !important;
-  height: 510px !important;
+  /* height: 510px !important; */
 }
 
 .restaurantInfo .addAddress .el-input__inner {
@@ -843,6 +843,19 @@
               ></el-button>
             </el-input>
           </el-form-item>
+          <div class="toolOne">
+            <span class="fanbili">地理位置</span>
+            <div class="RabateDiv clearfix">
+              <div class="RebateCount reOne">
+                <div class="leftPnum">经度</div>
+                <input type="text" class="toolInput inpuOne" v-model="addMsg.Lng" maxlength="20">
+              </div>
+              <div class="RebateCount reTwo">
+                <div class="fanNum">纬度</div>
+                <input type="text" class="toolInput inpuTwo" v-model="addMsg.Lat" maxlength="20">
+              </div>
+            </div>
+          </div>
           <!-- 营业时间 -->
           <el-form-item
             :label="$t('restaurant.res_BusinessHours') + (index + 1)"
@@ -1413,11 +1426,12 @@
       center
       :visible.sync="selectAddress"
     >
-      <googleMap
+      <!-- <googleMap
         @refList="googleMap"
         v-on:headCallBack="headCall"
         v-bind:address="addMsg.Address"
-      ></googleMap>
+      ></googleMap> -->
+       <tencentMap @map-submit="mapEvent" :address="addMsg.Address"></tencentMap>
     </el-dialog>
 
     <div class="btn-list">
@@ -1455,8 +1469,9 @@
 </template>
 <script>
 import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
-import googleMap from "../commonPage/googleMap.vue";
+// import googleMap from "../commonPage/googleMap.vue";
 // import comImgList from "../commonPage/comImgList.vue";
+import tencentMap from "../commonPage/tencentMap.vue";
 export default {
   data() {
     return {
@@ -1648,11 +1663,18 @@ export default {
     };
   },
   components: {
-    googleMap: googleMap,
+    // googleMap: googleMap,
     DMCchooseImg: DMCchooseImg,
-    // comImgList
+    // comImgList,
+    tencentMap
   },
   methods: {
+      //得到地图信息
+      mapEvent(e) {
+        this.addMsg.Lat = e.lat;
+        this.addMsg.Lng = e.long;
+        this.selectAddress = false;
+      },
     //上传餐厅图片
     UploadImage(file) {
       let newArr = [];