feat: fix-dom

src/pages/Activity/ActivityDetail/index.vue

@@ -96,6 +96,15 @@
         </el-card>
       </section>
     </div>
+    <div class="button-close">
+      <el-button
+        class="button-block"
+        size="medium"
+        type="primary"
+        @click="closePage"
+        >关 闭</el-button
+      >
+    </div>
   </div>
 </template>
 
@@ -171,6 +180,8 @@ export default {
         this.showTimer = "已结束";
       }
     },
+
+    // 定时器
     myTimer() {
       let dateNow = dayJs();
       this.timer = setInterval(() => {
@@ -181,6 +192,10 @@ export default {
           clearInterval(this.timer);
         }
       }, 1000);
+    },
+
+    closePage() {
+      this.$router.go(-1);
     }
   },
   async created() {
@@ -196,6 +211,7 @@ export default {
 .wrapper {
   height: 100%;
   display: flex;
+  overflow-y: scroll;
   flex-direction: column;
   justify-content: flex-start;
   align-items: center;
@@ -287,5 +303,11 @@ export default {
       }
     }
   }
+  .button-close {
+    margin: 10px 0 30px;
+    .button-block {
+      width: 200px;
+    }
+  }
 }
 </style>

src/pages/Activity/Manage/index.vue

@@ -255,7 +255,6 @@ export default {
 
     // 点击活动标题
     async handleHeadline(val) {
-      console.log(val);
       this.$router.push({
         name: "ActivityDetail",
         query: {

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

@@ -9,8 +9,15 @@
             class="dialog-input"
             v-model="searchKey"
             placeholder="请输入关键字"
-            autocomplete="off"
-          ></el-input>
+            autocomplete="on"
+          >
+            <template #suffix>
+              <i
+                @click="searchKey = ''"
+                class="el-input__icon el-icon-close"
+              ></i>
+            </template>
+          </el-input>
         </el-form-item>
 
         <div id="js-result" v-show="searchKey" class="result"></div>
@@ -20,13 +27,7 @@
       </div>
     </div>
     <!-- info -->
-
     <div class="mapInfo">
-      <!-- <div class="search" v-if="placeSearch">
-        <input type="text" placeholder="请输入关键字" v-model="searchKey" />
-        <button type="button" @click="handleSearch">搜索</button>
-        <div id="js-result" v-show="searchKey" class="result"></div>
-      </div> -->
       <h3 class="title">拖拽选址</h3>
       <ul class="info">
         <li><span>经度：</span>{{ dragData.lng }}</li>
@@ -144,18 +145,19 @@ export default {
         // 创建地图拖拽
         let positionPicker = new PositionPicker({
           mode: "dragMap", // 设定为拖拽地图模式，可选'dragMap'、'dragMarker'，默认为'dragMap'
-          map: map // 依赖地图对象
+          map: map, // 依赖地图对象
+          iconStyle: {
+            //自定义外观
+            url: "//webapi.amap.com/ui/1.0/assets/position-picker2.png", //图片地址
+            size: [50, 50], //要显示的点大小，将缩放图片
+            ancher: [24, 40] //锚点的位置，即被size缩放之后，图片的什么位置作为选中的位置
+          }
         });
 
         // 拖拽完成发送自定义 drag 事件
         positionPicker.on("success", positionResult => {
-          // 过滤掉初始化地图后的第一次默认拖放
-          if (!this.dragStatus) {
-            this.dragStatus = true;
-          } else {
           this.dragMap(positionResult);
           that.$emit("getMapInfo", this.dragData);
-          }
         });
         // 启动拖放
         positionPicker.start();
@@ -228,66 +230,4 @@ export default {
   padding: 5px;
   outline: none;
 }
-
-// .g-wraper {
-//   width: 1000px;
-//   margin: 0 auto;
-//   color: #666;
-//   font-size: 16px;
-//   line-height: 30px;
-// }
-// .m-part {
-//   margin-bottom: 30px;
-// }
-// .m-part::after {
-//   content: "";
-//   display: block;
-//   clear: both;
-// }
-// .m-part .title {
-//   font-size: 30px;
-//   line-height: 60px;
-//   margin-bottom: 10px;
-//   color: #333;
-// }
-// .m-part .mapbox {
-//   width: 600px;
-//   height: 400px;
-//   margin-bottom: 20px;
-//   float: left;
-// }
-// .m-part .info {
-//   margin: 0;
-//   padding: 0;
-//   list-style: none;
-//   line-height: 30px;
-//   margin-left: 620px;
-// }
-// .m-part .info span {
-//   display: block;
-//   color: #999;
-// }
-// .m-part ol {
-//   line-height: 40px;
-//   margin-left: 0;
-//   padding-left: 0;
-// }
-// .m-part pre {
-//   padding: 10px 20px;
-//   line-height: 30px;
-//   border-radius: 3px;
-//   box-shadow: 0 0 15px rgba(0, 0, 0, 0.5);
-// }
-// .m-footer {
-//   background: #eee;
-//   line-height: 60px;
-//   text-align: center;
-//   color: #999;
-//   font-size: 12px;
-// }
-// .m-footer a {
-//   margin: 0 5px;
-//   color: #999;
-//   text-decoration: none;
-// }
 </style>

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

@@ -35,7 +35,7 @@
     >
       <el-card class="card-block">
         <p>自提点设置</p>
-        <el-form ref="form" :model="selfLiftingPoint" label-width="80px">
+        <el-form ref="form" label-width="80px">
           <el-form-item>
             <el-input
               class="set"
@@ -166,11 +166,8 @@
             placeholder=""
             :disabled="true"
           ></el-input>
-          <a
-            href="javascript:;"
-            style="margin-left: 30px"
-            @click="mapDialogVisible = true"
-            >从高德获取坐标</a
+          <el-button type="primary" @click="mapDialogVisible = true"
+            >从高德获取坐标</el-button
           >
         </el-form-item>
         <p class="location">{{ form.location }}</p>
@@ -242,8 +239,10 @@ let checkphone = (rule, value, callback) => {
 export default {
   data() {
     return {
-      startDate: dayJs(), //开始时间
-      endDate: dayJs().add(7, "day"), // 结束时间
+      startDate: dayJs().format("YYYY-MM-DDTHH:mm:ss"), //开始时间
+      endDate: dayJs()
+        .add(7, "day")
+        .format("YYYY-MM-DDTHH:mm:ss"), // 结束时间
       pickerOptions: {
         disabledDateStart(time) {
           let _now = Date.now();
@@ -311,11 +310,11 @@ export default {
       type: Array,
       default: () => []
     },
-    startTime1: {
+    startTime: {
       type: String,
       default: ""
     },
-    endTime1: {
+    endTime: {
       type: String,
       default: ""
     }
@@ -334,8 +333,8 @@ export default {
         if (this.$route.query.marketing_id) {
           await this.getPlaceList();
           // 时间赋值
-          this.startDate = this.startTime1;
-          this.endDate = this.endTime1;
+          this.startDate = this.startTime;
+          this.endDate = this.endTime;
           this.checkedTakePlacelist = this.setTableListData(
             this.spellOrderSetArr
           ); // 选中的自提点列表

src/pages/Activity/releaseProduc/index.vue

@@ -28,8 +28,8 @@
         ref="spellOrderSet"
         v-show="active === 3"
         :spellOrderSetArr="spellOrderSetArr"
-        :startTime1="startTime"
-        :endTime1="endTime"
+        :startTime="startTime"
+        :endTime="endTime"
         @getTakeTakePlaceListFromChild="getTakeTakePlaceListFromChild"
       />
     </div>
@@ -74,7 +74,9 @@ export default {
       spellOrderSetArr: [],
       startDate: "", // 开始时间
       endDate: "", // 结束时间
-      takePlaceIDArr: []
+      takePlaceIDArr: [],
+      startTime: "",
+      endTime: ""
     };
   },
 

src/router/index.js

@@ -118,7 +118,6 @@ const routes = [
   // 活动管理路由
   ...activityRouters
 ];
-console.log(routes);
 
 const router = createRouter({
   history: createWebHistory(),

src/store/index.js

 import { createStore } from "vuex";
-import { getPermissions } from '@/service/user';
-import { PERMISSIONNAME_PAGEMODULE } from '../config/pageconfig'
+import { getPermissions } from "@/service/user";
+import { PERMISSIONNAME_PAGEMODULE } from "../config/pageconfig";
 
 export default createStore({
   state: {
     permissions: null,
     userInfo: null
-
   },
   mutations: {
-    updateUserPermission (state, payload) {
+    updateUserPermission(state, payload) {
       state.permissions = payload;
     },
-    updateUserInfo (state, payload) {
+    updateUserInfo(state, payload) {
       state.userInfo = payload;
     }
   },
   actions: {
-    async updateUserPermission ({ commit }, payload) {
+    async updateUserPermission({ commit }, payload) {
       const { permissions = [] } = await getPermissions(payload.email);
-
-      console.log("VUEX action updateUserPermission::", permissions);
-      commit('updateUserPermission', permissions)
+      commit("updateUserPermission", permissions);
     }
   },
   modules: {},
@@ -29,7 +26,9 @@ export default createStore({
     subPermissions: state => {
       const permissionCol = {};
       (state.permissions || []).forEach(element => {
-        PERMISSIONNAME_PAGEMODULE[element.name] && (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] = element.sub_permissions)
+        PERMISSIONNAME_PAGEMODULE[element.name] &&
+          (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] =
+            element.sub_permissions);
       });
       return permissionCol;
     },
@@ -38,10 +37,12 @@ export default createStore({
      * @param {*} module 模块名，可选值： enterprise, lifeNo, role, user
      * @returns
      */
-    moduleSubPermissions: (state) => (module) => {
+    moduleSubPermissions: state => module => {
       const permissionCol = {};
       (state.permissions || []).forEach(element => {
-        PERMISSIONNAME_PAGEMODULE[element.name] && (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] = element.sub_permissions)
+        PERMISSIONNAME_PAGEMODULE[element.name] &&
+          (permissionCol[PERMISSIONNAME_PAGEMODULE[element.name]] =
+            element.sub_permissions);
       });
       return permissionCol[module];
     }