feat: 修改样式-不需要合并

src/pages/Activity/releaseProduc/components/myMap.vue

@@ -2,7 +2,7 @@
   <div id="map" class="mapContainer">
     <div class="mapWrapper">
       <div class="search">
-        <el-form ref="form" label-width="80px" @submit.prevent>
+        <el-form ref="form" @submit.prevent>
           <el-form-item label-position="left">
             <el-button @click="handleSearch">搜索</el-button>
             <el-input
@@ -28,17 +28,25 @@
     </div>
 
     <div class="mapInfo">
-      <h3 class="title">拖拽选址</h3>
-      <ul class="info">
-        <li><span>经度：</span>{{ dragData.lng }}</li>
-        <li><span>纬度：</span>{{ dragData.lat }}</li>
-        <li><span>地址：</span>{{ dragData.address }}</li>
-      </ul>
+      <div class="infoAll">
+        <h3 class="title">拖拽选址</h3>
+        <ul class="info">
+          <li><span>经度：</span>{{ dragData.lng }}</li>
+          <li><span>纬度：</span>{{ dragData.lat }}</li>
+          <li><span>地址：</span>{{ dragData.address }}</li>
+        </ul>
+      </div>
+      <div class="confirmButton">
+        <el-button class="button_pre" @click="cancel">取 消</el-button>
+        <el-button class="button_next" type="primary" @click="confirm"
+          >确 定</el-button
+        >
+      </div>
     </div>
-    <div class="confirmButton">
+    <!-- <div class="confirmButton">
       <el-button @click="cancel">取 消</el-button>
       <el-button type="primary" @click="confirm">确 定</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -193,15 +201,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-// .mapDialog {
-//   margin-top: 11vh !important;
-//   display: flex !important;
-//   flex-direction: column !important;
-//   background: red !important;
-//   /deep/ .el-dialog__body {
-//     height: 90%;
-//   }
-// }
 .mapContainer {
   height: 100%;
   width: 100%;
@@ -230,16 +229,26 @@ export default {
     padding-left: 20px;
     display: flex;
     flex-direction: column;
-    justify-content: start;
+    justify-content: space-between;
     align-items: flex-start;
-    .info {
-      text-align: left;
+    .infoAll {
+      flex-direction: column;
+      justify-content: start;
+      align-items: flex-start;
+      .info {
+        text-align: left;
+      }
+    }
+    .confirmButton {
+      display: flex;
+      flex-wrap: wrap;
+      .button_pre {
+        margin-right: 15px;
+      }
+      .button_next {
+        margin-left: 0;
+      }
     }
-  }
-  .confirmButton {
-    position: absolute;
-    bottom: 100px;
-    right: 100px;
   }
 }
 .m-map .search {

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -626,15 +626,16 @@ export default {
   justify-content: center;
   align-items: center;
 }
-.mapDialog {
-  height: 80%;
-  margin-top: 10vh !important;
-
-  .my-map {
-    height: 100%;
-  }
-}
 /deep/ .el-dialog__body {
   height: 85% !important;
 }
+/deep/ .mapDialog {
+  margin-top: 10vh !important;
+  height: 80%;
+  display: flex !important;
+  flex-direction: column !important;
+  /deep/ .el-dialog__body {
+    height: 90%;
+  }
+}
 </style>

src/pages/Activity/releaseProduc/index.vue

@@ -70,7 +70,7 @@ export default {
   },
   data() {
     return {
-      active: 1, // 步骤条状态
+      active: 3, // 步骤条状态
       infoEditArr: [], // 信息编辑数据
       addProducArr: [], // 添加商品
       goodsSkuIDArr: [], // 接收goods_sku_id