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 = [];

src/components/scenicSpot/domesticScenicSpotInfoManage.vue

 <style>
-.scenicSpotInfoManage .imgtag{
+.domesticScenic .imgtag{
  height: 40px;
  color: #000;
 } 
-  .scenicSpotInfoManage .resourceImgAdd {
+  .domesticScenic .resourceImgAdd {
     width: 620px;
     margin: auto;
   }
 
-  .scenicSpotInfoManage .clearfix:after {
+  .domesticScenic .clearfix:after {
     content: "\0020";
     display: block;
     height: 0;
     clear: both;
   }
 
-  .scenicSpotInfoManage .resource-content {
+  .domesticScenic .resource-content {
     width: 100%;
     margin-top: 30px;
     font-size: 12px;
     min-width: 1200px;
   }
 
-  .scenicSpotInfoManage .resource-baseinfo {
+  .domesticScenic .resource-baseinfo {
     float: left;
     height: auto;
     width: 600px;
     margin: 0 0 20px 30px;
   }
 
-  .scenicSpotInfoManage .resource-imginfo {
+  .domesticScenic .resource-imginfo {
     float: left;
     width: 510px;
     margin-top: 35px;
   }
-
-  .scenicSpotInfoManage .resource-lititle {
+/* .domesticScenic .open-time {
+    float: left;
+    min-height: 100vh;
+    background-color: #000;
+    margin-top: 35px;
+  } */
+  .domesticScenic .resource-lititle {
     display: block;
     border-left: 4px solid #e95252;
     padding-left: 10px;
     margin-bottom: 20px;
   }
 
-  .scenicSpotInfoManage .resource-baseinfo span {
+  .domesticScenic .resource-baseinfo span {
     display: inline-block;
   }
 
-  .scenicSpotInfoManage .resource-name {
+  .domesticScenic .resource-name {
     width: 300px;
     height: 34px;
     background: rgba(255, 255, 255, 1);
@@ -56,18 +61,18 @@
     padding-left: 10px;
   }
 
-  .scenicSpotInfoManage .common-lefttit {
+  .domesticScenic .common-lefttit {
     width: 80px;
     text-align: right;
     margin: 0 7px 0 8px;
     display: inline-block;
   }
 
-  .scenicSpotInfoManage .resource-net {
+  .domesticScenic .resource-net {
     position: relative;
   }
 
-  .scenicSpotInfoManage .resource-http {
+  .domesticScenic .resource-http {
     position: absolute;
     color: #999999;
     width: 70px !important;
@@ -83,22 +88,22 @@
     text-align: center;
   }
 
-  .scenicSpotInfoManage .R1 {
+  .domesticScenic .R1 {
     width: 300px;
     padding: 0 15px 0 80px;
     transition: all 0.3s ease-in-out;
   }
 
-  .scenicSpotInfoManage .areaInput {
+  .domesticScenic .areaInput {
     width: 300px;
     padding-right: 120px;
   }
 
-  .scenicSpotInfoManage .areaInput:focus {
+  .domesticScenic .areaInput:focus {
     border: 1px solid #e95252;
   }
 
-  .scenicSpotInfoManage .map-icon {
+  .domesticScenic .map-icon {
     position: absolute;
     right: 1px;
     top: 1px;
@@ -115,13 +120,13 @@
     background-color: #f5f7fa;
   }
 
-  .scenicSpotInfoManage .map-icon i {
+  .domesticScenic .map-icon i {
     margin: 0 5px;
     position: relative;
     top: 1px;
   }
 
-  .scenicSpotInfoManage .save-Btn {
+  .domesticScenic .save-Btn {
     width: 90px;
     height: 30px;
     background: rgba(233, 82, 82, 1);
@@ -132,12 +137,12 @@
     margin-right: 20px;
   }
 
-  .scenicSpotInfoManage .cancel-Btn,
+  .domesticScenic .cancel-Btn,
   .save-Btn:hover {
     opacity: 0.8;
   }
 
-  .scenicSpotInfoManage .cancel-Btn {
+  .domesticScenic .cancel-Btn {
     width: 90px;
     height: 30px;
     background: rgba(255, 255, 255, 1);
@@ -148,7 +153,7 @@
     border: 1px solid #e95252;
   }
 
-  .scenicSpotInfoManage .re-img {
+  .domesticScenic .re-img {
     width: 140px;
     height: 93px;
     border-radius: 10px;
@@ -157,27 +162,27 @@
     position: relative;
   }
 
-  .scenicSpotInfoManage .re-img:first-child {
+  .domesticScenic .re-img:first-child {
     margin-left: 0;
   }
 
-  .scenicSpotInfoManage .resource-imglist {
+  .domesticScenic .resource-imglist {
     width: 100%;
     height: auto;
     margin-top: 20px;
   }
 
-  .scenicSpotInfoManage .resource-imglist img {
+  .domesticScenic .resource-imglist img {
     width: 100%;
     height: 100%;
     border-radius: 10px;
   }
 
-  .scenicSpotInfoManage .add-img {
+  .domesticScenic .add-img {
     margin-top: 20px;
   }
 
-  .scenicSpotInfoManage .reimg-add {
+  .domesticScenic .reimg-add {
     width: 140px;
     height: 93px;
     background: rgba(236, 236, 236, 1);
@@ -186,7 +191,7 @@
     cursor: pointer;
   }
 
-  .scenicSpotInfoManage .ad-one {
+  .domesticScenic .ad-one {
     display: none;
     background: rgba(0, 0, 0, 0.4);
     width: 100%;
@@ -197,7 +202,7 @@
     z-index: 999;
   }
 
-  .scenicSpotInfoManage .bigAdd {
+  .domesticScenic .bigAdd {
     font-size: 50px;
     color: #d1d1d1;
     position: absolute;
@@ -205,7 +210,7 @@
     top: 10px;
   }
 
-  .scenicSpotInfoManage .imgzhe {
+  .domesticScenic .imgzhe {
     display: none;
     background: rgba(0, 0, 0, 0.4);
     width: 100%;
@@ -217,15 +222,15 @@
     top: 0;
   }
 
-  .scenicSpotInfoManage .reimg-add:hover .ad-one {
+  .domesticScenic .reimg-add:hover .ad-one {
     display: block;
   }
 
-  .scenicSpotInfoManage .re-img:hover .imgzhe {
+  .domesticScenic .re-img:hover .imgzhe {
     display: block;
   }
 
-  .scenicSpotInfoManage .ad-one div {
+  .domesticScenic .ad-one div {
     width: 32px;
     height: 32px;
     border-radius: 50%;
@@ -235,41 +240,41 @@
     color: #fff;
   }
 
-  .scenicSpotInfoManage .ad-one div:hover {
+  .domesticScenic .ad-one div:hover {
     background-color: #fff;
     color: #e95252;
   }
 
-  .scenicSpotInfoManage .re-upload {
+  .domesticScenic .re-upload {
     position: absolute;
     top: 30px;
     left: 30px;
   }
 
-  .scenicSpotInfoManage .re-find {
+  .domesticScenic .re-find {
     position: absolute;
     top: 30px;
     right: 30px;
   }
 
-  .scenicSpotInfoManage .search-imgicon {
+  .domesticScenic .search-imgicon {
     padding-right: 20px;
     margin-left: -40px;
   }
 
-  .scenicSpotInfoManage .resAddImg {
+  .domesticScenic .resAddImg {
     width: 520px;
     padding-right: 45px;
   }
 
-  .scenicSpotInfoManage .addimgContent {
+  .domesticScenic .addimgContent {
     height: 290px;
     overflow: auto;
     margin: 30px 0 30px 25px;
     width: 545px;
   }
 
-  .scenicSpotInfoManage .addimgDiv {
+  .domesticScenic .addimgDiv {
     width: 160px;
     height: 155px;
     float: left;
@@ -277,7 +282,7 @@
     overflow: hidden;
   }
 
-  .scenicSpotInfoManage .addimgContent div:first-child {
+  .domesticScenic .addimgContent div:first-child {
     margin-left: 0;
   }
 
@@ -285,19 +290,19 @@
     margin-right: 0;
   }
 
-  .scenicSpotInfoManage .itemImgdiv {
+  .domesticScenic .itemImgdiv {
     width: 160px;
     height: 106px;
     position: relative;
   }
 
-  .scenicSpotInfoManage .itemImgdiv img {
+  .domesticScenic .itemImgdiv img {
     width: 100%;
     height: 100%;
     border-radius: 10px;
   }
 
-  .scenicSpotInfoManage .imgseclet {
+  .domesticScenic .imgseclet {
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.4);
@@ -313,33 +318,33 @@
     font-size: 25px;
   }
 
-  .scenicSpotInfoManage .test-1::-webkit-scrollbar {
+  .domesticScenic .test-1::-webkit-scrollbar {
     width: 0px;
     height: 0px;
     background-color: #f5f5f5;
   }
 
-  .scenicSpotInfoManage .test-1::-webkit-scrollbar-track {
+  .domesticScenic .test-1::-webkit-scrollbar-track {
     background-color: #f5f5f5;
   }
 
-  .scenicSpotInfoManage .test-1::-webkit-scrollbar-thumb {
+  .domesticScenic .test-1::-webkit-scrollbar-thumb {
     border-radius: 20px;
     background-color: #aaa;
     margin-bottom: 24px;
   }
 
-  .scenicSpotInfoManage .test-1:hover::-webkit-scrollbar {
+  .domesticScenic .test-1:hover::-webkit-scrollbar {
     width: 4px;
     height: 4px;
     background-color: #f5f5f5;
   }
 
-  .scenicSpotInfoManage .addimg-btnlist {
+  .domesticScenic .addimg-btnlist {
     text-align: center;
   }
 
-  .scenicSpotInfoManage .addimg-select {
+  .domesticScenic .addimg-select {
     font-size: 14px;
     color: #999999;
     float: right;
@@ -348,7 +353,7 @@
     bottom: 20px;
   }
 
-  .scenicSpotInfoManage .re-delte {
+  .domesticScenic .re-delte {
     width: 32px;
     height: 32px;
     background: gray;
@@ -360,12 +365,12 @@
     cursor: pointer;
   }
 
-  .scenicSpotInfoManage .re-delte:hover {
+  .domesticScenic .re-delte:hover {
     color: #e95252;
     background: #fff;
   }
 
-  .scenicSpotInfoManage .imgDescription {
+  .domesticScenic .imgDescription {
     font-size: 12px;
     margin-top: 12px;
     color: #333333;
@@ -378,102 +383,102 @@
     -webkit-box-orient: vertical;
   }
 
-  .scenicSpotInfoManage .el-upload-dragger {
+  .domesticScenic .el-upload-dragger {
     border: none;
   }
 
-  .scenicSpotInfoManage .res-span span:last-child {
+  .domesticScenic .res-span span:last-child {
     display: inline;
   }
 
-  .scenicSpotInfoManage .resourcerightTop span {
+  .domesticScenic .resourcerightTop span {
     display: inline-block;
   }
 
-  .scenicSpotInfoManage .sheshi {
+  .domesticScenic .sheshi {
     margin-bottom: 20px;
   }
 
-  .scenicSpotInfoManage .dialog-footer {
+  .domesticScenic .dialog-footer {
     padding-bottom: 30px;
   }
 
-  .scenicSpotInfoManage .btn-list {
+  .domesticScenic .btn-list {
     margin: 0 0 40px 30px;
   }
 
-  .scenicSpotInfoManage .input-with-select .el-input-group__prepend {
+  .domesticScenic .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
 
-  .scenicSpotInfoManage .el-textarea__inner {
+  .domesticScenic .el-textarea__inner {
     resize: none;
     height: 120px;
     font-family: "微软雅黑";
   }
 
-  .scenicSpotInfoManage .R1:focus {
+  .domesticScenic .R1:focus {
     border: 1px solid #e95252;
   }
 
-  .scenicSpotInfoManage .el-form-item__label {
+  .domesticScenic .el-form-item__label {
     width: 96px;
     font-size: 12px;
   }
 
-  .scenicSpotInfoManage .el-form-item__error {
+  .domesticScenic .el-form-item__error {
     left: 100px;
   }
 
-  .scenicSpotInfoManage .hotelDay {
+  .domesticScenic .hotelDay {
     margin-left: 10px;
   }
 
-  .scenicSpotInfoManage .searchImgIcon {
+  .domesticScenic .searchImgIcon {
     cursor: pointer;
   }
 
-  .scenicSpotInfoManage .el-dialog--center .el-dialog__body {
+  .domesticScenic .el-dialog--center .el-dialog__body {
     padding: 25px 25px 0;
   }
 
-  .scenicSpotInfoManage .addressInput .el-input-group__append {
+  .domesticScenic .addressInput .el-input-group__append {
     border-top-right-radius: 17px;
     border-bottom-right-radius: 17px;
   }
 
-  .scenicSpotInfoManage ::-webkit-input-placeholder {
+  .domesticScenic ::-webkit-input-placeholder {
     color: #d1d1d1;
   }
 
-  .scenicSpotInfoManage :-moz-placeholder {
+  .domesticScenic :-moz-placeholder {
     color: #d1d1d1;
   }
 
-  .scenicSpotInfoManage ::-moz-placeholder {
+  .domesticScenic ::-moz-placeholder {
     color: #d1d1d1;
   }
 
-  .scenicSpotInfoManage :-ms-input-placeholder {
+  .domesticScenic :-ms-input-placeholder {
     color: #d1d1d1;
   }
 
-  .scenicSpotInfoManage .el-switch.is-checked .el-switch__core {
+  .domesticScenic .el-switch.is-checked .el-switch__core {
     border-color: #4bca81;
     background-color: #4bca81;
   }
 
-  .scenicSpotInfoManage .orderAdd {
+  .domesticScenic .orderAdd {
     position: relative;
     width: 340px;
   }
 
-  .scenicSpotInfoManage .minus:hover {
+  .domesticScenic .minus:hover {
     background-color: #cccccc;
     cursor: pointer;
   }
 
-  .scenicSpotInfoManage .minus {
+  .domesticScenic .minus {
     width: 34px;
     height: 32px;
     border: #dcdfe6;
@@ -488,7 +493,7 @@
     background-color: #dcdfe6;
   }
 
-  .scenicSpotInfoManage .addPeople {
+  .domesticScenic .addPeople {
     width: 34px;
     height: 32px;
     top: 4px;
@@ -502,22 +507,22 @@
     z-index: 999;
   }
 
-  .scenicSpotInfoManage .addPeople:hover {
+  .domesticScenic .addPeople:hover {
     background-color: #cccccc;
     cursor: pointer;
   }
 
-  .scenicSpotInfoManage .orderAdd .el-input__inner {
+  .domesticScenic .orderAdd .el-input__inner {
     padding-left: 90px;
   }
 
-  .scenicSpotInfoManage .littleadd {
+  .domesticScenic .littleadd {
     font-size: 12px !important;
     color: #fff;
     display: inline-block;
   }
 
-  .scenicSpotInfoManage .footabs {
+  .domesticScenic .footabs {
     width: 300px;
     min-height: 34px;
     border: 1px solid #d1d1d1;
@@ -529,7 +534,7 @@
     flex-wrap: wrap;
   }
 
-  .scenicSpotInfoManage .foodtips {
+  .domesticScenic .foodtips {
     display: inline-block;
     padding: 3px 5px;
     background-color: #efefef;
@@ -537,22 +542,22 @@
     position: relative;
   }
 
-  .scenicSpotInfoManage .toolOne {
+  .domesticScenic .toolOne {
     margin: 0 0 28px 38px;
     display: flex;
   }
 
-  .scenicSpotInfoManage .foodTipsDiv {
+  .domesticScenic .foodTipsDiv {
     max-width: 200px;
     display: inline;
   }
 
-  .scenicSpotInfoManage .wInput {
+  .domesticScenic .wInput {
     border: none;
     height: 30px;
   }
 
-  .scenicSpotInfoManage .wInput .el-input__inner {
+  .domesticScenic .wInput .el-input__inner {
     border: none !important;
     height: 28px;
     padding: 0;
@@ -560,7 +565,7 @@
     margin-top: 2px;
   }
 
-  .scenicSpotInfoManage .delTips {
+  .domesticScenic .delTips {
     position: absolute;
     right: -5px;
     top: -5px;
@@ -569,68 +574,68 @@
     font-size: 14px;
   }
 
-  .scenicSpotInfoManage .delTips:hover {
+  .domesticScenic .delTips:hover {
     color: #e95252;
   }
 
-  .scenicSpotInfoManage .fanyong {
+  .domesticScenic .fanyong {
     font-size: 12px;
     color: #666666;
     margin-right: 10px;
   }
 
-  .scenicSpotInfoManage .footabs .el-tag {
+  .domesticScenic .footabs .el-tag {
     margin: 0 5px 5px 0;
   }
 
-  .scenicSpotInfoManage .footabs .el-input__inner {
+  .domesticScenic .footabs .el-input__inner {
     height: 30px;
     position: relative;
   }
 
-  .scenicSpotInfoManage .button-new-tag {
+  .domesticScenic .button-new-tag {
     height: 30px;
     line-height: 30px;
     padding-top: 0;
     padding-bottom: 0;
   }
 
-  .scenicSpotInfoManage .input-new-tag {
+  .domesticScenic .input-new-tag {
     width: 90px;
     margin-left: 10px;
     vertical-align: bottom;
   }
 
-  .scenicSpotInfoManage .el-dialog--center .el-dialog__body {
+  .domesticScenic .el-dialog--center .el-dialog__body {
     padding: 15px 25px 0 !important;
   }
 
-  .scenicSpotInfoManage .mapList {
+  .domesticScenic .mapList {
     width: 850px !important;
     /* height: 510px !important; */
   }
 
-  .scenicSpotInfoManage .fanbili {
+  .domesticScenic .fanbili {
     margin-top: 8px;
   }
 
-  .scenicSpotInfoManage .RabateDiv {
+  .domesticScenic .RabateDiv {
     margin-left: 10px;
   }
 
-  .scenicSpotInfoManage .RebateCount {
+  .domesticScenic .RebateCount {
     height: 34px;
     border-radius: 17px;
     float: left;
   }
 
-  .scenicSpotInfoManage .reOne,
-  .scenicSpotInfoManage .reTwo,
-  .scenicSpotInfoManage .dayNum {
+  .domesticScenic .reOne,
+  .domesticScenic .reTwo,
+  .domesticScenic .dayNum {
     position: relative;
   }
 
-  .scenicSpotInfoManage .leftPnum {
+  .domesticScenic .leftPnum {
     float: left;
     width: 50px;
     height: 32px;
@@ -644,26 +649,26 @@
     border-bottom-left-radius: 17px;
   }
 
-  .scenicSpotInfoManage .toolInput {
+  .domesticScenic .toolInput {
     height: 34px;
     padding-left: 5px;
     border: none;
   }
 
-  .scenicSpotInfoManage .inpuOne {
+  .domesticScenic .inpuOne {
     width: 135px;
     padding-left: 55px;
     border: 1px solid #d1d1d1;
     border-right: none;
   }
 
-  .scenicSpotInfoManage .inpuTwo {
+  .domesticScenic .inpuTwo {
     width: 166px;
     padding: 0 45px 0 55px;
     border: 1px solid #d1d1d1;
   }
 
-  .scenicSpotInfoManage .percentCon {
+  .domesticScenic .percentCon {
     float: right;
     width: 40px;
     height: 32px;
@@ -677,7 +682,7 @@
     top: 1px;
   }
 
-  .scenicSpotInfoManage .fanNum {
+  .domesticScenic .fanNum {
     float: left;
     width: 50px;
     height: 32px;
@@ -689,26 +694,26 @@
     top: 1px;
   }
 
-  .scenicSpotInfoManage .fdTag {
+  .domesticScenic .fdTag {
     margin-top: 13px;
   }
 
-  .scenicSpotInfoManage .addAddress .el-input__inner {
+  .domesticScenic .addAddress .el-input__inner {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border: 1px solid #d1d1d1 !important;
   }
 
-  .scenicSpotInfoManage .el-input-group__append {
+  .domesticScenic .el-input-group__append {
     border-top-right-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
   }
-.scenicSpotInfoManage #imageUploader{
+.domesticScenic #imageUploader{
     display: none !important;
 }
 </style>
 <template>
-  <div class="flexOne scenicSpotInfoManage">
+  <div class="flexOne domesticScenic">
     <div class="resource-content clearfix">
       <el-form :model="addMsg" :rules="rules" ref="addMsg">
         <div class="resource-baseinfo">
@@ -1085,6 +1090,7 @@
             </div>
           </div>
         </div>
+        <!-- <div class="open-time"></div> -->
       </el-form>
     </div>
     <el-dialog custom-class="resourceImgAdd" title="添加图片" center :visible.sync="addimg">
@@ -1111,7 +1117,7 @@
   // import googleMap from "../commonPage/googleMap.vue";
   import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
   import MyEdit from "@/components/EditTemplate.vue";
-   import tencentMap from "../commonPage/tencentMap.vue";
+  import tencentMap from "../commonPage/tencentMap.vue";
   export default {
     data() {
       return {