Merge remote-tracking branch 'origin/build' into build

project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue

@@ -115,8 +115,6 @@
 
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { mapState } from "vuex";
-import dayjs from "dayjs";
 export default {
   name: "activitiesAdd",
   props: {
@@ -184,7 +182,6 @@ export default {
       this.id = this.params.id
       this.getDetail()
     }
-    this.areaRootId = this.user.info.areaId
   },
   computed: {
     ...mapState(['user'])
@@ -303,7 +300,6 @@ export default {
         if (valid) {
           let intoEnd = new Date(this.form.intoEndtime).getTime()
           let exitBegin = new Date(this.form.exitBegintime).getTime()
-          console.log(intoEnd, exitBegin,'哈哈哈');
           if(exitBegin <= intoEnd) {
             return this.$message.error('离场的开始时间不能小于且等于进场的结束时间')
           }