diff --git a/public/index.html b/public/index.html
index a0135f9..61d5f33 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,6 +7,8 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
     <script charset="utf-8" src="https://map.qq.com/api/gljs?v=2.exp&key=4VBBZ-HAA3X-QKI46-7GAL2-LQEOT-BEBKN"></script>
+  <script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=4VBBZ-HAA3X-QKI46-7GAL2-LQEOT-BEBKN"></script>
+    <script src="http://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script>
   </head>
   <body>
     <noscript>
diff --git a/src/assets/imgs/ditu.png b/src/assets/imgs/ditu.png
new file mode 100644
index 0000000..0e69c21
Binary files /dev/null and b/src/assets/imgs/ditu.png differ
diff --git a/src/views/active/activity.vue b/src/views/active/activity.vue
index d197b90..659245e 100644
--- a/src/views/active/activity.vue
+++ b/src/views/active/activity.vue
@@ -4,429 +4,465 @@
     <div style="padding: 0px 20px">
       <div ref="lxHeader">
         <LxHeader icon="md-apps" text="活动管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content"></div>
-          <slot>
-            <div>
-              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.Name" placeholder="关键字搜索" />
-              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
-              <Button type="primary" @click="edit()" style="margin-left: 10px">新增活动</Button>
-            </div>
+          <div slot="content"></div>
+          <slot>
+            <div>
+              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.Name" placeholder="关键字搜索" />
+              <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
+              <Button type="primary" @click="edit()" style="margin-left: 10px">新增活动</Button>
+            </div>
           </slot>
         </LxHeader>
       </div>
+
       <div class="table-tree">
-        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-          <el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
-          <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
-            :label="column.title" :width="column.width">
-            <template slot-scope="scope">
-              <div v-if="column.type=='opt'">
-                <Button ghost size="small" @click="toactive(scope.row)" type="success"
-                  style="margin-left: 10px;">订单</Button>
-                <Button ghost size="small" @click="edit(scope.row)" type="primary"
-                  style="margin-left: 10px;">编辑</Button>
-                <Button ghost size="small" type="error" @click="del(scope.row)"
-                  style="margin-left: 10px;">删除</Button>
-                <Button v-if="scope.row['status']==1" ghost size="small" type="info" @click="changeStatus(scope.row)"
-                  style="margin-left: 10px;">下架</Button>
-                  <Button v-if="scope.row['status']==0" ghost size="small" type="warning" @click="changeStatus(scope.row)"
-                    style="margin-left: 10px;">上架</Button>
-              </div>
-
-              <div v-else-if="column.type=='dateRange'">
-                {{scope.row["start_time"]+"至"+scope.row["end_time"]}}
-              </div>
-              <div v-else-if="column.type=='status'">
-                <el-tag v-if="scope.row['status']==1" type="" effect="dark" >
-                    上架中
-                </el-tag>
-                <el-tag v-if="scope.row['status']==0" type="info" effect="dark" >
-                    下架
-                </el-tag>
-              </div>
-              <div v-else>{{scope.row[column.field]}}</div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination">
-          <el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
-            :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
-          </el-pagination>
+        <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+          <el-table-column type="index" width="50" label="序号" align="center"> </el-table-column>
+          <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
+            :label="column.title" :width="column.width">
+            <template slot-scope="scope">
+              <div v-if="column.type=='opt'">
+                <Button ghost size="small" @click="toactive(scope.row)" type="success"
+                  style="margin-left: 10px;">订单</Button>
+                <Button ghost size="small" @click="edit(scope.row)" type="primary"
+                  style="margin-left: 10px;">编辑</Button>
+                <Button ghost size="small" type="error" @click="del(scope.row)" style="margin-left: 10px;">删除</Button>
+                <Button v-if="scope.row['status']==1" ghost size="small" type="info" @click="changeStatus(scope.row)"
+                  style="margin-left: 10px;">下架</Button>
+                <Button v-if="scope.row['status']==0" ghost size="small" type="warning" @click="changeStatus(scope.row)"
+                  style="margin-left: 10px;">上架</Button>
+              </div>
+
+              <div v-else-if="column.type=='dateRange'">
+                {{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}}
+              </div>
+              <div v-else-if="column.type=='status'">
+                <el-tag v-if="scope.row['status']==1" type="" effect="dark">
+                  上架中
+                </el-tag>
+                <el-tag v-if="scope.row['status']==0" type="info" effect="dark">
+                  下架
+                </el-tag>
+              </div>
+              <div v-else>{{scope.row[column.field]}}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination">
+          <el-pagination @current-change="handleCurrentChange" :current-page="paginations.page"
+            :page-size="paginations.page_size" background layout="prev, pager, next" :total="paginations.total">
+          </el-pagination>
         </div>
       </div>
     </div>
     <el-dialog title="详情编辑" :visible.sync="dialogFormVisible" fullscreen width="90%">
-      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="活动名称" prop="name">
-               <el-input v-model="form.name" placeholder="请填写活动名称" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-form-item label="所属区域" prop="area">
-               <el-select v-model="form.area" placeholder="请选择所属区域" style="width:100%">
-                  <el-option
-                    v-for="item in parameters.activityArea"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="关联类型" prop="type">
-               <el-select v-model="form.type" placeholder="请选择关联类型" style="width:100%">
-                  <el-option
-                    v-for="item in parameters.activityType"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-form-item label="关联内容" prop="con">
-               <el-select v-model="form.form" placeholder="请选择关联内容" style="width:100%">
-                  <el-option
-                    v-for="item in parameters.activityCon"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请填写活动地址" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-form-item label="集合地" prop="resort">
-              <el-input v-model="form.assemble" placeholder="请填写集合地" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="地址经度" prop="longitude">
-              <el-input v-model="form.longitude" placeholder="请填写地址经度" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="4">
-            <el-form-item label="地址纬度" prop="latitude">
-              <el-input v-model="form.latitude" placeholder="请填写地址纬度" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="开始时间" prop="start_time">
-              <el-date-picker
-                style="width:100%"
-                v-model="form.start_time"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择活动开始时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="结束时间" prop="end_time">
-              <el-time-select
-                  style="width:100%"
-                  placeholder="结束时间"
-                  v-model="form.end_time"
-                  :picker-options="{
-                    start: '00:00',
-                    step: '00:15',
-                    end: '24:00',
-                  }">
-                </el-time-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="预定截止" prop="end_plan">
-              <el-date-picker
-                style="width:100%"
-                v-model="form.end_plan"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择预定截止时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="总人数" prop="total">
-              <el-input v-model="form.total" placeholder="请填写总人数(0为不限制)" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="价格" prop="price">
-              <el-input v-model="form.price" placeholder="请填写价格" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="目标群体" prop="group">
-              <el-select v-model="form.target" placeholder="请选择目标群体" style="width:100%">
-                 <el-option
-                   v-for="item in parameters.activityGroup"
-                   :key="item.value"
-                   :label="item.value"
-                   :value="item.id">
-                 </el-option>
-               </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="海报图" prop="cover">
-          <el-upload
-            action="/api/admin/upload-file"
-            list-type="picture-card"
-            :file-list="coverlist"
-            ref="pictureUpload"
-            :limit="1"
-            :auto-upload="true"
-            :data="uploadOther"
-            :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}"
-            >
-              <i slot="default" class="el-icon-plus"></i>
-              <div slot="file" slot-scope="{file}">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="file.url" alt=""
-                >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in"></i>
-                  </span>
-                  <span
-                    v-if="!disabled"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemove(file)"
-                  >
-                    <i class="el-icon-delete"></i>
-                  </span>
-                </span>
-              </div>
-          </el-upload>
-
-        </el-form-item>
-        <el-form-item label="banner图(最多三张)" prop="banners_list">
-          <el-upload
-            action="/api/admin/upload-file"
-            list-type="picture-card"
-            :file-list="bannersList"
-            ref="pictureUploads"
-            :limit="3"
-            :auto-upload="true"
-            :data="uploadOther"
-            :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}"
-            >
-              <i slot="default" class="el-icon-plus"></i>
-              <div slot="file" slot-scope="{file}">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="file.url" alt=""
-                >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in"></i>
-                  </span>
-                  <span
-                    v-if="!disabled"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemove(file)"
-                  >
-                    <i class="el-icon-delete"></i>
-                  </span>
-                </span>
-              </div>
-          </el-upload>
-
-        </el-form-item>
-
-        <el-form-item label="活动介绍" prop="content">
-          <div style="width: 99.9%;">
-            <tinymce v-model="form.content" ref="tiny" :height="300" />
-          </div>
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" :label-width="formLabelWidth">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="活动名称" prop="name">
+              <el-input v-model="form.name" placeholder="请填写活动名称" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-form-item label="所属区域" prop="area">
+              <el-select v-model="form.area" placeholder="请选择所属区域" style="width:100%">
+                <el-option v-for="item in parameters.activityArea" :key="item.value" :label="item.value"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="关联类型" prop="type">
+              <el-select v-model="form.type" placeholder="请选择关联类型" style="width:100%">
+                <el-option v-for="item in parameters.activityType" :key="item.value" :label="item.value"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-form-item label="关联内容" prop="con">
+              <el-select v-model="form.form" placeholder="请选择关联内容" style="width:100%">
+                <el-option v-for="item in parameters.activityCon" :key="item.value" :label="item.value"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请填写活动地址" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-form-item label="集合地" prop="resort">
+              <el-input v-model="form.assemble" placeholder="请填写集合地" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="地址经度" prop="longitude">
+              <el-input v-model="form.longitude" placeholder="请填写地址经度" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="4">
+            <el-form-item label="地址纬度" prop="latitude">
+              <el-input v-model="form.latitude" placeholder="请填写地址纬度" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="20" :offset="2">
+
+            <div id="containers" style="width:100%;height:300px;margin-bottom:20px"></div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开始时间" prop="start_time">
+              <el-date-picker style="width:100%" v-model="form.start_time" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择活动开始时间" @change="isShowTime">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结束时间" prop="end_time">
+              <el-time-select style="width:100%" placeholder="结束时间" value-format="HH:mm:ss" v-model="form.end_time"
+                :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00',
+                    minTime: showTime
+                  }">
+              </el-time-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预定截止" prop="end_plan">
+              <el-date-picker style="width:100%" v-model="form.end_plan" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择预定截止时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="总人数" prop="total">
+              <el-input v-model="form.total" placeholder="请填写总人数(0为不限制)" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="价格" prop="price">
+              <el-input v-model="form.price" placeholder="请填写价格" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="目标群体" prop="group">
+              <el-select v-model="form.target" placeholder="请选择目标群体" style="width:100%">
+                <el-option v-for="item in parameters.activityGroup" :key="item.value" :label="item.value"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="海报图" prop="cover">
+          <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="coverlist" ref="pictureUpload"
+            :limit="1" :auto-upload="true" :data="uploadOther"
+            :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,1)}">
+            <i slot="default" class="el-icon-plus"></i>
+            <div slot="file" slot-scope="{file}">
+              <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+              <span class="el-upload-list__item-actions">
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                  <i class="el-icon-zoom-in"></i>
+                </span>
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                  <i class="el-icon-delete"></i>
+                </span>
+              </span>
+            </div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="轮播图(最多三张)" prop="banners_list">
+          <el-upload action="/api/admin/upload-file" list-type="picture-card" :file-list="bannersList"
+            ref="pictureUploads" :limit="3" :auto-upload="true" :data="uploadOther"
+            :on-success="function(responsose,file,fileList) {return handlesuccess(responsose,file,fileList,2)}">
+            <i slot="default" class="el-icon-plus"></i>
+            <div slot="file" slot-scope="{file}">
+              <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+              <span class="el-upload-list__item-actions">
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                  <i class="el-icon-zoom-in"></i>
+                </span>
+                <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
+                  <i class="el-icon-delete"></i>
+                </span>
+              </span>
+            </div>
+          </el-upload>
+
+        </el-form-item>
+
+        <el-form-item label="活动介绍" prop="content">
+          <div style="width: 99.9%;">
+            <tinymce v-model="form.content" ref="tiny" :height="300" />
+          </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resetForm('form')">取 消</el-button>
         <el-button type="primary" @click="submitForm('form')">确 定</el-button>
       </div>
-    </el-dialog>
-    <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog>
   </div>
 </template>
 <script>
-  import LxHeader from "@/components/LxHeader/index.vue";
-  import Tinymce from '@/components/Tinymce'
-  import {
-    getToken
+  import LxHeader from "@/components/LxHeader/index.vue";
+  import Tinymce from '@/components/Tinymce'
+  import {
+    getToken
   } from '@/utils/auth'
   import {
-    listactive,
-    store,
-    save,
-    del,
-    get,
+    listactive,
+    store,
+    save,
+    del,
+    get,
     chanStatus
   } from "../../api/active/activity.js";
   export default {
     components: {
-      LxHeader,
+      LxHeader,
       Tinymce,
     },
     data() {
       return {
         dialogFormVisible: false,
-        formLabelWidth: "120px",
-        selectedValue:null,
-        dialogImageUrl: '',
-        dialogVisible: false,
-        disabled: false,
-        tableHeight: 0,
-        //查询条件字段
-        searchFields: {
-          name: ""
-        },
-        tableData: [],
-        paginations: {
-          page: 1,
-          page_size: 15,
-          total: 0
-        },
-        uploadOther: {
-          token: ""
-        },
-        parameters: {
-          activityArea: [{
-            id:1,
-            value:"本馆"
-          },{
-            id:2,
-            value:"馆外"
-          }],
-          activityType: [{
-            id:1,
-            value:"公益"
-          },{
-            id:2,
-            value:"商业"
-          }],
-          activityCon: [{
-            id:1,
-            value:"讲座"
-          },{
-            id:2,
-            value:"主题参观"
-          },{
-            id:3,
-            value:"体验活动"
-          }],
-          activityGroup:[{
-            id:1,
-            value:"幼儿园"
-          },{
-            id:2,
-            value:"小学生"
-          },{
-            id:3,
-            value:"初中生"
-          },{
-            id:4,
-            value:"高中生"
-          }]
-        },
+        formLabelWidth: "120px",
+        selectedValue: null,
+        dialogImageUrl: '',
+        dialogVisible: false,
+        disabled: false,
+        tableHeight: 0,
+        //查询条件字段
+        searchFields: {
+          name: ""
+        },
+        tableData: [],
+        paginations: {
+          page: 1,
+          page_size: 15,
+          total: 0
+        },
+        uploadOther: {
+          token: ""
+        },
+        parameters: {
+          activityArea: [{
+            id: 1,
+            value: "本馆"
+          }, {
+            id: 2,
+            value: "馆外"
+          }],
+          activityType: [{
+            id: 1,
+            value: "公益"
+          }, {
+            id: 2,
+            value: "商业"
+          }],
+          activityCon: [{
+            id: 1,
+            value: "讲座"
+          }, {
+            id: 2,
+            value: "主题参观"
+          }, {
+            id: 3,
+            value: "体验活动"
+          }],
+          activityGroup: [{
+            id: 1,
+            value: "幼儿园"
+          }, {
+            id: 2,
+            value: "小学生"
+          }, {
+            id: 3,
+            value: "初中生"
+          }, {
+            id: 4,
+            value: "高中生"
+          }]
+        },
 
-        form: {
-          name:"",
-          area:"",
-          type:"",
-          form:"",
-          target:"",
-          address:"",
-          assemble: "",
-          cover:"",
-          start_time:"",
-          end_time:"",
-          end_plan:"",
-          total:0,
-          content:"",
-          price:"",
-          longitude:"",
-          latitude:"",
-          banners_list:[]
-        },
-        coverlist:[],
-        bannersList:[],
-        // fileList:[],
-        columns: [{
-            field: "name",
-            title: "活动名称",
-            type: "string",
-          },
-          {
-            field: "address",
-            title: "活动地址",
-            type: "string",
-          },
-          {
-            field: "dateRange",
-            title: "活动时间",
-            type: "dateRange",
-            align:"center",
-            width:300
-          },
-          {
-            field: "end_plan",
-            title: "截止时间",
-            type: "string",
-            align:"center",
-            width:160
-          },
-          {
-            field: "status",
-            title: "状态",
-            type: "status",
-            align:"center",
-            width:120
-          },
-          {
-            field: "操作",
-            title: "操作",
-            width: 240,
-            type: "opt",
-          }
+        form: {
+          name: "",
+          area: "",
+          type: "",
+          form: "",
+          target: "",
+          address: "",
+          assemble: "",
+          cover: "",
+          start_time: "",
+          end_time: "",
+          end_plan: "",
+          total: 0,
+          content: "",
+          price: "",
+          longitude: "",
+          latitude: "",
+          banners_list: []
+        },
+        showTime: "",
+        coverlist: [],
+        bannersList: [],
+        // fileList:[],
+        columns: [{
+            field: "name",
+            title: "活动名称",
+            type: "string",
+          },
+          {
+            field: "address",
+            title: "活动地址",
+            type: "string",
+          },
+          {
+            field: "dateRange",
+            title: "活动时间",
+            type: "dateRange",
+            align: "center",
+            width: 300
+          },
+          {
+            field: "end_plan",
+            title: "截止时间",
+            type: "string",
+            align: "center",
+            width: 160
+          },
+          {
+            field: "status",
+            title: "状态",
+            type: "status",
+            align: "center",
+            width: 120
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 240,
+            type: "opt",
+          }
         ],
         rules: {
           name: [{
             required: true,
             message: '请输入活动名称',
             trigger: 'blur'
+          }],
+          longitude: [{
+            required: true,
+            message: '请输入经度',
+            trigger: 'blur'
+          }],
+          latitude: [{
+            required: true,
+            message: '请输入纬度',
+            trigger: 'blur'
+          }],
+          start_time: [{
+            required: true,
+            message: '请选择开始时间',
+            trigger: 'blur'
+          }],
+          end_time: [{
+            required: true,
+            message: '请选择结束时间',
+            trigger: 'blur'
+          }],
+          end_plan: [{
+            required: true,
+            message: '请选择截止日期',
+            trigger: 'blur'
           }]
-
         },
+        markerLayer: {},
+        map: {},
+        imgsrc: "/src/assets/imgs/ditu.png"
+      }
+    },
+    mounted() {
+
+    },
+    destroyed() {
+
+    },
+    beforeUpdate() {
+
+    },
+    created() {
+      this.uploadOther.token = getToken();
+      this.initLoad();
+      this.load();
 
+    },
+    watch: {
+      dialogFormVisible(newVal, oldVal) {
+        if (newVal == true) {
+          let that = this;
+          that.markerLayer = new TMap.MultiMarker({});
+          that.initMap();
+        }
       }
-    },
-    mounted() {
-    },
-    created() {
-      this.uploadOther.token = getToken();
-      this.initLoad();
-      this.load();
     },
     methods: {
+      initMap() {
+        //如果地图存在，就销毁，下面会重新创建一个
+       // if (!!this.map) {
+       //   this.map.destroy();
+       // }
+        this.$nextTick(() => {
+          let that = this;
+          console.log(window); // 通过window获取
+          var center = new window.TMap.LatLng(31.302377, 120.625826)
+          //初始化地图
+          var map = new window.TMap.Map("containers", {
+            zoom: 18, //设置地图缩放级别
+            center: center, //设置地图中心点坐标
+          });
+          console.log(map);
+          this.map = map;
+          map.on("click", (e) => {
+            this.markerLayer.setGeometries([]);
+            const position = e.latLng;
+            that.form.longitude = position.lng,
+              that.form.latitude = position.lat,
+              this.addImgMarker(position);
+          });
+        })
+      },
+      addImgMarker(data) {
+        this.markerLayer = new TMap.MultiMarker({
+          map: this.map,
+          //样式定义
+          styles: {
+            //创建一个styleId为"myStyle"的样式（styles的子属性名即为styleId）
+            myStyle: new TMap.MarkerStyle({
+              width: 25, // 点标记样式宽度（像素）
+              height: 35, // 点标记样式高度（像素）
+              src: this.imgsrc, //图片路径
+              //焦点在图片中的像素位置，一般大头针类似形式的图片以针尖位置做为焦点，圆形点以圆心位置为焦点
+              anchor: {
+                x: 16,
+                y: 32
+              },
+            }),
+          },
+        });
+      },
       initLoad() {
         var that = this;
         var clientHeight = document.documentElement.clientHeight
@@ -434,42 +470,44 @@
         var paginationHeight = 37; //分页的高度
         var topHeight = 50; //页面 头部
         let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
-        that.tableHeight = tableHeight;
+        that.tableHeight = tableHeight;
 
       },
       load() {
-        var that = this;
-        listactive({
-          page: this.paginations.page,
-          page_size: this.paginations.page_size,
-          name:this.searchFields.name
-        }).then(res => {
-          this.tableData = res.data;
-          this.paginations.total = res.total
-        }).catch(error => {
-
+        var that = this;
+        listactive({
+          page: this.paginations.page,
+          page_size: this.paginations.page_size,
+          name: this.searchFields.name
+        }).then(res => {
+          this.tableData = res.data;
+          this.paginations.total = res.total
+        }).catch(error => {
+
         })
       },
       info(obj) {
-        var that = this;
-        get(obj.id).then(res => {
-          let result = Object.assign(that.form, res);
-          that.form = result;
-          that.form.end_time = result.end_time.substring(11,result.end_time.length);
-          result.cover_upload.coverType = "cover";
-          that.coverlist.push(result.cover_upload);
-          let _files = [];
-          for (var mod of result.banners) {
-            let m = Object.assign({}, mod);
-            m.url = mod.upload.url;
-            m.id= mod.upload.id;
-            m.coverType = "poster";
-            _files.push(m);
-          }
-          that.bannersList = _files;
-          this.$refs.tiny.setContent(result.content);
-        }).catch(error => {
-          //reject(error)
+        var that = this;
+        get(obj.id).then(res => {
+          that.coverlist = [];
+          let result = Object.assign(that.form, res);
+          that.form = result;
+          that.showTime = result.start_time.substring(11, result.start_time.length);
+          that.form.end_time = result.end_time.substring(11, result.end_time.length);
+          result.cover_upload.coverType = "cover";
+          that.coverlist.push(result.cover_upload);
+          let _files = [];
+          for (var mod of result.banners) {
+            let m = Object.assign({}, mod);
+            m.url = mod.upload.url;
+            m.id = mod.upload.id;
+            m.coverType = "poster";
+            _files.push(m);
+          }
+          that.bannersList = _files;
+          this.$refs.tiny.setContent(result.content);
+        }).catch(error => {
+          //reject(error)
         })
 
       },
@@ -479,13 +517,13 @@
         if (obj) {
           var that = this;
           that.info(obj);
-        } else {
-        }
+        } else {}
         this.dialogFormVisible = true;
+
       },
       submitForm(formName) {
-        var that = this;
-        that.form.end_time = that.form.start_time.substring(0,10)+" "+that.form.end_time+":00";
+        var that = this;
+        that.form.end_time = that.form.start_time.substring(0, 10) + " " + that.form.end_time;
         this.$refs[formName].validate((valid) => {
           if (valid) {
             if (that.form.id) {
@@ -509,39 +547,39 @@
             return false;
           }
         });
-      },
-      changeStatus(obj){
-        var that = this;
-        if (obj) {
-          let status = obj.status==0?1:0;
-          let para={
-            id:obj.id,
-            status:status
-          }
-          this.$Modal.confirm({
-            title: '确认要变更状态？',
-            onOk: () => {
-              chanStatus({
-                id:para.id,
-                status:para.status
-              }).then(response => {
-                this.$Message.success('操作成功');
-                that.load();
-              }).catch(error => {
-                console.log(error)
-                reject(error)
-              })
-            },
-            onCancel: () => {
-              //this.$Message.info('Clicked cancel');
-            }
-          });
-        }
+      },
+      changeStatus(obj) {
+        var that = this;
+        if (obj) {
+          let status = obj.status == 0 ? 1 : 0;
+          let para = {
+            id: obj.id,
+            status: status
+          }
+          this.$Modal.confirm({
+            title: '确认要变更状态？',
+            onOk: () => {
+              chanStatus({
+                id: para.id,
+                status: para.status
+              }).then(response => {
+                this.$Message.success('操作成功');
+                that.load();
+              }).catch(error => {
+                console.log(error)
+                reject(error)
+              })
+            },
+            onCancel: () => {
+              //this.$Message.info('Clicked cancel');
+            }
+          });
+        }
       },
       resetForm(formName) {
-        var that = this;
-        this.coverlist=[];
-        this.bannersList=[];
+        var that = this;
+        this.coverlist = [];
+        this.bannersList = [];
         this.$refs.tiny.setContent("");
         this.$refs[formName].resetFields();
         that.dialogFormVisible = false;
@@ -565,57 +603,71 @@
             }
           });
         }
-      },
-      handleRemove(file) {
-        if(file.coverType=="cover"){
-          this.coverlist=[];
-        }else if(file.coverType=="poster"){
-          for(var i = 0; i < this.bannersList.length; i++){
-            if(this.bannersList[i].url==file.url){
-              this.bannersList.splice(i, 1)
-            }
-          }
-        }
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      handlesuccess(response, file, fileList, index) {
-        if(index==1){
-          let listid="";
-          for (var m of fileList) {
-            m.coverType = "cover";
-            if (m.response)
-              listid=m.response.id;
-            else
-             listid=m.id;
-          }
-          this.coverlist=fileList;
-          this.form.cover = listid;
-        }else{
-          let listUrl = [];
-
-          for (var m of fileList) {
-            m.coverType = "poster";
-            if (m.response)
-              listUrl.push({"upload_id":m.response.id});
-            else
-              listUrl.push({"upload_id":m.id});
-          }
-          this.bannersList=fileList
-          this.form.banners_list = listUrl
-        }
-      },
-      handleCurrentChange(page) {
-        this.paginations.page = page;
-        this.load();
-      },
-      toactive(obj){
-        if(obj.id){
-          let url = "/#/order/activeorder?activity_id="+obj.id;
-          window.location.href = url
-        }
+      },
+      handleRemove(file) {
+        if (file.coverType == "cover") {
+          this.coverlist = [];
+        } else if (file.coverType == "poster") {
+          for (var i = 0; i < this.bannersList.length; i++) {
+            if (this.bannersList[i].url == file.url) {
+              this.bannersList.splice(i, 1)
+            }
+          }
+        }
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
+      handlesuccess(response, file, fileList, index) {
+        if (index == 1) {
+          let listid = "";
+          for (var m of fileList) {
+            m.coverType = "cover";
+            if (m.response)
+              listid = m.response.id;
+            else
+              listid = m.id;
+          }
+          this.coverlist = fileList;
+          this.form.cover = listid;
+        } else {
+          let listUrl = [];
+
+          for (var m of fileList) {
+            m.coverType = "poster";
+            if (m.response)
+              listUrl.push({
+                "upload_id": m.response.id
+              });
+            else
+              listUrl.push({
+                "upload_id": m.id
+              });
+          }
+          this.bannersList = fileList
+          this.form.banners_list = listUrl
+        }
+      },
+      handleCurrentChange(page) {
+        this.paginations.page = page;
+        this.load();
+      },
+      toactive(obj) {
+        if (obj.id) {
+          let url = "/#/order/activeorder?activity_id=" + obj.id;
+          window.location.href = url
+        }
+      },
+      changeEndTime(val) {
+        if (val) {
+          val = val.substring(11, val.length);
+          return val
+        }
+
+      },
+      isShowTime(val) {
+        this.showTime = val.substring(11, val.length);
       },
     }
   };
