Merge branch 'master' into lwh/head-distribution

server/config.js

@@ -10,8 +10,8 @@ const PANDORA_URI = {
 };
 
 const API_INTERNAL_URI = {
-  development: "http://bp-dev.ini.yidian-inc.com",
-  test: "http://bp-test.ini.yidian-inc.com",
+  test: "http://bp-dev.ini.yidian-inc.com",
+  development: "http://bp-test.ini.yidian-inc.com",
   production: "http://bp.int.yidian-inc.com"
 };
 

src/pages/Activity/ActivityDetail/index.vue

@@ -50,8 +50,8 @@
             </p>
             <p class="endTime">{{ showTimer }}</p>
           </div>
-          <p class="title">拼单商品</p>
-          <div class="images-wrapper">
+          <!-- <p class="title">拼单商品</p> -->
+          <!-- <div class="images-wrapper">
             <div
               class="image-block"
               v-for="picItem in goodsList"
@@ -65,7 +65,7 @@
               ></el-image>
               <span class="goodsPrice">{{ `¥${picItem.price}` }}</span>
             </div>
-          </div>
+          </div> -->
         </el-card>
         <!-- 商品描述 -->
         <el-card class="activityIntroduce box-card">
@@ -100,8 +100,11 @@
                 <span class="originPrice">{{
                   `¥${goodsItem.original_price} `
                 }}</span>
-                <span class="sold" v-if="goodsItem.inventory_rest==0">抢光了</span>
-                <span class="sold" v-else>已售{{ goodsItem.all_have_buy_goods_count }}</span
+                <span class="sold" v-if="goodsItem.inventory_rest == 0"
+                  >抢光了</span
+                >
+                <span class="sold" v-else
+                  >已售{{ goodsItem.all_have_buy_goods_count }}</span
                 >
               </p>
             </div>
@@ -135,7 +138,7 @@ export default {
       marketingInfo: {},
       endTime: "",
       showTimer: "",
-      detailInfo: {},
+      detailInfo: {}
     };
   },
   watch: {},
@@ -147,11 +150,11 @@ export default {
         let dataArr = await Promise.all([
           ActivityService.checkActivityDetail({
             marketing_id: this.$route.query.marketing_id,
-            marketing_type: this.$route.query.marketing_type,
+            marketing_type: this.$route.query.marketing_type
           }),
           ActivityService.checkActivityDetailInfo({
-            marketing_id: this.$route.query.marketing_id,
-          }),
+            marketing_id: this.$route.query.marketing_id
+          })
         ]);
         this.pageLoading = false;
         this.goodsList = dataArr[0].result.goods_list;
@@ -203,7 +206,7 @@ export default {
 
     closePage() {
       this.$router.go(-1);
-    },
+    }
   },
   async created() {
     await this.checkActivityDetail();
@@ -211,7 +214,7 @@ export default {
   },
   beforeUnmount() {
     clearInterval(this.timer);
-  },
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -306,9 +309,9 @@ export default {
             }
           }
           .sold {
-            position:absolute;
-            right: 20px;;
-            color:#d44549;
+            position: absolute;
+            right: 20px;
+            color: #d44549;
             font-weight: 500;
           }
         }

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,6 +28,7 @@
     </div>
 
     <div class="mapInfo">
+      <div class="infoAll">
         <h3 class="title">拖拽选址</h3>
         <ul class="info">
           <li><span>经度：</span>{{ dragData.lng }}</li>
@@ -36,9 +37,16 @@
         </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">
       <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%;
@@ -229,6 +228,10 @@ export default {
     width: 20%;
     padding-left: 20px;
     display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: flex-start;
+    .infoAll {
       flex-direction: column;
       justify-content: start;
       align-items: flex-start;
@@ -237,9 +240,15 @@ export default {
       }
     }
     .confirmButton {
-    position: absolute;
-    bottom: 100px;
-    right: 100px;
+      display: flex;
+      flex-wrap: wrap;
+      .button_pre {
+        margin-right: 15px;
+      }
+      .button_next {
+        margin-left: 0;
+      }
+    }
   }
 }
 .m-map .search {

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

@@ -627,15 +627,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>