diff --git a/admin-web-master/.env.development b/admin-web-master/.env.development
index 0a18f66..322cbc2 100644
--- a/admin-web-master/.env.development
+++ b/admin-web-master/.env.development
@@ -6,7 +6,7 @@ VUE_APP_BASE_API = '/dev-api'
 
 #  VUE_APP_DOMAIN_PREFIX_1 = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server"
 # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp"
-VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
+VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.125:9003'
 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.245:49013'
 #  VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
  VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server'
\ No newline at end of file
diff --git a/admin-web-master/.env.production b/admin-web-master/.env.production
index 2a26b32..e7cc6fe 100644
--- a/admin-web-master/.env.production
+++ b/admin-web-master/.env.production
@@ -5,7 +5,7 @@ ENV = 'production'
 VUE_APP_BASE_API = '/prod-api'
 #  VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server"
 # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp"
-VUE_APP_DOMAIN_PREFIX_1='http://8.130.38.56:9003'
+VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.125:9003'
 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003'
 # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003'
  VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server'
diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index 78c8902..ff12ab8 100644
--- a/admin-web-master/dist.zip
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/components/ImageUpload/index.vue b/admin-web-master/src/components/ImageUpload/index.vue
index 9463436..34f1746 100644
--- a/admin-web-master/src/components/ImageUpload/index.vue
+++ b/admin-web-master/src/components/ImageUpload/index.vue
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div style="position: relative;">
-        <input style="opacity: 0;position: absolute;" :id="inputtype" ref="fileInput" type="file" :multiple="true"
+        <input :accept="options.accept" style="opacity: 0;position: absolute;" :id="inputtype" ref="fileInput" type="file" :multiple="true"
         @change="handleUploadFile" />
         <div v-if="
             localValue && localValue.length < options.limit && !options.disabled
@@ -247,6 +247,7 @@
           this.fileList.push(this.localValue[i].address)
         }
         let urlstr = this.fileList.join(',')
+        console.error(urlstr)
         this.$emit('changimg',urlstr)
       },
       async handleSetCover(file, i) {
diff --git a/admin-web-master/src/components/add/addMarkActivity.vue b/admin-web-master/src/components/add/addMarkActivity.vue
new file mode 100644
index 0000000..8bb0079
--- /dev/null
+++ b/admin-web-master/src/components/add/addMarkActivity.vue
@@ -0,0 +1,356 @@
+<template>
+  <div>
+    <el-form :model="formInline" :rules="rules" ref="heForm" label-width="130px" class="demo-ruleForm">
+      <el-form-item label="营销活动标题" prop="title">
+        <el-input placeholder="请输入" v-model="formInline.title"></el-input>
+      </el-form-item>
+      <el-form-item label="内容" prop="content" tyle="width: 100%;">
+        <wang-editor v-model="formInline.content" ref="editor" :height="200"></wang-editor>
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="场地" prop="shopNumber">
+            <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+              <div
+                style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
+                <div style="padding:10px;">场地选择</div>
+                <div v-if="AddData.length != 1" style="color: #3F9B6A;padding:10px;" @click="mingShow">
+                  添加
+                </div>
+              </div>
+              <div style="padding: 15px;">
+                <div style="padding: 0px 20px 0px 0px">
+                  <el-table :data="AddData"
+                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                    <el-table-column label="序号" min-width="5%">
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源名称" min-width="20%" show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源类型" min-width="10%">
+                      <template slot-scope="scope">
+                        {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                      </template>
+                    </el-table-column>
+
+                    <el-table-column label="详细地址" min-width="20%">
+                      <template slot-scope="scope">
+                        {{scope.row.detailedLocation}}
+                      </template>
+                    </el-table-column>
+
+                    <el-table-column prop="notes" label="实际使用面积" min-width="25%">
+                      <template slot-scope="scope">
+                        {{scope.row.actualArea ? scope.row.actualArea :  scope.row.actualUsableArea?scope.row.actualUsableArea:'-'}}
+                      </template>
+
+                    </el-table-column>
+
+                    <el-table-column label="操作" min-width="15%">
+                      <template slot-scope="scope">
+                        <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="起止时间" prop="content">
+        <el-date-picker style="width: 50%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="联系人" prop="contactPerson">
+        <el-input placeholder="请输入" v-model="formInline.contactPerson"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="contactPhone">
+        <el-input placeholder="请输入" v-model="formInline.contactPhone"></el-input>
+      </el-form-item>
+      <el-form-item label="封面图片">
+        <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="ys" inputtype="coverImage" :value="formInline.coverImage"
+        @changimg="e=>changimg(e,'coverImage')"></upimg>
+      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item>
+            <div style="margin-top: 20px">
+              <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+              <el-button @click="close()" class="buttonHover"
+                style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-dialog :visible.sync="addMing" title="选择资源" width="65%" append-to-body center
+      :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <zy v-if="addMing" @minSev="minSev" @mingClose="mingClose"></zy>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+   import zy from '@/components/change/zy.vue'
+  import {
+    businessListGetAll,
+  } from '@/api/business'
+  import upimg from "@/components/ImageUpload/index"
+  import wangEditor from "@/components/editor/index";
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import {
+    getAlls,
+    changAlls
+  } from '@/api/information.js'
+  import {
+    getAlls as map1
+  } from '@/api/map1.js'
+  import {
+    miniioupload
+  } from '@/api/commodityLease.js'
+  import {
+
+    contractinsertAdd
+  } from '@/api/manage.js'
+  import {
+    cerePlatformMerchant
+  } from '@/api/newly.js'
+  import {
+    MarkGetAll,
+    MarkAdd,
+    MarkEdit,
+    MarkDel,
+    QRcode,
+    Registration
+  } from '@/api/MarkActivity.js'
+  export default {
+    components: {
+      zy,
+      upimg,
+      wangEditor
+    },
+    data() {
+      return {
+        AddData: [], //最后资源
+        multipleSelection: [], //资源
+        addMing: false,
+        ziyuanData: [],
+        shopId: null,
+        hefuData: [], //合同附件
+        uploadFileUrl: uploadUrl, // 请求地址
+        shopList: [],
+        plan_Time: [],
+        formInline: {
+          title: '',
+          content: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          coverImage: '',
+          registeredCount: '',
+        },
+        rules: {
+          title: [{
+            required: true,
+            message: '请选择合同类型',
+            trigger: 'change'
+          }],
+          content: [{
+            required: true,
+            message: '请输入合同编号',
+            trigger: 'blur'
+          }],
+          venue: [{
+            required: true,
+            message: '请输入标段号',
+            trigger: 'blur'
+          }],
+          contactPerson: [{
+            required: true,
+            message: '请输入合同名称',
+            trigger: 'blur'
+          }],
+          contactPhone: [{
+            required: true,
+            message: '请输入押金',
+            trigger: 'blur'
+          }],
+          coverImage: [{
+            required: true,
+            message: '请选择签订日期',
+            trigger: 'change'
+          }],
+          registeredCount: [{
+            required: true,
+            message: '请选择终止日期',
+            trigger: 'change'
+          }]
+        },
+        shopfrom: {
+          checkState:'2',
+          pageNumber: 0,
+          pageSize: 1000,
+        },
+        pageindex: {
+          pageNumber: 0,
+          pageSize: 20,
+        },
+        baseURL: 'http://192.168.2.38:9003',
+        uploadFiles: [],
+        filesLength: 1
+      };
+    },
+    props: {
+      info: {
+        type: Object,
+        default: {}
+      }
+    },
+    created() {
+      cerePlatformMerchant(this.shopfrom).then(res => {
+        this.shopList = res.data.content
+        console.error(this.shopList)
+      })
+    },
+    methods: {
+      changimg(e, type) {
+        this.formInline[type] = e
+        console.error(this.ruleForm[type])
+      },
+      add() {
+
+        if (this.formInline.id) {
+        } else {
+          this.$refs.heForm.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              MarkAdd({
+                ...this.formInline
+              }).then(res => {
+                console.error(res)
+                if (res.code == 200) {
+                  this.$message({
+                    message: '添加成功',
+                    type: 'success'
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+          })
+
+        }
+      },
+      close() {
+        this.$emit('removeonaction', '1')
+      },
+      MingDelete(item) {
+        this.AddData.splice(item, 1);
+      },
+      async mingShow() {
+        const ziyuan = await getAlls(this.pageindex)
+        const ggw = await map1(this.pageindex)
+        const changdi = await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content, ...ggw.data.content, ...changdi.data.content]
+        console.error(this.ziyuanData)
+        this.addMing = true
+      },
+      handleSelectionChange(selection) {
+        // 处理选择变化的逻辑
+        console.error(selection)
+        this.multipleSelection= []
+        this.multipleSelection.push(selection)
+      },
+      minSev() {
+        // this.AddData = this.multipleSelection
+        const filteredAddData = this.AddData.filter(itemAdd => {
+          // 使用 some 方法检查 this.multipleSelection 中是否存在具有相同 id 的元素
+          return !this.multipleSelection.some(itemMultiple => itemMultiple.id === itemAdd.id);
+        });
+        this.AddData = filteredAddData.concat(this.multipleSelection)
+        this.addMing = false
+        this.multipleSelection = []
+
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.ziyuanData = []
+        this.addMing = false
+      },
+      changeRelatedMerchants(e) {
+        console.error(e)
+        this.shopId = this.shopList[e].id
+        this.formInline.tenantName = this.shopList[e].name
+        this.formInline.tenantTelephone = this.shopList[e].phone
+      },
+      hefuRemove() {
+        this.hefuData = []
+      },
+      hefuSuccess(response, file, fileList) {
+        this.hefuData = []
+        console.error(response)
+        let fd = new FormData()
+        fd.append('file', response.raw)
+        fd.append('filePath', 'hetong')
+        miniioupload(fd).then(res => {
+          console.error(res)
+          const fileMsg = {
+            name: response.name,
+            url: res.data,
+          }
+          this.hefuData.push(fileMsg)
+        })
+      },
+
+
+    },
+  };
+</script>
+<style lang="css">
+  .el-upload {
+    display: block;
+    text-align: left;
+  }
+
+  .el-dialog__header {
+    background-color: #F2F3F5;
+    text-align: left;
+  }
+
+  .el-dialog__title {
+    line-height: 30px;
+    font-size: 15px;
+    color: #303133;
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
+  .el-dialog__header{
+    padding: 0;
+    display: none;
+  }
+</style>
+
diff --git a/admin-web-master/src/components/add/addcd copy.vue b/admin-web-master/src/components/add/addcd copy.vue
new file mode 100644
index 0000000..524e04e
--- /dev/null
+++ b/admin-web-master/src/components/add/addcd copy.vue
@@ -0,0 +1,364 @@
+<template>
+  <div>
+    <el-form :model="ruleForm" :rules="rulesSt" ref="ruleForm" label-width="130px"
+      class="demo-ruleForm">
+      <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="场地名称" prop="venueName">
+                      <el-input v-model="ruleForm.venueName" placeholder="请输入" style="margin-top:5px;" maxlength="50"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="场地类型" prop="venueType">
+                      <el-select v-model="ruleForm.venueType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+                        <el-option label="草地" value="草地"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="实际使用面积" prop="actualArea">
+                      <el-input v-model="ruleForm.actualArea" placeholder="请输入" style="margin-top:5px;">
+                        <template slot="append">M<sup>2</sup></template>
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="所属区域" prop="district">
+                      <el-select v-model="ruleForm.district" placeholder="请选择" style="margin-top:5px;width: 100%;">
+                        <el-option label="成华区" value="成华区"></el-option>
+                        <el-option label="武侯区" value="武侯区"></el-option>
+                        <el-option label="锦江区" value="锦江区"></el-option>
+                        <el-option label="青羊区" value="青羊区"></el-option>
+                        <el-option label="金牛区" value="金牛区"></el-option>
+                        <el-option label="双流区" value="双流区"></el-option>
+                        <el-option label="郫都区" value="郫都区"></el-option>
+                        <el-option label="龙泉驿区" value="龙泉驿区"></el-option>
+                        <el-option label="温江区" value="温江区"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="归属部门" prop="department">
+                      <el-input v-model="ruleForm.department" placeholder="请输入" style="margin-top:5px;" maxlength="50">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="负责人" prop="responsiblePerson">
+                      <el-input v-model="ruleForm.responsiblePerson" placeholder="请输入" style="margin-top:5px;" maxlength="20">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+
+                <el-row :gutter="20">
+                  <el-col :span="12">
+                    <el-form-item label="详细位置" prop="detailedLocation">
+                      <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" maxlength="100">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="24">
+                    <el-form-item label="地图标点" prop="mapMarker">
+                    <div style="width: 100%;height: 300px;border: 1px solid #3F9B6A;" >
+                      <MapMark :sendChildDate="getChildDate" ref="mapComponent"></MapMark>
+                    </div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="规划图纸" prop="planningDrawing">
+                  <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" @changimg="e=>changimg(e,'planningDrawing')"></upimg>
+                  <!-- <upimg filePath="cd" :value="ruleForm.planningDrawing" @changimg="e=>changimg(e,'planningDrawing')" :limit="5" :fileSize="1"></upimg> -->
+                </el-form-item>
+                <el-form-item label="场地描述" prop="description">
+                  <el-input type="textarea" v-model="ruleForm.description" style="margin-top:5px;"
+                    placeholder="请输入" maxlength="200"></el-input>
+                </el-form-item>
+                <el-form-item label="展示主图" prop="displayImage">
+                  <upimg filePath="cd" inputtype="displayImage" :value="ruleForm.displayImage" @changimg="e=>changimg(e,'displayImage')"></upimg>
+                  <!-- <upimg filePath="cd" :value="ruleForm.displayImage" @changimg="e=>changimg(e,'displayImage')" :limit="1" :fileSize="1"></upimg> -->
+                </el-form-item>
+                <el-form-item label="其他视频" prop="otherImageVideos">
+                  <upfile filePath="cd" :value="ruleForm.otherImageVideos"  :fileType="'.mp4'" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+                </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item>
+            <div style="margin-top: 20px">
+              <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+              <el-button @click="close()" class="buttonHover"
+                style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import MapMark from "@/components/MapContainer/MapMark";
+  import upimg from "@/components/ImageUpload/index"
+      import upfile from "@/components/fujianUpload/fujianList"
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import {
+    miniioupload
+  } from '../../api/commodityLease.js'
+  import {
+    gongyuan,
+    lvdaoduan,
+    addList,
+    editList
+  } from '../../api/map1.js';
+  import {
+    changadd,
+    changedit
+  } from '../../api/information'
+  export default {
+    components: {
+      upimg,
+      MapMark,
+      upfile
+    },
+    data() {
+      return {
+        ontype:'线上广告位',
+        typelist:[
+          {
+            name:'线上广告位',
+            vaule:'线上广告位'
+          },
+          {
+            name:'实体广告位',
+            vaule:'实体广告位'
+          },
+        ],
+        //地图标点的经纬度
+        mapData: {},
+        uploadFileUrl: uploadUrl, // 请求地址
+        ruleForm: {
+          venueName: '',
+            venueType: '',
+            actualArea: '',
+            district: '',
+            department: '',
+            responsiblePerson: '',
+            detailedLocation: '',//详细位置
+            mapMarker: '',//地图标点
+            description: '',//场地描述
+            planningDrawing: '',//规划图纸
+            displayImage: '',//展示主图
+            otherMedia: '', //其他图片视频
+        },
+        rulesSt: {
+          venueName: [{
+            required: true,
+            message: '请输入场地名称',
+          trigger: 'blur'
+          }, ],
+          venueType: [{
+            required: true,
+            message: '请选择场地类型',
+          trigger: 'change'
+          }, ],
+          actualArea: [{
+            required: true,
+            message: '请输入实际使用面积',
+         trigger: 'blur'
+          }, ],
+          district: [{
+            required: true,
+            message: '请选择所属区域',
+           trigger: 'change'
+          }],
+          detailedLocation: [{
+            required: true,
+            message: '请输入详细位置',
+               trigger: 'blur'
+          }, ]
+        },
+        uploadFiles: [],
+        filesLength: 1,
+        gongyuanList: [],
+        fileData: [],
+        parentMessage: {},
+        edit: true
+      };
+    },
+    props: {
+      info: {
+        type: Object,
+        default: {}
+      },
+
+    },
+    async created() {
+      if (this.info && this.info.id) {
+        this.ruleForm = this.info
+
+      } else {
+
+      }
+    },
+    methods: {
+      changimg(e,type) {
+        this.ruleForm[type] = e
+      },
+      changeadvertisingType(e){
+        console.error(e)
+        this.ontype = e
+      },
+      //获取当前时间
+      updateCurrentTime() {
+        const now = new Date();
+        const year = now.getFullYear();
+        const month = (now.getMonth() + 1).toString().padStart(2, '0');
+        const day = now.getDate().toString().padStart(2, '0');
+        const hours = now.getHours().toString().padStart(2, '0');
+        const minutes = now.getMinutes().toString().padStart(2, '0');
+        const seconds = now.getSeconds().toString().padStart(2, '0');
+
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      },
+      //获取地图点击的经纬度
+      getChildDate(mapData) {
+        this.mapData = mapData
+
+      },
+      lvdaoSel(vaule) {
+        this.ruleForm.belongingParkTrail = ''
+        this.gongyuan(vaule)
+      },
+      async gongyuan(value) {
+        const gongyaun = await gongyuan()
+        this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
+      },
+      add() {
+
+        if (this.ruleForm.id) {
+          this.$refs.ruleForm.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              this.ruleForm.updateDate = this.updateCurrentTime()
+              if (this.fileData.length != 0) {
+                this.ruleForm.otherImageVideos = this.fileData[0].url
+              }
+              this.ruleForm.mapMarker = JSON.stringify(this.mapData)
+              changedit(this.ruleForm).then(res => {
+                if (res.code == 200) {
+                  this.$message({
+                    message: '修改成功',
+                    type: 'success'
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+
+
+          })
+        } else {
+          this.$refs.ruleForm.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              if (this.fileData.length != 0) {
+                this.ruleForm.otherImageVideos = this.fileData[0].url
+              }
+              this.ruleForm.createDate = this.updateCurrentTime()
+              this.ruleForm.mapMarker = JSON.stringify(this.mapData)
+              this.ruleForm.rentalStatus = 0
+              this.ruleForm.publishStatus = 0
+              changadd(this.ruleForm).then(res => {
+                if (res.code == 200) {
+                  this.$message({
+                    message: '添加成功',
+                    type: 'success'
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+          })
+
+        }
+      },
+      close() {
+        this.$emit('removeonaction', '1')
+      },
+      hefuRemove() {
+        this.hefuData = []
+      },
+      hefuSuccess(response, file, fileList) {
+        this.fileData = []
+        console.error(response)
+        let fd = new FormData()
+        fd.append('file', response.raw)
+        fd.append('filePath', 'hetong')
+        miniioupload(fd).then(res => {
+          console.error(res)
+          const fileMsg = {
+            name: response.name,
+            url: res.data,
+          }
+          this.fileData.push(fileMsg)
+        })
+      },
+
+
+    },
+  };
+</script>
+<style lang="scss">
+  .el-upload {
+    display: block;
+    /* text-align: left; */
+  }
+
+  .video-uploader {
+    .el-upload {
+      text-align: left;
+    }
+  }
+
+  .el-dialog__header {
+    background-color: #F2F3F5;
+    text-align: left;
+  }
+
+  .el-dialog__title {
+    line-height: 30px;
+    font-size: 15px;
+    color: #303133;
+  }
+</style>
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index 524e04e..e33b2f5 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -1,93 +1,90 @@
 <template>
   <div>
-    <el-form :model="ruleForm" :rules="rulesSt" ref="ruleForm" label-width="130px"
-      class="demo-ruleForm">
+    <el-form :model="ruleForm" :rules="rulesSt" ref="ruleForm" label-width="130px" class="demo-ruleForm">
       <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="场地名称" prop="venueName">
-                      <el-input v-model="ruleForm.venueName" placeholder="请输入" style="margin-top:5px;" maxlength="50"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="场地类型" prop="venueType">
-                      <el-select v-model="ruleForm.venueType" placeholder="请选择" style="margin-top:5px;width: 100%;">
-                        <el-option label="草地" value="草地"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="实际使用面积" prop="actualArea">
-                      <el-input v-model="ruleForm.actualArea" placeholder="请输入" style="margin-top:5px;">
-                        <template slot="append">M<sup>2</sup></template>
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="所属区域" prop="district">
-                      <el-select v-model="ruleForm.district" placeholder="请选择" style="margin-top:5px;width: 100%;">
-                        <el-option label="成华区" value="成华区"></el-option>
-                        <el-option label="武侯区" value="武侯区"></el-option>
-                        <el-option label="锦江区" value="锦江区"></el-option>
-                        <el-option label="青羊区" value="青羊区"></el-option>
-                        <el-option label="金牛区" value="金牛区"></el-option>
-                        <el-option label="双流区" value="双流区"></el-option>
-                        <el-option label="郫都区" value="郫都区"></el-option>
-                        <el-option label="龙泉驿区" value="龙泉驿区"></el-option>
-                        <el-option label="温江区" value="温江区"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="归属部门" prop="department">
-                      <el-input v-model="ruleForm.department" placeholder="请输入" style="margin-top:5px;" maxlength="50">
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="负责人" prop="responsiblePerson">
-                      <el-input v-model="ruleForm.responsiblePerson" placeholder="请输入" style="margin-top:5px;" maxlength="20">
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
+        <el-col :span="12">
+          <el-form-item label="场地名称" prop="venueName">
+            <el-input v-model="ruleForm.venueName" placeholder="请输入"  maxlength="50"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="场地类型" prop="venueType">
+            <el-select v-model="ruleForm.venueType" placeholder="请选择" style="width: 100%;">
+              <el-option label="草地" value="草地"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="实际使用面积" prop="actualArea">
+            <el-input v-model="ruleForm.actualArea" placeholder="请输入" >
+              <template slot="append">M<sup>2</sup></template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属区域" prop="district">
+            <el-select v-model="ruleForm.district" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="(item,index) in regionOptions"
+                  :key="index" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="详细位置" prop="detailedLocation">
-                      <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" style="margin-top:5px;" maxlength="100">
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="24">
-                    <el-form-item label="地图标点" prop="mapMarker">
-                    <div style="width: 100%;height: 300px;border: 1px solid #3F9B6A;" >
-                      <MapMark :sendChildDate="getChildDate" ref="mapComponent"></MapMark>
-                    </div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-form-item label="规划图纸" prop="planningDrawing">
-                  <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" @changimg="e=>changimg(e,'planningDrawing')"></upimg>
-                  <!-- <upimg filePath="cd" :value="ruleForm.planningDrawing" @changimg="e=>changimg(e,'planningDrawing')" :limit="5" :fileSize="1"></upimg> -->
-                </el-form-item>
-                <el-form-item label="场地描述" prop="description">
-                  <el-input type="textarea" v-model="ruleForm.description" style="margin-top:5px;"
-                    placeholder="请输入" maxlength="200"></el-input>
-                </el-form-item>
-                <el-form-item label="展示主图" prop="displayImage">
-                  <upimg filePath="cd" inputtype="displayImage" :value="ruleForm.displayImage" @changimg="e=>changimg(e,'displayImage')"></upimg>
-                  <!-- <upimg filePath="cd" :value="ruleForm.displayImage" @changimg="e=>changimg(e,'displayImage')" :limit="1" :fileSize="1"></upimg> -->
-                </el-form-item>
-                <el-form-item label="其他视频" prop="otherImageVideos">
-                  <upfile filePath="cd" :value="ruleForm.otherImageVideos"  :fileType="'.mp4'" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
-                </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="归属部门" prop="department">
+            <el-input v-model="ruleForm.department" placeholder="请输入"  maxlength="50">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人" prop="responsiblePerson">
+            <el-input v-model="ruleForm.responsiblePerson" placeholder="请输入"  maxlength="20">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="contact">
+            <el-input v-model="ruleForm.contact" placeholder="请输入"  maxlength="20">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系电话" prop="phoneNumber">
+            <el-input v-model="ruleForm.phoneNumber" placeholder="请输入"  maxlength="20">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="详细位置" prop="detailedLocation">
+        <el-input v-model="ruleForm.detailedLocation" placeholder="请输入"  maxlength="100">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="地图标点" prop="mapMarker">
+        <div style="width: 100%;height: 300px;">
+          <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
+        </div>
+      </el-form-item>
+      <el-form-item label="场地描述" prop="description">
+        <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
+          type="textarea" />
+      </el-form-item>
+      <el-form-item label="规划图纸" prop="planningDrawing">
+        <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}"
+          @changimg="e=>changimg(e,'planningDrawing')"></upimg>
+      </el-form-item>
+      <el-form-item label="展示主图" prop="displayImage">
+        <upimg  filePath="cd" inputtype="displayImage" :value="ruleForm.displayImage"
+          @changimg="e=>changimg(e,'displayImage')"></upimg>
+      </el-form-item>
+      <el-form-item label="其他视频" prop="otherImageVideos">
+        <upfile filePath="cd" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -106,7 +103,7 @@
 <script>
   import MapMark from "@/components/MapContainer/MapMark";
   import upimg from "@/components/ImageUpload/index"
-      import upfile from "@/components/fujianUpload/fujianList"
+  import upfile from "@/components/fujianUpload/fujianList"
   import {
     uploadUrl
   } from '@/utils/request'
@@ -123,68 +120,88 @@
     changadd,
     changedit
   } from '../../api/information'
+  import newmap from "@/components/newmap/index";
   export default {
     components: {
       upimg,
       MapMark,
-      upfile
+      upfile,
+      newmap
     },
     data() {
       return {
-        ontype:'线上广告位',
-        typelist:[
-          {
-            name:'线上广告位',
-            vaule:'线上广告位'
+        lat: 30.67,
+        lng: 104.06,
+        ontype: '线上广告位',
+        typelist: [{
+            name: '线上广告位',
+            vaule: '线上广告位'
           },
           {
-            name:'实体广告位',
-            vaule:'实体广告位'
+            name: '实体广告位',
+            vaule: '实体广告位'
           },
         ],
         //地图标点的经纬度
         mapData: {},
         uploadFileUrl: uploadUrl, // 请求地址
         ruleForm: {
-          venueName: '',
-            venueType: '',
-            actualArea: '',
-            district: '',
-            department: '',
-            responsiblePerson: '',
-            detailedLocation: '',//详细位置
-            mapMarker: '',//地图标点
-            description: '',//场地描述
-            planningDrawing: '',//规划图纸
-            displayImage: '',//展示主图
-            otherMedia: '', //其他图片视频
+          venueName: '', // 场地名称
+          venueType: '', // 场地类型
+          actualArea: '', // 实际使用面积（单位：平方米）
+          district: '', // 所属区域
+          department: '', // 归属部门
+          responsiblePerson: '', // 负责人
+          detailedLocation: '', // 详细位置
+          mapMarker: '', // 地图标点（如经纬度）
+          description: '', // 场地描述
+          planningDrawing: '', // 规划图纸（二进制大对象）
+          displayImage: '', // 展示主图（二进制大对象）
+          otherMedia: '', // 其他图片/视频（可存储URL或路径）
+          rentalStatus: '', // 租赁状态（0.待租  1.已租）
+          publishStatus: '', // 发布状态
+          contractNumber: '', // 合同编号
+          contact: '', // 联系人
+          phoneNumber: '', // 联系电话
+          createDate: '', // 创建时间
+          createUser: '', // 创建人
         },
         rulesSt: {
           venueName: [{
             required: true,
             message: '请输入场地名称',
-          trigger: 'blur'
+            trigger: 'blur'
           }, ],
           venueType: [{
             required: true,
             message: '请选择场地类型',
-          trigger: 'change'
+            trigger: 'change'
           }, ],
           actualArea: [{
             required: true,
             message: '请输入实际使用面积',
-         trigger: 'blur'
+            trigger: 'blur'
           }, ],
           district: [{
             required: true,
             message: '请选择所属区域',
-           trigger: 'change'
+            trigger: 'change'
           }],
           detailedLocation: [{
             required: true,
             message: '请输入详细位置',
-               trigger: 'blur'
-          }, ]
+            trigger: 'blur'
+          }, ],
+          mapMarker: [{
+            required: true,
+            message: '请选择地图标点',
+            trigger: 'blur'
+          }, ],
+          displayImage: [{
+            required: true,
+            message: '请上传宣传图',
+            trigger: 'change'
+          }]
         },
         uploadFiles: [],
         filesLength: 1,
@@ -194,6 +211,11 @@
         edit: true
       };
     },
+    computed: {
+      regionOptions() {
+        return this.$store.state.app.regionOptions;
+      }
+    },
     props: {
       info: {
         type: Object,
@@ -204,16 +226,26 @@
     async created() {
       if (this.info && this.info.id) {
         this.ruleForm = this.info
-
+        if (this.ruleForm.mapMarker) {
+          this.lat = this.ruleForm.mapMarker.split(',')[0]
+          this.lng = this.ruleForm.mapMarker.split(',')[1]
+        }
       } else {
 
       }
     },
     methods: {
-      changimg(e,type) {
+      
+      updatecenter(e) {
+        console.error('-----------', e)
+        this.ruleForm.detailedLocation = e.address
+        this.lat = e.lat
+        this.lng = e.lng
+      },
+      changimg(e, type) {
         this.ruleForm[type] = e
       },
-      changeadvertisingType(e){
+      changeadvertisingType(e) {
         console.error(e)
         this.ontype = e
       },
@@ -243,16 +275,15 @@
         this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
       },
       add() {
-
+        if(this.lat) {
+          this.ruleForm.mapMarker = this.lat + ',' + this.lng
+        }
         if (this.ruleForm.id) {
           this.$refs.ruleForm.validate((valid) => {
             console.log(valid)
             if (valid) {
+              this.ruleForm.updateUser = localStorage.getItem('roleName')
               this.ruleForm.updateDate = this.updateCurrentTime()
-              if (this.fileData.length != 0) {
-                this.ruleForm.otherImageVideos = this.fileData[0].url
-              }
-              this.ruleForm.mapMarker = JSON.stringify(this.mapData)
               changedit(this.ruleForm).then(res => {
                 if (res.code == 200) {
                   this.$message({
@@ -274,18 +305,13 @@
               })
               return false;
             }
-
-
           })
         } else {
           this.$refs.ruleForm.validate((valid) => {
             console.log(valid)
             if (valid) {
-              if (this.fileData.length != 0) {
-                this.ruleForm.otherImageVideos = this.fileData[0].url
-              }
               this.ruleForm.createDate = this.updateCurrentTime()
-              this.ruleForm.mapMarker = JSON.stringify(this.mapData)
+              this.ruleForm.createUser = localStorage.getItem('roleName')
               this.ruleForm.rentalStatus = 0
               this.ruleForm.publishStatus = 0
               changadd(this.ruleForm).then(res => {
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index d57d8ec..602ded8 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -105,7 +105,7 @@
           @changimg="e=>changimg(e,'displayMainImage')"></upimg>
       </el-form-item>
       <el-form-item label="其他视频" prop="otherImageVideos">
-        <upfile filePath="sp" :value="ruleForm.otherImageVideos" :fileType="'.mp4'" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+        <upfile filePath="sp" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -176,8 +176,8 @@
           leaseExpirationDate: '', // 租赁到期时间
           createDate: '', // 创建时间
           createUser: '', // 创建人
-          updateDate: '', // 修改时间
-          updateUser: '', // 修改人
+          // updateDate: '', // 修改时间
+          // updateUser: '', // 修改人
           businessNature: '', // 经营性质
           telephone: '', // 联系电话
           identityCard: '', // 身份证号码
@@ -242,8 +242,8 @@
       if (this.info.id) {
         this.ruleForm = this.info
         if (this.ruleForm.mapPunctuation) {
-          this.lat = this.ruleForm.mapPunctuation.split(',')[0]
-          this.lng = this.ruleForm.mapPunctuation.split(',')[1]
+          this.lat = Number(this.ruleForm.mapPunctuation.split(',')[0])
+          this.lng = Number(this.ruleForm.mapPunctuation.split(',')[1])
         }
       }
       const lvdao = await lvdaoduan()
@@ -260,9 +260,12 @@
       updatecenter(e) {
         console.error('-----------', e)
         this.ruleForm.detailedLocation = e.address
+        this.lat = e.lat
+        this.lng = e.lng
       },
       changimg(e, type) {
         this.ruleForm[type] = e
+        console.error(this.ruleForm[type])
       },
       //获取当前时间
       updateCurrentTime() {
diff --git a/admin-web-master/src/components/add/addmap copy.vue b/admin-web-master/src/components/add/addmap copy.vue
new file mode 100644
index 0000000..8b6ab78
--- /dev/null
+++ b/admin-web-master/src/components/add/addmap copy.vue
@@ -0,0 +1,529 @@
+<template>
+  <div>
+    <el-form :model="formInline" :rules="leixing?rules:rulesSt" ref="formInline" label-width="100px"
+      class="demo-ruleForm">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="广告位名称" prop="advertisingName">
+            <el-input v-model="formInline.advertisingName" placeholder="请输入" style="margin-top:5px;"
+              maxlength="50"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
+            <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号"
+              style="margin-top:5px;"></el-input>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="广告位类型" prop="advertisingType">
+            <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+              <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
+              <!-- <el-option label="实体广告位" value="实体广告位" v-else></el-option> -->
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
+            <el-select v-model="formInline.affiliation" placeholder="请选择" style="margin-top:5px;width: 100%;">
+              <el-option label="游客小程序" value="游客小程序"></el-option>
+              <el-option label="商家客户端" value="商家客户端"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
+            <el-input v-model="formInline.detailedLocation" placeholder="请输入" style="margin-top:5px;"
+              maxlength="200"></el-input>
+            <!-- </el-select> -->
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="地图标点" prop="mapPunctuation" v-if="ontype =='实体广告位'">
+            <div style="width: 100%;height: 300px;">
+              <map-mark :sendChildDate="getChildDate"></map-mark>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
+            <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="margin-top:5px;width: 100%;">
+              <el-option label="1" value="1"></el-option>
+              <el-option label="2" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
+            <el-input v-model="formInline.dimensions" disabled placeholder="宽:300px 长:400px"
+              style="margin-top:5px;"></el-input>
+
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
+            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
+            <el-input v-model="formInline.uploadFormat" disabled placeholder="JPG、PNG、MP4"
+              style="margin-top:5px;"></el-input>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="可上传大小" prop="size" v-if="ontype =='实体广告位'">
+            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
+          </el-form-item>
+          <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
+            <div style="display: flex;justify-content: space-between;">
+              <el-select v-model="formInline.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
+                <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
+
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备大小" prop="equipmentSize" v-if="ontype =='实体广告位'">
+            <div style="display: flex;">
+              <div>
+                <span style="font-size: 14px;">长：</span>
+                <el-select v-model="formInline.equipmentSizeH" placeholder="请选择"
+                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  <el-option label="10" value="10"></el-option>
+                  <el-option label="20" value="20"></el-option>
+                </el-select>
+                <span style="font-size: 14px;margin-right:5px;">mm</span>
+              </div>
+              <div>
+                <span style="font-size: 14px;">宽：</span>
+                <el-select v-model="formInline.equipmentSizeK" placeholder="请选择"
+                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  <el-option label="10" value="10"></el-option>
+                  <el-option label="20" value="20"></el-option>
+                </el-select>
+                <span style="font-size: 14px;margin-right:5px;">mm</span>
+              </div>
+              <div>
+                <span style="font-size: 14px;">高：</span>
+                <el-select v-model="formInline.equipmentSizeG" placeholder="请选择"
+                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  <el-option label="10" value="10"></el-option>
+                  <el-option label="20" value="20"></el-option>
+                </el-select>
+                <span style="font-size: 14px;margin-right:5px;">mm</span>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="广告尺寸" v-if="ontype =='实体广告位'">
+            <div style="display: flex;">
+              <div>
+                <span style="font-size: 14px;">长：</span>
+                <el-select v-model="formInline.dimensionsH" placeholder="请选择"
+                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  <el-option label="10" value="10"></el-option>
+                  <el-option label="20" value="20"></el-option>
+                </el-select>
+                <span style="font-size: 14px;margin-right:5px;">mm</span>
+              </div>
+              <div>
+                <span style="font-size: 14px;">宽：</span>
+                <el-select v-model="formInline.dimensionsK" placeholder="请选择"
+                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  <el-option label="10" value="10"></el-option>
+                  <el-option label="20" value="20"></el-option>
+                </el-select>
+                <span style="font-size: 14px;margin-right:5px;">mm</span>
+              </div>
+            </div>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
+            <div style="display: flex;justify-content: space-between;">
+              <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="margin-top:5px;width: 92%">
+                <el-option label="亚克力" value="亚克力"></el-option>
+                <el-option label="玻璃" value="玻璃"></el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="位置示意图" prop="locationDiagram">
+            <!-- <upimg filePath="gg" :value="formInline.locationDiagram" @changimg="e=>changimg(e,'locationDiagram')" :limit="1" :fileSize="1"></upimg> -->
+            <upimg filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram" @changimg="e=>changimg(e,'locationDiagram')"></upimg>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item>
+            <div style="margin-top: 20px">
+              <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+              <el-button @click="close()" class="buttonHover"
+                style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import MapMark from "@/components/MapContainer/MapMark";
+  import upimg from "@/components/ImageUpload/index"
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import {
+    miniioupload
+  } from '../../api/commodityLease.js'
+  import {
+    gongyuan,
+    lvdaoduan,
+    addList,
+    editList
+  } from '../../api/map1.js';
+
+  export default {
+    components: {
+      upimg,
+      MapMark
+    },
+    data() {
+      return {
+        ontype:'线上广告位',
+        typelist:[
+          {
+            name:'线上广告位',
+            vaule:'线上广告位'
+          },
+          {
+            name:'实体广告位',
+            vaule:'实体广告位'
+          },
+        ],
+        //地图标点的经纬度
+        mapData: {},
+        uploadFileUrl: uploadUrl, // 请求地址
+        formInline: {
+          advertisingName: '', //广告位名称
+          advertisingType: '', //广告位类型
+          rotationOrder: '', // 轮播顺序
+          createUser: '', // 创建人
+          affiliation: '', //所属端
+          detailedLocation: '', //详细位置
+          dimensions: '', //广告尺寸
+          size: '', //广告大小
+          uploadFormat: '', //上传类型
+          advertisingSpaceStrategy: '', //策略
+          advertisingSpaceNumber: '', //广告位编号
+          locationDiagram: '', //位置示意图
+          mapPunctuation: '', //地图标点
+          deviceType: '', //设备类型
+          equipmentSize: '', //设备尺寸
+          advertisingMaterial: '', //广告材质
+          createDate: '', //创建时间
+          equipmentSizeH: "",
+          equipmentSizeK: '',
+          equipmentSizeG: '',
+          dimensionsH: '',
+          dimensionsK: '',
+          rentalStatus: '0',
+          publishStatus: '0'
+        },
+        rules: {
+          advertisingName: [{
+            required: true,
+            message: '请输入名称',
+            trigger: ['blur', 'change']
+          }],
+          advertisingType: [{
+            required: true,
+            message: '请选择类型',
+            trigger: ['blur', 'change']
+          }],
+          affiliation: [{
+            required: true,
+            message: '请选择所属端',
+            trigger: ['blur', 'change']
+          }],
+          rotationOrder: [{
+            required: true,
+            message: '请选择轮播顺序',
+            trigger: ['blur', 'change']
+          }],
+
+        },
+        rulesSt: {
+          advertisingName: [{
+            required: true,
+            message: '请输入名称',
+            trigger: ['blur', 'change']
+          }],
+          advertisingType: [{
+            required: true,
+            message: '请选择类型',
+            trigger: ['blur', 'change']
+          }],
+          position: [{
+            required: true,
+            message: '请输入详细位置',
+            trigger: ['blur', 'change']
+          }],
+          dimensionsH: [{
+            required: true,
+            message: '请选择广告尺寸',
+            trigger: ['blur', 'change']
+          }],
+          dimensionsK: [{
+            required: true,
+            message: '请选择广告尺寸',
+            trigger: ['blur', 'change']
+          }],
+          advertisingMaterial: [{
+            required: true,
+            message: '请选择材质',
+            trigger: ['blur', 'change']
+          }],
+        },
+        uploadFiles: [],
+        filesLength: 1,
+        gongyuanList: [],
+        fileData: [],
+        parentMessage: {},
+        edit: true
+      };
+    },
+    props: {
+      info: {
+        type: Object,
+        default: {}
+      },
+      leixing: {
+        type: Boolean,
+        default: true
+      }
+    },
+    async created() {
+      if (this.info && this.info.id) {
+        this.formInline = this.info
+        if (this.leixing == false) {
+          this.parentMessage = JSON.parse(this.info.mapPunctuation)
+        }
+        this.ontype = this.formInline.advertisingType
+        if(this.ontype == '线上广告位') {
+          this.typelist = [
+          {
+            name:'线上广告位',
+            vaule:'线上广告位'
+          }]
+        } else {
+          this.typelist = [
+          {
+            name:'实体广告位',
+            vaule:'实体广告位'
+          }]
+        }
+      } else {
+        if (this.leixing ) {
+         this.ontype = '线上广告位'
+         this.formInline.advertisingType = '线上广告位'
+        } else {
+          this.ontype = '实体广告位'
+          this.formInline.advertisingType = '实体广告位'
+        }
+      }
+    },
+    methods: {
+      changimg(e,type) {
+        this.formInline[type] = e
+      },
+      changeadvertisingType(e){
+        console.error(e)
+        this.ontype = e
+      },
+      //获取当前时间
+      updateCurrentTime() {
+        const now = new Date();
+        const year = now.getFullYear();
+        const month = (now.getMonth() + 1).toString().padStart(2, '0');
+        const day = now.getDate().toString().padStart(2, '0');
+        const hours = now.getHours().toString().padStart(2, '0');
+        const minutes = now.getMinutes().toString().padStart(2, '0');
+        const seconds = now.getSeconds().toString().padStart(2, '0');
+
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      },
+      //获取地图点击的经纬度
+      getChildDate(mapData) {
+        this.mapData = mapData
+
+      },
+      lvdaoSel(vaule) {
+        this.formInline.belongingParkTrail = ''
+        this.gongyuan(vaule)
+      },
+      async gongyuan(value) {
+        const gongyaun = await gongyuan()
+        this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
+      },
+      add() {
+
+        if (this.formInline.id) {
+          this.$refs.formInline.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              this.formInline.updateDate = this.updateCurrentTime()
+
+              if (this.leixing == false) {
+                if (Object.keys(this.mapData).length != 0) {
+                  this.formInline.mapPunctuation = JSON.stringify(this.mapData)
+                }
+
+                this.formInline.equipmentSize =
+                  `长：${this.formInline.equipmentSizeH} 宽：${this.formInline.equipmentSizeK} 高：${this.formInline.equipmentSizeG}`
+                this.formInline.dimensions = `长：${this.formInline.dimensionsH} 宽：${this.formInline.dimensionsK}`
+              }
+
+              editList(this.formInline).then(res => {
+                if (res.code == 200) {
+                  this.$message({
+                    message: '修改成功',
+                    type: 'success'
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+
+
+          })
+        } else {
+          this.$refs.formInline.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              this.formInline.createDate = this.updateCurrentTime()
+              if (this.leixing) {
+                this.formInline.dimensions = '宽:300px 长:400px'
+                this.formInline.size = '100kb'
+                this.formInline.uploadFormat = 'JPG、PNG、MP4'
+              } else {
+                this.formInline.mapPunctuation = JSON.stringify(this.mapData)
+                this.formInline.equipmentSize =
+                  `长：${this.formInline.equipmentSizeH} 宽：${this.formInline.equipmentSizeK} 高：${this.formInline.equipmentSizeG}`
+                this.formInline.dimensions = `长：${this.formInline.dimensionsH} 宽：${this.formInline.dimensionsK}`
+              }
+              addList(this.formInline).then(res => {
+                if (res.code == 200) {
+                  this.$message({
+                    message: '添加成功',
+                    type: 'success'
+                  })
+                  this.$emit('removeonaction', '1')
+                } else {
+                  this.$message({
+                    message: res.msg,
+                    type: 'error'
+                  })
+                }
+
+              })
+            } else {
+              this.$message({
+                message: '请填写完整信息',
+                type: 'error'
+              })
+              return false;
+            }
+          })
+
+        }
+      },
+      close() {
+        this.$emit('removeonaction', '1')
+      },
+      hefuRemove() {
+        this.hefuData = []
+      },
+      hefuSuccess(response, file, fileList) {
+        this.fileData = []
+        console.error(response)
+        let fd = new FormData()
+        fd.append('file', response.raw)
+        fd.append('filePath', 'hetong')
+        miniioupload(fd).then(res => {
+          console.error(res)
+          const fileMsg = {
+            name: response.name,
+            url: res.data,
+          }
+          this.fileData.push(fileMsg)
+        })
+      },
+
+
+    },
+  };
+</script>
+<style lang="scss">
+  .el-upload {
+    display: block;
+    /* text-align: left; */
+  }
+
+  .video-uploader {
+    .el-upload {
+      text-align: left;
+    }
+  }
+
+  .el-dialog__header {
+    background-color: #F2F3F5;
+    text-align: left;
+  }
+
+  .el-dialog__title {
+    line-height: 30px;
+    font-size: 15px;
+    color: #303133;
+  }
+</style>
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 8b6ab78..51252ab 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -1,185 +1,106 @@
 <template>
   <div>
-    <el-form :model="formInline" :rules="leixing?rules:rulesSt" ref="formInline" label-width="100px"
+    <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
       class="demo-ruleForm">
+      <el-form-item label="广告位类型" prop="advertisingType">
+        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+          <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="广告位名称" prop="advertisingName">
+        <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
+      </el-form-item>
+      <el-form-item label="所属端" prop="affiliation" >
+        <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;">
+          <el-option label="游客小程序" value="游客小程序"></el-option>
+          <el-option label="商家客户端" value="商家客户端"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="轮播顺序" prop="rotationOrder" >
+        <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
+          <el-option label="1" value="1"></el-option>
+          <el-option label="2" value="2"></el-option>
+          <el-option label="3" value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="广告尺寸" prop="dimensions" >
+        <el-input v-model="formInline.dimensions" placeholder="宽:300px 长:400px" maxlength="20"></el-input>
+      </el-form-item>
+      <el-form-item label="可上传大小" prop="size" >
+        <el-input v-model="formInline.size"  placeholder="100kb" maxlength="20"></el-input>
+      </el-form-item>
+      <el-form-item label="播放时长(秒)" prop="playDuration" >
+        <el-input v-model.number="formInline.playDuration" maxlength="20"  placeholder="请输入" @input="validateNumber('playDuration', $event)"></el-input>
+      </el-form-item>
+      <el-form-item label="推送地址" prop="pushAddress" >
+        <el-input v-model="formInline.pushAddress"  placeholder="请输入" maxlength="50"></el-input>
+      </el-form-item>
+      <el-form-item label="位置示意图" prop="locationDiagram">
+        <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
+          @changimg="e=>changimg(e,'locationDiagram')"></upimg>
+      </el-form-item>
+      <el-form-item label="备注信息" prop="memo">
+        <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
+          type="textarea" />
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="广告位名称" prop="advertisingName">
-            <el-input v-model="formInline.advertisingName" placeholder="请输入" style="margin-top:5px;"
-              maxlength="50"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
-            <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号"
-              style="margin-top:5px;"></el-input>
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="广告位类型" prop="advertisingType">
-            <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
-              <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
-              <!-- <el-option label="实体广告位" value="实体广告位" v-else></el-option> -->
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
-            <el-select v-model="formInline.affiliation" placeholder="请选择" style="margin-top:5px;width: 100%;">
-              <el-option label="游客小程序" value="游客小程序"></el-option>
-              <el-option label="商家客户端" value="商家客户端"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
-            <el-input v-model="formInline.detailedLocation" placeholder="请输入" style="margin-top:5px;"
-              maxlength="200"></el-input>
-            <!-- </el-select> -->
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="地图标点" prop="mapPunctuation" v-if="ontype =='实体广告位'">
-            <div style="width: 100%;height: 300px;">
-              <map-mark :sendChildDate="getChildDate"></map-mark>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
-            <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="margin-top:5px;width: 100%;">
-              <el-option label="1" value="1"></el-option>
-              <el-option label="2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
-            <el-input v-model="formInline.dimensions" disabled placeholder="宽:300px 长:400px"
-              style="margin-top:5px;"></el-input>
-
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-
-
-
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
-            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
-            <el-input v-model="formInline.uploadFormat" disabled placeholder="JPG、PNG、MP4"
-              style="margin-top:5px;"></el-input>
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="可上传大小" prop="size" v-if="ontype =='实体广告位'">
-            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
-          </el-form-item>
-          <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
-            <div style="display: flex;justify-content: space-between;">
-              <el-select v-model="formInline.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
-                <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
-
-              </el-select>
-            </div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="设备大小" prop="equipmentSize" v-if="ontype =='实体广告位'">
-            <div style="display: flex;">
-              <div>
-                <span style="font-size: 14px;">长：</span>
-                <el-select v-model="formInline.equipmentSizeH" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
-                  <el-option label="10" value="10"></el-option>
-                  <el-option label="20" value="20"></el-option>
-                </el-select>
-                <span style="font-size: 14px;margin-right:5px;">mm</span>
-              </div>
-              <div>
-                <span style="font-size: 14px;">宽：</span>
-                <el-select v-model="formInline.equipmentSizeK" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
-                  <el-option label="10" value="10"></el-option>
-                  <el-option label="20" value="20"></el-option>
-                </el-select>
-                <span style="font-size: 14px;margin-right:5px;">mm</span>
-              </div>
-              <div>
-                <span style="font-size: 14px;">高：</span>
-                <el-select v-model="formInline.equipmentSizeG" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
-                  <el-option label="10" value="10"></el-option>
-                  <el-option label="20" value="20"></el-option>
-                </el-select>
-                <span style="font-size: 14px;margin-right:5px;">mm</span>
-              </div>
-            </div>
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="广告尺寸" v-if="ontype =='实体广告位'">
-            <div style="display: flex;">
-              <div>
-                <span style="font-size: 14px;">长：</span>
-                <el-select v-model="formInline.dimensionsH" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
-                  <el-option label="10" value="10"></el-option>
-                  <el-option label="20" value="20"></el-option>
-                </el-select>
-                <span style="font-size: 14px;margin-right:5px;">mm</span>
-              </div>
-              <div>
-                <span style="font-size: 14px;">宽：</span>
-                <el-select v-model="formInline.dimensionsK" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
-                  <el-option label="10" value="10"></el-option>
-                  <el-option label="20" value="20"></el-option>
-                </el-select>
-                <span style="font-size: 14px;margin-right:5px;">mm</span>
-              </div>
-            </div>
-          </el-form-item>
-
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
-            <div style="display: flex;justify-content: space-between;">
-              <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="margin-top:5px;width: 92%">
-                <el-option label="亚克力" value="亚克力"></el-option>
-                <el-option label="玻璃" value="玻璃"></el-option>
-              </el-select>
+          <el-form-item>
+            <div style="margin-top: 20px">
+              <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+              <el-button @click="close()" class="buttonHover"
+                style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
             </div>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="位置示意图" prop="locationDiagram">
-            <!-- <upimg filePath="gg" :value="formInline.locationDiagram" @changimg="e=>changimg(e,'locationDiagram')" :limit="1" :fileSize="1"></upimg> -->
-            <upimg filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram" @changimg="e=>changimg(e,'locationDiagram')"></upimg>
-          </el-form-item>
-        </el-col>
-      </el-row>
+    </el-form>
+    <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
+      class="demo-ruleForm">
+      <el-form-item label="广告位类型" prop="advertisingType">
+        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+          <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="广告位名称" prop="advertisingName">
+        <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
+      </el-form-item>
+      <el-form-item label="详细位置" prop="detailedLocation">
+        <el-input v-model="formInline.detailedLocation" placeholder="请输入" maxlength="50"></el-input>
+      </el-form-item>
+      <el-form-item label="地图标点" prop="mapPunctuation" >
+        <!-- <div style="width: 100%;height: 300px;">
+          <map-mark :sendChildDate="getChildDate"></map-mark>
+        </div> -->
+        <div style="width: 100%;height: 300px;">
+          <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
+        </div>
+      </el-form-item>
+      <el-form-item label="设备类型" prop="deviceType" >
+        <div style="display: flex;justify-content: space-between;">
+          <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 92%;">
+            <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item label="设备大小" prop="equipmentSize" >
+        <el-input v-model="formInline.equipmentSize" placeholder="宽:300mm 长:400mm 高: 400mm"  maxlength="30"></el-input>
+      </el-form-item>
+      <el-form-item label="广告尺寸" prop="dimensions">
+        <el-input v-model="formInline.dimensions" placeholder="宽:300px 长:400px"  maxlength="20"></el-input>
+      </el-form-item>
+      <el-form-item label="广告材质" prop="advertisingMaterial">
+        <div style="display: flex;justify-content: space-between;">
+          <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 100%">
+            <el-option label="亚克力" value="亚克力"></el-option>
+            <el-option label="玻璃" value="玻璃"></el-option>
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item label="位置示意图" prop="locationDiagram">
+        <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
+          @changimg="e=>changimg(e,'locationDiagram')"></upimg>
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -192,10 +113,12 @@
         </el-col>
       </el-row>
     </el-form>
+
   </div>
 </template>
 
 <script>
+  import newmap from "@/components/newmap/index";
   import MapMark from "@/components/MapContainer/MapMark";
   import upimg from "@/components/ImageUpload/index"
   import {
@@ -214,103 +137,118 @@
   export default {
     components: {
       upimg,
-      MapMark
+      MapMark,
+      newmap
     },
     data() {
       return {
-        ontype:'线上广告位',
-        typelist:[
-          {
-            name:'线上广告位',
-            vaule:'线上广告位'
+        lat: 30.67,
+        lng: 104.06,
+        ontype: '线上广告位',
+        typelist: [{
+            name: '线上广告位',
+            vaule: '线上广告位'
           },
           {
-            name:'实体广告位',
-            vaule:'实体广告位'
+            name: '实体广告位',
+            vaule: '实体广告位'
           },
         ],
         //地图标点的经纬度
         mapData: {},
         uploadFileUrl: uploadUrl, // 请求地址
         formInline: {
-          advertisingName: '', //广告位名称
-          advertisingType: '', //广告位类型
+          advertisingName: '', // 广告位名称
+          advertisingType: '线上广告位', // 广告位类型
+          affiliation: '', // 所属端
+          detailedLocation: '', // 详细位置
           rotationOrder: '', // 轮播顺序
+          dimensions: '', // 广告尺寸
+          size: '', // 广告大小
+          uploadFormat: '', // 上传格式
+          advertisingSpaceStrategy: '', // 广告位策略
+          advertisingSpaceNumber: '', // 广告位编号
+          locationDiagram: '', // 位置示意图
+          mapPunctuation: '', // 地图标点
+          deviceType: '', // 设备类型
+          equipmentSize: '', // 设备尺寸
+          advertisingMaterial: '', // 广告材质
+          createDate: '', // 创建时间
           createUser: '', // 创建人
-          affiliation: '', //所属端
-          detailedLocation: '', //详细位置
-          dimensions: '', //广告尺寸
-          size: '', //广告大小
-          uploadFormat: '', //上传类型
-          advertisingSpaceStrategy: '', //策略
-          advertisingSpaceNumber: '', //广告位编号
-          locationDiagram: '', //位置示意图
-          mapPunctuation: '', //地图标点
-          deviceType: '', //设备类型
-          equipmentSize: '', //设备尺寸
-          advertisingMaterial: '', //广告材质
-          createDate: '', //创建时间
-          equipmentSizeH: "",
-          equipmentSizeK: '',
-          equipmentSizeG: '',
-          dimensionsH: '',
-          dimensionsK: '',
-          rentalStatus: '0',
-          publishStatus: '0'
+          // updateDate: '', // 修改时间
+          // updateUser: '', // 修改人
+          rentalStatus: '', // 租赁状态
+          publishStatus: '', // 发布状态
+          leaseExpirationDate: '', // 租赁到期时间
+          contractNumber: '', // 合同编号
+          advertisingNumber: null, // 广告位数量
+          playDuration: null, // 播放时长
+          pushAddress: '', // 推送地址
+          memo: '', // 备注信息
+          onlineType: '' // 线上类型
         },
         rules: {
-          advertisingName: [{
+          advertisingType: [{
             required: true,
-            message: '请输入名称',
-            trigger: ['blur', 'change']
+            message: '请选择广告类型',
+            trigger: ['change']
           }],
-          advertisingType: [{
+          advertisingName: [{
             required: true,
-            message: '请选择类型',
-            trigger: ['blur', 'change']
+            message: '请输入广告位名称',
+            trigger: ['change']
           }],
           affiliation: [{
             required: true,
             message: '请选择所属端',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }],
           rotationOrder: [{
             required: true,
             message: '请选择轮播顺序',
-            trigger: ['blur', 'change']
+            trigger: ['change']
+          }],
+          locationDiagram: [{
+            required: true,
+            message: '请上传位置示意图',
+            trigger: ['change']
           }],
-
         },
         rulesSt: {
-          advertisingName: [{
+          advertisingType: [{
             required: true,
-            message: '请输入名称',
-            trigger: ['blur', 'change']
+            message: '请选择广告类型',
+            trigger: ['change']
           }],
-          advertisingType: [{
+          advertisingName: [{
             required: true,
-            message: '请选择类型',
-            trigger: ['blur', 'change']
+            message: '请输入广告位名称',
+            trigger: ['change']
           }],
-          position: [{
+          detailedLocation: [{
             required: true,
             message: '请输入详细位置',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }],
-          dimensionsH: [{
+          mapPunctuation: [{
             required: true,
-            message: '请选择广告尺寸',
-            trigger: ['blur', 'change']
+            message: '请选择地图标点',
+            trigger: ['change']
           }],
-          dimensionsK: [{
+          dimensions: [{
             required: true,
             message: '请选择广告尺寸',
-            trigger: ['blur', 'change']
+            trigger: ['change']
           }],
           advertisingMaterial: [{
             required: true,
-            message: '请选择材质',
-            trigger: ['blur', 'change']
+            message: '请选择广告材质',
+            trigger: ['change']
+          }],
+          locationDiagram: [{
+            required: true,
+            message: '请上传位置示意图',
+            trigger: ['change']
           }],
         },
         uploadFiles: [],
@@ -322,6 +260,10 @@
       };
     },
     props: {
+      type: {
+        type: String,
+        default: 'one'
+      },
       info: {
         type: Object,
         default: {}
@@ -334,27 +276,26 @@
     async created() {
       if (this.info && this.info.id) {
         this.formInline = this.info
-        if (this.leixing == false) {
-          this.parentMessage = JSON.parse(this.info.mapPunctuation)
+        if (this.formInline.mapPunctuation) {
+          this.lat = Number(this.formInline.mapPunctuation.split(',')[0])
+          this.lng = Number(this.formInline.mapPunctuation.split(',')[1])
         }
         this.ontype = this.formInline.advertisingType
-        if(this.ontype == '线上广告位') {
-          this.typelist = [
-          {
-            name:'线上广告位',
-            vaule:'线上广告位'
+        if (this.ontype == '线上广告位') {
+          this.typelist = [{
+            name: '线上广告位',
+            vaule: '线上广告位'
           }]
         } else {
-          this.typelist = [
-          {
-            name:'实体广告位',
-            vaule:'实体广告位'
+          this.typelist = [{
+            name: '实体广告位',
+            vaule: '实体广告位'
           }]
         }
       } else {
-        if (this.leixing ) {
-         this.ontype = '线上广告位'
-         this.formInline.advertisingType = '线上广告位'
+        if (this.leixing) {
+          this.ontype = '线上广告位'
+          this.formInline.advertisingType = '线上广告位'
         } else {
           this.ontype = '实体广告位'
           this.formInline.advertisingType = '实体广告位'
@@ -362,10 +303,23 @@
       }
     },
     methods: {
-      changimg(e,type) {
+      validateNumber(field, value) {
+      // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
+        const regex = /^\d+(\.\d{1,2})?$/;
+        if (!regex.test(value)) {
+          this.ruleForm[field] = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
+        }
+      },
+      updatecenter(e) {
+        console.error('-----------', e)
+        this.formInline.detailedLocation = e.address
+        this.lat = e.lat
+        this.lng = e.lng
+      },
+      changimg(e, type) {
         this.formInline[type] = e
       },
-      changeadvertisingType(e){
+      changeadvertisingType(e) {
         console.error(e)
         this.ontype = e
       },
@@ -395,23 +349,15 @@
         this.gongyuanList = gongyaun.data.filter(item => item.superior == value);
       },
       add() {
-
+        if(this.lat) {
+          this.formInline.mapPunctuation = this.lat + ',' + this.lng
+        }
         if (this.formInline.id) {
           this.$refs.formInline.validate((valid) => {
             console.log(valid)
             if (valid) {
               this.formInline.updateDate = this.updateCurrentTime()
-
-              if (this.leixing == false) {
-                if (Object.keys(this.mapData).length != 0) {
-                  this.formInline.mapPunctuation = JSON.stringify(this.mapData)
-                }
-
-                this.formInline.equipmentSize =
-                  `长：${this.formInline.equipmentSizeH} 宽：${this.formInline.equipmentSizeK} 高：${this.formInline.equipmentSizeG}`
-                this.formInline.dimensions = `长：${this.formInline.dimensionsH} 宽：${this.formInline.dimensionsK}`
-              }
-
+              this.formInline.updateUser = localStorage.getItem('roleName')
               editList(this.formInline).then(res => {
                 if (res.code == 200) {
                   this.$message({
@@ -442,16 +388,14 @@
             console.log(valid)
             if (valid) {
               this.formInline.createDate = this.updateCurrentTime()
-              if (this.leixing) {
-                this.formInline.dimensions = '宽:300px 长:400px'
-                this.formInline.size = '100kb'
-                this.formInline.uploadFormat = 'JPG、PNG、MP4'
+              this.formInline.createUser = localStorage.getItem('roleName')
+              if (this.ontype =='线上广告位') {
+             
               } else {
-                this.formInline.mapPunctuation = JSON.stringify(this.mapData)
-                this.formInline.equipmentSize =
-                  `长：${this.formInline.equipmentSizeH} 宽：${this.formInline.equipmentSizeK} 高：${this.formInline.equipmentSizeG}`
-                this.formInline.dimensions = `长：${this.formInline.dimensionsH} 宽：${this.formInline.dimensionsK}`
+               
+              
               }
+              this.formInline.publishStatus = 0
               addList(this.formInline).then(res => {
                 if (res.code == 200) {
                   this.$message({
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index eee8d4e..ba20be5 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -8,109 +8,78 @@
             <div style="padding: 20px;">
               <el-form :model="editbgid" ref="formInline" label-width="120px" class="demo-ruleForm">
                 <el-row :gutter="20">
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="场地名称" prop="venueName">
-                      <div  class="duiqi">{{editbgid.venueName}}</div>
-                
+                      <div class="duiqi">{{editbgid.venueName  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="场地类型" prop="venueType">
-                      <div class="duiqi" >{{editbgid.venueType}}</div>
-                
+                      <div class="duiqi">{{editbgid.venueType  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="实际使用面积" prop="actualArea">
-                      <div  class="duiqi">{{editbgid.actualArea}}</div>
-               
+                      <div class="duiqi">{{editbgid.actualArea  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="8">
                     <el-form-item label="所属区域" prop="district">
-                      <div  class="duiqi">{{editbgid.district}}</div>
-              
+                      <div  class="duiqi">{{editbgid.district  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="归属部门" prop="department">
-                      <div  class="duiqi">{{editbgid.department}}</div>
-                
+                      <div  class="duiqi">{{editbgid.department  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <el-col :span="8">
                     <el-form-item label="负责人" prop="responsiblePerson">
-                      <div  class="duiqi">{{editbgid.belongingParkTrail}}</div>
-              
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="详细位置" prop="detailedLocation">
-                      <div  class="duiqi">{{editbgid.detailedLocation}}</div>
-          
+                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
-                  <el-col :span="24">
-                    <el-form-item label="地图标点" prop="mapMarker">
-                      <div style="width: 100%;height: 300px;">
-                        <MapXian :message="parentMessage"></MapXian>
-
-                      </div>
+                  <el-col :span="8">
+                    <el-form-item label="联系人" prop="contact">
+                      <div  class="duiqi">{{editbgid.contact  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-
-                </el-row>
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="场地描述" prop="description">
-                      <div  class="duiqi">{{editbgid.description}}</div>
-             
+                  <el-col :span="8">
+                    <el-form-item label="联系电话" prop="phoneNumber">
+                      <div  class="duiqi">{{editbgid.belongingParkTrail  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-
                 </el-row>
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="规划图纸" prop="planningDrawing">
-                      <!-- <img :src="editbgid.planningDrawing" alt="" style="width:140px;height:140px;" > -->
-
-                      <div >
-                        <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                          v-for="item in editbgid.planningDrawing.split(',')">
-                      </div>
-                 
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="展示主图" prop="displayImage">
-                      <div >
-                        <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                          v-for="item in editbgid.displayImage.split(',')">
-                      </div>
-                      <!-- <img :src="$baseURL+editbgid.displayImage" alt="" style="width:140px;height:140px;" > -->
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <!-- <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="其他图片/视频" prop="otherMedia">
-                      <div  class="duiqi">{{editbgid.otherMedia}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row> -->
+                <el-form-item label="详细位置" prop="detailedLocation">
+                    <div  class="duiqi">{{editbgid.detailedLocation  || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapMarker">
+                  <div style="width: 100%;height: 300px;">
+                    <newmap :isx="false" :message="editbgid.mapMarker"></newmap>
+                  </div>
+                </el-form-item>
+                <el-form-item label="场地描述" prop="description">
+                  <div  class="duiqi">{{editbgid.description  || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="规划图纸" prop="planningDrawing">
+                  <div v-if="editbgid.planningDrawing">
+                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
+                      v-for="item in editbgid.planningDrawing.split(',')">
+                  </div>
+                  <div  class="duiqi" v-else>无</div>
+                </el-form-item>
+                <el-form-item label="展示主图" prop="displayImage">
+                  <div >
+                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
+                      v-for="item in editbgid.displayImage.split(',')">
+                  </div>
+                </el-form-item>
+                <el-form-item label="其他视频" prop="otherImageVideos"  >
+                  <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
+                </el-form-item>
               </el-form>
             </div>
           </div>
@@ -175,9 +144,11 @@
     cereResourceStrategylist,
     cereBusinessPlan
   } from '@/api/newly';
+  import newmap from "@/components/newmap/index";
   export default {
     components: {
       TitleWithCircle,
+      newmap,
       MapXian
     },
     props: {
@@ -206,7 +177,7 @@
         let c1 = {
           pageNumber: 0,
           pageSize: 10,
-          resourcesId: 'sp' + this.editbgid.id
+          resourcesId: 'cd' + this.editbgid.id
         }
         cereResourceStrategylist(c1).then(res => {
           console.error(res)
@@ -216,11 +187,7 @@
           console.error(res)
           this.datalist1 = res.data
         })
-        if (typeof this.editbgid.mapMarker == 'string' && this.editbgid.mapMarker != '') {
-          this.parentMessage = JSON.parse(this.editbgid.mapMarker)
-        } else {
-          this.parentMessage = this.editbgid.mapMarker
-        }
+
       }
       
     },
@@ -228,6 +195,18 @@
 
     },
     methods: {
+      openfile(e) {
+        if (e) {
+          const fullUrl = e;
+          try {
+            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+          } catch (error) {
+            console.error('打开文件失败:', error);
+          }
+        } else {
+          console.error('无文件可查看');
+        }
+      },
       changetype() {
         this.xiangTab = 'first'
         this.$emit('removeonaction', '1')
diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue
index 9d42766..d99d1c5 100644
--- a/admin-web-master/src/components/chakan/map.vue
+++ b/admin-web-master/src/components/chakan/map.vue
@@ -10,131 +10,92 @@
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="广告位名称" prop="advertisingName">
-                      <div class="duiqi">{{editbgid.advertisingName}}</div>
+                      <div class="duiqi">{{editbgid.advertisingName || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
-                      <div class="duiqi">{{editbgid.advertisingSpaceNumber}}</div>
+                      <div class="duiqi">{{editbgid.advertisingSpaceNumber || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="广告位类型" prop="advertisingType">
-                      <div class="duiqi">{{editbgid.advertisingType}}</div>
-                      </el-select>
+                      <div class="duiqi">{{editbgid.advertisingType || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-row :gutter="20">
-
+                <el-row :gutter="20" v-if="editbgid.advertisingType == '线上广告位'">
                   <el-col :span="8">
-                    <el-form-item label="所属端" prop="affiliation" v-if='leixing'>
-                      <div class="duiqi">{{editbgid.affiliation}}</div>
-                    </el-form-item>
-                    <el-form-item label="详细位置" prop="detailedLocation" v-if='leixing == false'>
-                      <div class="duiqi">{{editbgid.detailedLocation}}</div>
+                    <el-form-item label="所属端" prop="affiliation" >
+                      <div class="duiqi">{{editbgid.affiliation || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="轮播顺序" prop="rotationOrder" v-if='leixing'>
-                      <div class="duiqi">{{editbgid.rotationOrder}}</div>
-
+                    <el-form-item label="广告位数量" prop="advertisingNumber" >
+                      <div class="duiqi">{{editbgid.advertisingNumber || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="广告尺寸" prop="dimensions" v-if='leixing'>
-                      <div class="duiqi">{{editbgid.dimensions}}</div>
+                    <el-form-item label="广告尺寸" prop="dimensions">
+                      <div class="duiqi">{{editbgid.dimensions || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="24">
-                    <el-form-item label="地图标点" prop="mapPunctuation" v-if='leixing == false'>
-                      <div style="width: 100%;height: 300px;">
-                        <MapXian :message="parentMessage"></MapXian>
-                      </div>
+                  <el-col :span="8">
+                    <el-form-item label="可上传大小" prop="size">
+                      <div class="duiqi">{{editbgid.size || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-
-                <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="可上传大小" prop="size" v-if='leixing'>
-                      <div class="duiqi">{{editbgid.size}}</div>
+                    <el-form-item label="播放时长" prop="playDuration">
+                      <div class="duiqi">{{editbgid.playDuration || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="上传格式" prop="uploadFormat" v-if='leixing'>
-                      <div class="duiqi">{{editbgid.uploadFormat}}</div>
+                    <el-form-item label="推送地址" prop="pushAddress">
+                      <div class="duiqi">{{editbgid.pushAddress || '无'}}</div>
                     </el-form-item>
                   </el-col>
+                </el-row>
+                <el-row :gutter="20" v-if="editbgid.advertisingType == '实体广告位'">
                   <el-col :span="8">
-                    <el-form-item label="设备类型" prop="deviceType" v-if='leixing == false'>
-                      <div class="duiqi">{{editbgid.deviceType}}</div>
+                    <el-form-item label="设备类型" prop="deviceType" >
+                      <div class="duiqi">{{editbgid.deviceType || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
-
-                  <el-col :span="12">
-                    <el-form-item label="设备大小" prop="equipmentSize" v-if='leixing == false'>
-                      <div style="display: flex;">
-                        <div>
-                          <span style="font-size: 14px;">长：</span>
-                          <span>{{ editbgid.equipmentSizeH }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">宽：</span>
-                          <span>{{ editbgid.equipmentSizeK }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">高：</span>
-                          <span>{{ editbgid.equipmentSizeG }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                      </div>
-
+                  <el-col :span="8">
+                    <el-form-item label="设备大小" prop="equipmentSize" >
+                      <div class="duiqi">{{editbgid.equipmentSize || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="广告尺寸" v-if='leixing == false'>
-                      <div style="display: flex;">
-                        <div>
-                          <span style="font-size: 14px;">长：</span>
-                          <span>{{ editbgid.dimensionsH }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">宽：</span>
-                          <span>{{ editbgid.dimensionsK }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                      </div>
+                  <el-col :span="8">
+                    <el-form-item label="广告尺寸" prop="dimensions">
+                      <div class="duiqi">{{editbgid.dimensions || '无'}}</div>
                     </el-form-item>
                   </el-col>
-
-                </el-row>
-                <el-row :gutter="20">
-
-
                   <el-col :span="8">
-                    <el-form-item label="广告材质" prop="advertisingMaterial" v-if='leixing == false'>
-                      <div class="duiqi">{{editbgid.advertisingMaterial}}</div>
+                    <el-form-item label="广告材质" prop="advertisingMaterial">
+                      <div class="duiqi">{{editbgid.advertisingMaterial || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-form-item label="详细位置" prop="detailedLocation" v-if="editbgid.advertisingType == '实体广告位'">
+                  <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapPunctuation" v-if="editbgid.advertisingType == '实体广告位'">
+                  <div style="width: 100%;height: 300px;">
+                    <newmap :isx="false" :message="editbgid.mapPunctuation"></newmap>
+                  </div>
+                </el-form-item>
+                <el-form-item label="位置示意图" prop="locationDiagram">
+                  <img  v-for="item in editbgid.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                </el-form-item>
+                
+                <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
+                  <div class="duiqi">{{editbgid.memo || '无'}}</div>
+                </el-form-item>
 
 
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="位置示意图" prop="locationDiagram">
-                      <img :src="$baseURL+editbgid.locationDiagram" alt="" style="width:140px;height:140px;">
-                    </el-form-item>
-                  </el-col>
-
-                </el-row>
+                
 
 
 
@@ -196,6 +157,7 @@
 </template>
 
 <script>
+  import newmap from "@/components/newmap/index";
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
   import {
@@ -205,7 +167,8 @@
   export default {
     components: {
       TitleWithCircle,
-      MapXian
+      MapXian,
+      newmap
     },
     props: {
       leixing: {
@@ -237,34 +200,20 @@
         }
         cereResourceStrategylist(c1).then(res => {
           console.error(res)
+          if (!Array.isArray(res.data)) {
+            this.datalist = [];
+            return;
+          }
           this.datalist = res.data
         })
         cereBusinessPlan(c1).then(res => {
           console.error(res)
-          this.datalist1 = res.data
-        })
-        let dimensions_parts = this.editbgid.dimensions.split(" ")
-        let dimensions = this.editbgid.equipmentSize.split(" ")
-
-        dimensions_parts.forEach(part => {
-          if (part.startsWith("长")) {
-            this.editbgid.dimensionsH = part.split("：")[1];
-          } else if (part.startsWith("宽")) {
-            this.editbgid.dimensionsK = part.split("：")[1];
-          }
-        })
-        dimensions.forEach(part => {
-          if (part.startsWith("长")) {
-            this.editbgid.equipmentSizeH = part.split("：")[1];
-          } else if (part.startsWith("宽")) {
-            this.editbgid.equipmentSizeK = part.split("：")[1];
-          } else if (part.startsWith("高")) {
-            this.editbgid.equipmentSizeG = part.split("：")[1];
+          if (!Array.isArray(res.data)) {
+            this.datalist1 = [];
+            return;
           }
+          this.datalist1 = res.data
         })
-        if (this.leixing == false) {
-          this.parentMessage = JSON.parse(this.editbgid.mapPunctuation)
-        }
       }
 
 
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 249f305..981bb1f 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -1,36 +1,48 @@
 <template>
   <div class="policy-selector">
-    <!-- <div class="policy-selector-header">
-      <h3>选择策略</h3>
-    </div> -->
-    <div class="policy-selector-content" style="max-height:50vh;overflow-y: auto;">
-      <el-table
-        :data="celueData"
-        tooltip-effect="dark"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-      >
-        <el-table-column label="选择" type="selection" width="55"></el-table-column>
-        <el-table-column label="策略名称" prop="policyName" min-width="200"></el-table-column>
-        <el-table-column label="适用资源" prop="applicableResources" min-width="100"></el-table-column>
-        <el-table-column label="经营类型" prop="businessType" min-width="150"></el-table-column>
-        <el-table-column label="租金价格" prop="rentalPrice" min-width="150"></el-table-column>
-        <el-table-column label="租期" prop="leaseTerm" min-width="100"></el-table-column>
-        <el-table-column label="是否出租" prop="planningObjectives" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.isrental == '0' ? '否' : '是' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.isSelfOperated == '0' ? '否' : '是' }}
-          </template>
-        </el-table-column>
-      </el-table>
+    <div class="policy-selector-content">
+      <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+        <div
+          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div style="line-height:200%">选择策略</div>
+          <div style="display: flex">
+            <el-input placeholder="请输入" suffix-icon="el-icon-search" style="margin-right:15px;width: 40%;"
+              v-model="pageindex.policyName">
+            </el-input>
+            <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="padding: 15px;">
+          <div style="padding: 0px 20px 0px 0px;max-height:40vh;overflow-y: auto;">
+            <el-table :data="celueData" tooltip-effect="dark" @selection-change="handleSelectionChange"
+              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+              <el-table-column label="选择" type="selection" width="55">
+              </el-table-column>
+              <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column>
+              <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
+              <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip></el-table-column>
+              <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
+              <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div style="display: flex;justify-content: space-between;margin: 20px 0;" class="bom">
+      <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+      <el-pagination :current-page="pageindex.pageNumber+1" :page-sizes="[5,10, 20, 50, 100]" :page-size="pageindex.pageSize" background
+        small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange">
+      </el-pagination>
     </div>
     <div class="policy-selector-footer" style="display: flex; justify-content: flex-end; align-items: center;">
       <el-button @click="confirm" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-      <el-button @click="cancel" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+      <el-button @click="cancel" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
     </div>
   </div>
 </template>
@@ -39,64 +51,89 @@
   import {
     ceGetAll
   } from '@/api/sam.js'
-export default {
-  name: 'PolicySelector',
-  data() {
-    return {
+  export default {
+    name: 'PolicySelector',
+    data() {
+      return {
+        total: 0,
         pageindex: {
-          pageNumber: 1,
-          pageSize: 10,
+          pageNumber: 0,
+          pageSize: 5,
+          policyName: ''
         },
-      selectedRows: [],
-      celueData: []
-    };
-  },
-  async created() {
-    const celue = await ceGetAll(this.pageindex)
-    this.celueData = celue.data.content
-  },
-  methods: {
-    handleSelectionChange(selection) {
-      this.selectedRows = selection;
+        selectedRows: [],
+        celueData: []
+      };
     },
-    confirm() {
-      this.$emit('minSev', this.selectedRows);
+    created() {
+      this.getAll()
     },
-    cancel() {
-      this.$emit('mingClose');
+    methods: {
+      async getAll() {
+        const celue = await ceGetAll(this.pageindex)
+        this.celueData = celue.data.content
+        this.total = celue.data.totalElements
+      },
+      handleCurrentChange(val) {
+        this.pageindex.pageNumber = val-1
+        this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pageindex.pageSize = val
+      },
+      onSearch() {
+        this.pageindex.pageNumber = 0
+        this.getAll()
+      },
+      resetting() {
+        this.pageindex ={
+          pageNumber: 0,
+          pageSize: 5,
+          policyName: ''
+        }
+        this.getAll()
+      },
+      handleSelectionChange(selection) {
+        this.selectedRows = selection;
+      },
+      confirm() {
+        this.$emit('minSev', this.selectedRows);
+      },
+      cancel() {
+        this.$emit('mingClose');
+      }
     }
-  }
-};
+  };
 </script>
 
 <style scoped>
-.policy-selector {
-  padding: 20px;
-  width: 100%;
-  margin: 0 auto;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
-}
+  .policy-selector {
+    padding: 20px;
+    width: 100%;
+    margin: 0 auto;
+    border: 1px solid #ddd;
+    /* border-radius: 4px; */
+    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+  }
 
-.policy-selector-header {
-  text-align: left;
-  margin-bottom: 20px;
-}
+  .policy-selector-header {
+    text-align: left;
+    margin-bottom: 20px;
+  }
 
-.policy-selector-header h3 {
-  margin: 0;
-  font-size: 18px;
-  color: #303133;
-}
+  .policy-selector-header h3 {
+    margin: 0;
+    font-size: 18px;
+    color: #303133;
+  }
 
-.policy-selector-content {
-  margin-bottom: 20px;
-}
+  .policy-selector-content {
+    margin-bottom: 20px;
+  }
 
-.policy-selector-footer {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
-</style>
\ No newline at end of file
+  .policy-selector-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+</style>
diff --git a/admin-web-master/src/components/change/zy.vue b/admin-web-master/src/components/change/zy.vue
new file mode 100644
index 0000000..3b107e3
--- /dev/null
+++ b/admin-web-master/src/components/change/zy.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="policy-selector">
+    <div class="policy-selector-content">
+      <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+        <div
+          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div style="line-height:200%">选择资源</div>
+          <div style="display: flex">
+            <el-input placeholder="请输入" suffix-icon="el-icon-search" style="margin-right:15px;width: 40%;"
+              v-model="pageindex.policyName">
+            </el-input>
+            <el-button @click="onSearch" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="padding: 15px;">
+          <div style="padding: 0px 20px 0px 0px;max-height:40vh;overflow-y: auto;">
+            <el-table :data="ziyuanData" tooltip-effect="dark" @selection-change="handleSelectionChange"
+              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+              <el-table-column label="选择" type="selection" width="55">
+              </el-table-column>
+              <el-table-column label="编号" prop="id">
+
+              </el-table-column>
+              <el-table-column label="资源名称">
+                <template slot-scope="scope">
+                  {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+                </template>
+              </el-table-column>
+              <el-table-column label="资源类型">
+                <template slot-scope="scope">
+                  {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- <div style="display: flex;justify-content: space-between;margin: 20px 0;" class="bom">
+      <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+      <el-pagination :current-page="pageindex.pageNumber+1" :page-sizes="[5,10, 20, 50, 100]" :page-size="pageindex.pageSize" background
+        small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange">
+      </el-pagination>
+    </div> -->
+    <div class="policy-selector-footer" style="display: flex; justify-content: flex-end; align-items: center;">
+      <el-button @click="confirm" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+      <el-button @click="cancel" class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+    import {
+    getAlls,
+    changAlls
+  } from '@/api/information.js'
+  import {
+    getAlls as map1
+  } from '@/api/map1.js'
+  export default {
+    name: 'PolicySelector',
+    data() {
+      return {
+        total: 0,
+        pageindex: {
+          pageNumber: 0,
+          pageSize: 5,
+          policyName: ''
+        },
+        selectedRows: [],
+        ziyuanData: []
+      };
+    },
+    created() {
+      this.getAll()
+    },
+    methods: {
+      async getAll() {
+        const ziyuan = await getAlls(this.pageindex)
+        const ggw = await map1(this.pageindex)
+        const changdi = await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content, ...ggw.data.content, ...changdi.data.content]
+        // console.error(this.ziyuanData)
+        // this.total = celue.data.totalElements
+      },
+      handleCurrentChange(val) {
+        this.pageindex.pageNumber = val-1
+        this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pageindex.pageSize = val
+      },
+      onSearch() {
+        this.pageindex.pageNumber = 0
+        this.getAll()
+      },
+      resetting() {
+        this.pageindex ={
+          pageNumber: 0,
+          pageSize: 5,
+          policyName: ''
+        }
+        this.getAll()
+      },
+      handleSelectionChange(selection) {
+        this.selectedRows = selection;
+      },
+      confirm() {
+        this.$emit('minSev', this.selectedRows);
+      },
+      cancel() {
+        this.$emit('mingClose');
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .policy-selector {
+    padding: 20px;
+    width: 100%;
+    margin: 0 auto;
+    border: 1px solid #ddd;
+    /* border-radius: 4px; */
+    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+  }
+
+  .policy-selector-header {
+    text-align: left;
+    margin-bottom: 20px;
+  }
+
+  .policy-selector-header h3 {
+    margin: 0;
+    font-size: 18px;
+    color: #303133;
+  }
+
+  .policy-selector-content {
+    margin-bottom: 20px;
+  }
+
+  .policy-selector-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+</style>
diff --git a/admin-web-master/src/components/fujianUpload/fujianList copy 2.vue b/admin-web-master/src/components/fujianUpload/fujianList copy 2.vue
new file mode 100644
index 0000000..251a95b
--- /dev/null
+++ b/admin-web-master/src/components/fujianUpload/fujianList copy 2.vue
@@ -0,0 +1,257 @@
+<template>
+  <el-upload
+    :auto-upload="false" multiple :action="uploadFileUrl" :accept="fileType" :on-change="handleUpload":on-success="handleUploadSuccess"
+     :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" :on-remove="handleRemove" :headers="headers" :file-list="fileList"
+      :on-preview="handlePictureCardPreview" :class="{hide: this.fileList.length >= this.limit}">
+    <div style="display: flex;align-items: center;">
+      <el-button v-if="fileList.length < limit" style="background-color: #fff;color: #000;border: 1px solid #dcdfe6;" class="buttonHover">
+        <div style="display: flex;align-items: center;">
+          <img src="@/assets/images/upload.png" style="width: 16px;height: 16px;margin-right: 4px;" alt="">
+          <span style="">上传附件</span>
+        </div>
+      </el-button>
+      <div v-if="fileList.length < limit" slot="tip" class="tips" style="margin-left: 10px;">不超过{{ fileSize }}MB</div>
+    </div>
+  </el-upload>
+</template>
+<script>
+  import {
+    miniioupload
+  } from '@/api/commodityLease.js'
+  // import { getAccessToken } from '@/utils/auth'
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  export default {
+    props: {
+      value: [String, Object, Array],
+      // 图片数量限制
+      limit: {
+        type: Number,
+        default: 1
+      },
+      filePath: {
+        type: String,
+        default: 'other'
+      },
+      // 大小限制(MB)
+      fileSize: {
+        type: Number,
+        default: 5
+      },
+      // 文件类型, 例如['png', 'jpg', 'jpeg']
+      fileType: {
+        type: String,
+        default:'.bmp,.jpg,.jpeg,.png',
+      },
+      // 是否显示提示
+      isShowTip: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        
+        host: '',
+        number: 0,
+        uploadList: [],
+        dialogImageUrl: '',
+        dialogVisible: false,
+        hideUpload: false,
+        uploadFileUrl: uploadUrl, // 请求地址
+        headers: {
+          Authorization: ''
+        }, // 设置上传的请求头部
+        fileList: [],
+      }
+    },
+    computed: {
+      // 是否显示提示
+      showTip() {
+        return this.isShowTip && (this.fileType || this.fileSize)
+      }
+    },
+    watch: {
+      value: {
+        handler(val) {
+          if (val) {
+            // 首先将值转为数组
+            this.uploadList = []
+            const list = Array.isArray(val) ? val : this.value.split(',')
+            // 然后将数组转为对象数组
+            for (const item of list) {
+              if (typeof item === 'string') {
+                let info = {
+                  name: this.$baseURL+item,
+                  url: this.$baseURL+item
+                }
+                this.uploadList.push(item)
+                this.fileList.push(info)
+              }
+            }
+          } else {
+            this.uploadList = []
+            this.fileList = []
+            return []
+          }
+        },
+        deep: true,
+        immediate: true
+      }
+    },
+    methods: {
+      checkFileType(file) {
+        console.error(file)
+        let {
+          accept
+        } = this.options;
+        if (!accept || accept === '*') {
+          return true;
+        }
+        accept = accept.toLowerCase().replace(/\s/g, '');
+        const acceptTypeList = accept.split(',');
+        const fileType = file.name.match(/\.\w*$/)?.shift() ?? '';
+        return acceptTypeList.includes(fileType.toLowerCase());
+      },
+      checkSize({
+        size
+      }) {
+        return size <= this.options.limitSize * 1024 * 1024;
+      },
+      filesCheck(files) {
+        const limit = this.limit;
+        const limitSize = this.fileSize;
+        const accept = this.fileType;
+        if (this.uploadList.length + files.length > limit) {
+          this.$message.error(`最多上传${limit}个文件`);
+          return false;
+        }
+        for (let index = 0; index < files.length; index++) {
+          const file = files[index];
+          if (!this.checkFileType(file)) {
+            this.$message.error(`请上传${accept}等格式`);
+            return false;
+          }
+          if (!this.checkSize(file)) {
+            this.$message.error(`文件大小不能超过 ${limitSize}MB!`);
+            return false;
+          }
+        }
+
+        return true;
+      },
+      handleUpload(response) {
+        // if (!this.filesCheck(response)) {
+        //   return;
+        // }
+        // console.error(response)
+        // return
+        let fd = new FormData()
+        fd.append('file', response.raw)
+        fd.append('filePath',this.filePath)
+        miniioupload(fd).then(res => {
+          console.error(res)
+          const fileMsg = {
+            name: response.name,
+            url: this.$baseURL + res.data,
+          }
+          this.fileList.push(fileMsg)
+          this.uploadList.push(res.data)
+          this.$emit('changimg',this.uploadList.join(','))
+        })
+      },
+      // 删除图片
+      handleRemove(file, fileList) {
+        this.fileList = []
+        this.uploadList = []
+        this.$emit('changimg',this.uploadList.join(','))
+        // const findex = this.fileList.map(f => f.name).indexOf(file.name)
+        // if (findex > -1) {
+        //   this.fileList.splice(findex, 1)
+        //   this.uploadList.splice(findex, 1)
+          
+        // }
+      },
+      // 上传成功回调
+      handleUploadSuccess(res) {
+        this.uploadList.push({
+          name: res.data.url,
+          url: res.data.url
+        })
+        console.log(this.uploadList)
+        if (this.uploadList.length === this.number) {
+          this.fileList = this.fileList.concat(this.uploadList)
+          this.uploadList = []
+          this.number = 0
+          this.$emit('input', this.listToString(this.fileList))
+          // this.$modal.closeLoading()
+        }
+      },
+      // 上传前loading加载
+      handleBeforeUpload(file) {
+        // let isImg = false
+        // if (this.fileType.length) {
+        //   let fileExtension = ''
+        //   if (file.name.lastIndexOf('.') > -1) {
+        //     fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
+        //   }
+        //   isImg = this.fileType.some(type => {
+        //     if (file.type.indexOf(type) > -1) return true
+        //     if (fileExtension && fileExtension.indexOf(type) > -1) return true
+        //     return false
+        //   })
+        // } else {
+        //   isImg = file.type.indexOf('image') > -1
+        // }
+
+        // if (!isImg) {
+        //   this.$message.error(`文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`)
+        //   return false
+        // }
+        // if (this.fileSize) {
+        //   const isLt = file.size / 1024 / 1024 < this.fileSize
+        //   if (!isLt) {
+        //     this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`)
+        //     return false
+        //   }
+        // }
+        // this.$message.warning('正在上传图片，请稍候...')
+        // this.number++
+      },
+      // 文件个数超出
+      handleExceed() {
+        this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`)
+      },
+      // 上传失败
+      handleUploadError() {
+        this.$message.error('上传图片失败，请重试')
+        // this.$modal.closeLoading()
+      },
+      // 预览
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url
+        this.dialogVisible = true
+      },
+      // 对象转成指定字符串分隔
+      listToString(list, separator) {
+        let strs = ''
+        separator = separator || ','
+        for (const i in list) {
+          strs += list[i].url.replace(this.baseUrl, '') + separator
+        }
+        return strs !== '' ? strs.substr(0, strs.length - 1) : ''
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  ::v-deep .el-upload {
+    text-align: left !important;
+  }
+  .tips {
+      color: #0006;
+      font: 14px 'Alibaba PuHuiTi 2.0-55 Regular';
+      line-height: 38px;
+    }
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/fujianUpload/fujianList.vue b/admin-web-master/src/components/fujianUpload/fujianList.vue
index 251a95b..030c00d 100644
--- a/admin-web-master/src/components/fujianUpload/fujianList.vue
+++ b/admin-web-master/src/components/fujianUpload/fujianList.vue
@@ -1,129 +1,251 @@
 <template>
-  <el-upload
-    :auto-upload="false" multiple :action="uploadFileUrl" :accept="fileType" :on-change="handleUpload":on-success="handleUploadSuccess"
-     :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" :on-remove="handleRemove" :headers="headers" :file-list="fileList"
-      :on-preview="handlePictureCardPreview" :class="{hide: this.fileList.length >= this.limit}">
-    <div style="display: flex;align-items: center;">
-      <el-button v-if="fileList.length < limit" style="background-color: #fff;color: #000;border: 1px solid #dcdfe6;" class="buttonHover">
-        <div style="display: flex;align-items: center;">
-          <img src="@/assets/images/upload.png" style="width: 16px;height: 16px;margin-right: 4px;" alt="">
-          <span style="">上传附件</span>
+  <div class="upload-container">
+    <div class="card-list-box">
+
+      <div style="position: relative;width: 100%;">
+        <input :accept="options.accept" style="opacity: 0;position: absolute;" :id="inputtype" ref="fileInput" type="file" :multiple="true"
+        @change="handleUploadFile" />
+        <div v-if="localValue && localValue.length < options.limit && !options.disabled" style="display: flex;align-items: center;width: 100%;">
+          <el-button  @click="handleUpload" style="background-color: #fff;color: #000;border: 1px solid #dcdfe6;" class="buttonHover">
+            <div style="display: flex;align-items: center;">
+              <img src="@/assets/images/upload.png" style="width: 16px;height: 16px;margin-right: 4px;" alt="">
+              <span style="">上传附件</span>
+            </div>
+          </el-button>
+          <div class="tips" style="margin-left: 10px;">不超过{{ options.limitSize }}MB</div>
+        </div>
+      </div>
+      <div v-for="(file, i) in localValue" :key="'upload-BaseImage' + i" style="display: flex;justify-content: space-between;width: 100%;">
+        <div>文件{{i+1}}</div>
+        <div title="删除" class="delete-box"
+          @click="handleDeleteImg(file, i)">
+          <i class="el-icon-close"></i>
         </div>
-      </el-button>
-      <div v-if="fileList.length < limit" slot="tip" class="tips" style="margin-left: 10px;">不超过{{ fileSize }}MB</div>
+      </div>
     </div>
-  </el-upload>
+  </div>
 </template>
+
 <script>
+  //   import { uploadFiles, uploadStraightFile } from '@/api/commonApi/file';
   import {
     miniioupload
   } from '@/api/commodityLease.js'
-  // import { getAccessToken } from '@/utils/auth'
-  import {
-    uploadUrl
-  } from '@/utils/request'
+  import BaseImage from '@/components/BaseImage/index.vue';
+
   export default {
+    components: {
+      BaseImage,
+    },
+    name: 'BaseUpload',
     props: {
-      value: [String, Object, Array],
-      // 图片数量限制
-      limit: {
-        type: Number,
-        default: 1
+      value: {
+        type: String,
+        default: '',
+      },
+      cmpOption: {
+        type: Object,
+        default: () => ({
+          disabled: false,
+          isSetCover: true,
+        }),
       },
       filePath: {
         type: String,
-        default: 'other'
-      },
-      // 大小限制(MB)
-      fileSize: {
-        type: Number,
-        default: 5
+        default: 'other',
       },
-      // 文件类型, 例如['png', 'jpg', 'jpeg']
-      fileType: {
+      inputtype: {
         type: String,
-        default:'.bmp,.jpg,.jpeg,.png',
+        default: '',
+      },
+      limit: {
+        type: Number,
+        default: 1,
       },
-      // 是否显示提示
-      isShowTip: {
-        type: Boolean,
-        default: true
-      }
     },
     data() {
       return {
-        
-        host: '',
-        number: 0,
-        uploadList: [],
-        dialogImageUrl: '',
-        dialogVisible: false,
-        hideUpload: false,
-        uploadFileUrl: uploadUrl, // 请求地址
-        headers: {
-          Authorization: ''
-        }, // 设置上传的请求头部
-        fileList: [],
-      }
-    },
-    computed: {
-      // 是否显示提示
-      showTip() {
-        return this.isShowTip && (this.fileType || this.fileSize)
-      }
+        fileList:[],
+        onforIndex:0,
+        localValue: [],
+        options: {
+          limitSize: 10,
+          accept: '.mp4',
+          multiple: false,
+          limit: 1,
+          disabled: false,
+          field: 'files',
+          reqParams: {
+            code: 2000
+          },
+        },
+        reactiveData: {
+          files: [],
+          filesIng: [],
+          status: 'uploading',
+          message: '上传中...',
+          total: 0,
+          loaded: 0,
+          lengthComputable: false,
+        },
+      };
     },
     watch: {
+      limit: {
+        handler() {
+          this.options.limit= this.limit
+        },
+        immediate: true,
+      },
+      cmpOption: {
+        handler() {
+          this.setOptions();
+        },
+        immediate: true,
+      },
       value: {
         handler(val) {
-          if (val) {
+          if (val && val !='') {
             // 首先将值转为数组
-            this.uploadList = []
             const list = Array.isArray(val) ? val : this.value.split(',')
             // 然后将数组转为对象数组
-            for (const item of list) {
+            this.fileList = list
+            this.localValue = list.map(item => {
               if (typeof item === 'string') {
-                let info = {
-                  name: this.$baseURL+item,
-                  url: this.$baseURL+item
+                item = {
+                  address: item,
                 }
-                this.uploadList.push(item)
-                this.fileList.push(info)
               }
-            }
+              return item
+            })
           } else {
-            this.uploadList = []
+            this.localValue = []
             this.fileList = []
             return []
           }
         },
-        deep: true,
-        immediate: true
-      }
+        immediate: true,
+      },
     },
     methods: {
-      checkFileType(file) {
-        console.error(file)
-        let {
-          accept
-        } = this.options;
-        if (!accept || accept === '*') {
-          return true;
+      async handleUploadFile(value) {
+        const files = value.target.files
+        if (!this.filesCheck(files)) {
+          return;
         }
-        accept = accept.toLowerCase().replace(/\s/g, '');
-        const acceptTypeList = accept.split(',');
-        const fileType = file.name.match(/\.\w*$/)?.shift() ?? '';
-        return acceptTypeList.includes(fileType.toLowerCase());
+        this.reactiveData.filesIng = new Array(files.length);
+        this.reactiveData.lengthComputable = false;
+        this.reactiveData.status = 'uploading';
+        this.reactiveData.total = 0;
+        this.reactiveData.loaded = 0;
+        let c1 =  await this.asyncFileUpload(Array.from(files));
+        console.error('-----------')
+        console.error(this.localValue)
+        console.error(c1)
+        let list = []
+        for (let i = 0; i < c1.length; i++) {
+          let info = {
+            address:c1[i]
+          }
+          list.push(info)
+        }
+        console.error(list)
+        this.localValue = [...this.localValue,...list]
+        this.reactiveData.filesIng = []
+        this.fileList = []
+        for (let i = 0; i < this.localValue.length; i++) {
+          this.fileList.push(this.localValue[i].address)
+        }
+        let urlstr = this.fileList.join(',')
+        this.$emit('changimg',urlstr)
+        
       },
-      checkSize({
-        size
-      }) {
-        return size <= this.options.limitSize * 1024 * 1024;
+      setOptions() {
+        this.options = {
+          ...this.options,
+          ...this.cmpOption
+        };
+      },
+      uploadPercentage() {
+        return parseInt(String(this.reactiveData.loaded / (this.reactiveData.total / 100)));
+      },
+      handleUpload() {
+        const input = document.querySelector('#'+this.inputtype)
+        input.click()
+      },
+      async asyncFileUpload(formDataArray) {
+        console.error(formDataArray)
+        try {
+          // 初始化上传状态
+          this.reactiveData.status = 'uploading';
+          this.reactiveData.filesIng = formDataArray.map(() => ({
+            status: 'pending',
+            loaded: 0,
+            total: 0
+          }));
+          this.reactiveData.lengthComputable = false;
+          this.reactiveData.total = 0;
+          this.reactiveData.loaded = 0;
+          let list = []
+          // 循环遍历每个文件并进行上传
+          for (let i = 0; i < formDataArray.length; i++) {
+            const fileData = formDataArray[i];
+
+            // 创建一个新的 FormData 对象
+            let fd = new FormData();
+            fd.append('file', fileData); // 假设 formData 包含文件
+            fd.append('filePath', this.filePath);
+
+            // 更新当前文件的上传状态
+            this.reactiveData.filesIng[i].status = 'uploading';
+
+            // 调用 miniioupload 方法并等待响应
+            const res = await miniioupload(fd);
+            list.push(res.data)
+            // 处理成功响应
+            this.reactiveData.filesIng[i].status = 'success';
+       
+          }
+
+          // 所有文件上传完成
+          this.reactiveData.status = 'success';
+          this.$message.success('文件上传成功');
+          console.error(list)
+          return list
+        } catch (error) {
+          // 处理错误
+          console.error('上传失败:', error);
+          this.reactiveData.status = 'error';
+          this.reactiveData.filesIng = formDataArray.map(() => ({
+            status: 'error',
+            loaded: 0,
+            total: 0
+          }));
+          this.$message.error('上传失败');
+          return []
+        }
+      },
+      async handleDeleteImg(file, i) {
+        let modelValue_ = this.localValue.filter((value, index) => index != i);
+        this.localValue = modelValue_
+        this.fileList = []
+        for (let i = 0; i < this.localValue.length; i++) {
+          this.fileList.push(this.localValue[i].address)
+        }
+        let urlstr = this.fileList.join(',')
+        this.$emit('changimg',urlstr)
+      },
+      async handleSetCover(file, i) {
+        console.error(file, i)
+        this.onforIndex = i
       },
       filesCheck(files) {
-        const limit = this.limit;
-        const limitSize = this.fileSize;
-        const accept = this.fileType;
-        if (this.uploadList.length + files.length > limit) {
+        const {
+          limitSize,
+          accept,
+          limit
+        } = this.options;
+        if (this.reactiveData.files.length + files.length > limit) {
           this.$message.error(`最多上传${limit}个文件`);
           return false;
         }
@@ -141,117 +263,162 @@
 
         return true;
       },
-      handleUpload(response) {
-        // if (!this.filesCheck(response)) {
-        //   return;
-        // }
-        // console.error(response)
-        // return
-        let fd = new FormData()
-        fd.append('file', response.raw)
-        fd.append('filePath',this.filePath)
-        miniioupload(fd).then(res => {
-          console.error(res)
-          const fileMsg = {
-            name: response.name,
-            url: this.$baseURL + res.data,
-          }
-          this.fileList.push(fileMsg)
-          this.uploadList.push(res.data)
-          this.$emit('changimg',this.uploadList.join(','))
-        })
-      },
-      // 删除图片
-      handleRemove(file, fileList) {
-        this.fileList = []
-        this.uploadList = []
-        this.$emit('changimg',this.uploadList.join(','))
-        // const findex = this.fileList.map(f => f.name).indexOf(file.name)
-        // if (findex > -1) {
-        //   this.fileList.splice(findex, 1)
-        //   this.uploadList.splice(findex, 1)
-          
-        // }
+      checkSize({
+        size
+      }) {
+        return size <= this.options.limitSize * 1024 * 1024;
       },
-      // 上传成功回调
-      handleUploadSuccess(res) {
-        this.uploadList.push({
-          name: res.data.url,
-          url: res.data.url
-        })
-        console.log(this.uploadList)
-        if (this.uploadList.length === this.number) {
-          this.fileList = this.fileList.concat(this.uploadList)
-          this.uploadList = []
-          this.number = 0
-          this.$emit('input', this.listToString(this.fileList))
-          // this.$modal.closeLoading()
+      checkFileType(file) {
+        console.error(file)
+        let {
+          accept
+        } = this.options;
+        if (!accept || accept === '*') {
+          return true;
         }
+        accept = accept.toLowerCase().replace(/\s/g, '');
+        const acceptTypeList = accept.split(',');
+        const fileType = file.name.match(/\.\w*$/)?.shift() ?? '';
+        return acceptTypeList.includes(fileType.toLowerCase());
       },
-      // 上传前loading加载
-      handleBeforeUpload(file) {
-        // let isImg = false
-        // if (this.fileType.length) {
-        //   let fileExtension = ''
-        //   if (file.name.lastIndexOf('.') > -1) {
-        //     fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
-        //   }
-        //   isImg = this.fileType.some(type => {
-        //     if (file.type.indexOf(type) > -1) return true
-        //     if (fileExtension && fileExtension.indexOf(type) > -1) return true
-        //     return false
-        //   })
-        // } else {
-        //   isImg = file.type.indexOf('image') > -1
-        // }
-
-        // if (!isImg) {
-        //   this.$message.error(`文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`)
-        //   return false
-        // }
-        // if (this.fileSize) {
-        //   const isLt = file.size / 1024 / 1024 < this.fileSize
-        //   if (!isLt) {
-        //     this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`)
-        //     return false
-        //   }
-        // }
-        // this.$message.warning('正在上传图片，请稍候...')
-        // this.number++
-      },
-      // 文件个数超出
-      handleExceed() {
-        this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`)
-      },
-      // 上传失败
-      handleUploadError() {
-        this.$message.error('上传图片失败，请重试')
-        // this.$modal.closeLoading()
-      },
-      // 预览
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url
-        this.dialogVisible = true
-      },
-      // 对象转成指定字符串分隔
-      listToString(list, separator) {
-        let strs = ''
-        separator = separator || ','
-        for (const i in list) {
-          strs += list[i].url.replace(this.baseUrl, '') + separator
-        }
-        return strs !== '' ? strs.substr(0, strs.length - 1) : ''
-      }
-    }
-  }
+    },
+  };
 </script>
+
 <style lang="scss" scoped>
-  ::v-deep .el-upload {
-    text-align: left !important;
-  }
-  .tips {
+  .upload-container {
+    width: 100%;
+
+    .tips {
       color: #0006;
       font: 14px 'Alibaba PuHuiTi 2.0-55 Regular';
       line-height: 38px;
     }
-</style>
\ No newline at end of file
+
+    .action-box {
+      cursor: pointer;
+      padding-left: 10px;
+
+      .default-action {
+        color: #3f9b6a;
+      }
+    }
+
+    .card-list-box {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+
+      .card-item-box {
+        position: relative;
+        width: 112px;
+        height: 112px;
+        border: 1px dotted #dcdfe6;
+        border-radius: 2px;
+        overflow: hidden;
+        margin: 0 10px 10px 0;
+
+        .delete-box {
+          padding: 2px 5px;
+          position: absolute;
+          right: 0;
+          top: 0;
+          line-height: normal;
+          background-color: #000;
+          color: #fff;
+          border-radius: 50%;
+          transform: translate(40%, -30%);
+
+          .el-icon-close {
+            font-size: 12px;
+            transform: translate(-30%, 20%);
+          }
+        }
+      }
+
+      .card-action-box {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        width: 112px;
+        height: 112px;
+        border: 1px dashed #cdd0d6;
+        border-radius: 2px;
+        overflow: hidden;
+        // margin-bottom: 10px;
+        background-color: #fafafa;
+        cursor: pointer;
+        font-size: 12px;
+        color: #00000066;
+
+        .el-icon-plus {
+          font-size: 20px;
+        }
+
+        &:hover {
+          border-color: #3f9b6a;
+          color: #3f9b6a;
+        }
+      }
+    }
+
+    .text-list-box {
+      .text-item-box {
+        padding: 0 5px;
+        border-radius: 2px;
+        overflow: hidden;
+
+        .file-name {
+          flex: 1;
+        }
+
+        .text-icon {
+          flex-shrink: 0;
+          padding-right: 10px;
+        }
+
+        .el-icon-close {
+          cursor: pointer;
+          padding-left: 10px;
+          flex-shrink: 0;
+        }
+
+        &:hover {
+          background-color: rgba(63, 155, 106, 0.2);
+
+          .file-name {
+            color: #3f9b6a;
+          }
+        }
+
+        &:nth-child(n + 2) {
+          margin-top: 10px;
+        }
+      }
+    }
+
+    .uploading-box {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      color: #fff;
+      background-color: #c0c4cc;
+    }
+
+    .progress-box {
+      width: 100%;
+      height: 100%;
+      position: relative;
+
+      .el-progress {
+        position: absolute;
+        right: 10px;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+    }
+  }
+</style>
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 7846caa..4df120a 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -25,7 +25,15 @@
       isonloed:{
         type: Boolean,
         default: false
-      }
+      },
+      isx:{
+        type: Boolean,
+        default: true
+      },
+      message:{
+        type: String,
+        default: ''
+      },
     },
     data() {
       return {
@@ -48,6 +56,7 @@
           center: centerLatLng,
           zoom: 13
         });
+
         // 创建标记
         if(this.isonloed) {
           this.marker = new qq.maps.Marker({
@@ -60,13 +69,22 @@
             map: this.map
           });
         }
-        
+        if(this.isx) {
+          qq.maps.event.addListener(this.map, 'click', this.onMapClick);
+        } else {
+          const centerLatLng1 = new qq.maps.LatLng(this.message.split(',')[0], this.message.split(',')[1]);
+          console.error(this.message)
+          this.marker = new qq.maps.Marker({
+            position: centerLatLng1,
+            map: this.map
+          });
+        }
 
         // 添加点击事件监听器
         // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick);
 
         // 添加地图点击事件监听器
-        qq.maps.event.addListener(this.map, 'click', this.onMapClick);
+        
 
         // // 获取地址信息
         // this.getAreaCode(this.lat, this.lng);
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
new file mode 100644
index 0000000..d25094e
--- /dev/null
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -0,0 +1,118 @@
+<template>
+  <div style="position: relative;width: 100%;">
+    <div id="mapContainer" class="map"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TencentMap',
+  props: {
+    lat: {
+      type: Number,
+      default: 30.67
+    },
+    lng: {
+      type: Number,
+      default: 104.06
+    },
+    isonloed: {
+      type: Boolean,
+      default: false
+    },
+    isx: {
+      type: Boolean,
+      default: true
+    },
+    ontype: {
+      type: String,
+      default: '1'
+    },
+    message: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      map: null,
+      marker: null,
+      address: '',
+      markers: [],
+      infoWindow: null,
+    };
+  },
+  mounted() {
+    // 初始化地图
+    this.initMap(this.message);
+  },
+  methods: {
+    initMap(e) {
+      // 将经纬度转换为腾讯地图的LatLng对象
+      const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
+
+      // 创建地图实例
+      this.map = new qq.maps.Map(document.getElementById('mapContainer'), {
+        center: centerLatLng,
+        zoom: 13
+      });
+
+      // 创建信息窗口实例
+      this.infoWindow = new qq.maps.InfoWindow({
+        map: this.map
+      });
+
+      // 遍历 message 数组，为每个位置创建一个标记
+      if (e.length > 0) {
+        e.forEach(item => {
+          let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : [];
+          item.lat = parseFloat(list[0]);
+          item.lng = parseFloat(list[1]);
+          item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
+          const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
+          const marker = new qq.maps.Marker({
+            position: markerLatLng,
+            map: this.map
+          });
+
+          // 为标记添加点击事件监听器
+          qq.maps.event.addListener(marker, 'click', () => {
+            this.showInfoWindow(marker, item);
+          });
+
+          this.markers.push(marker);
+        });
+      }
+    },
+    showInfoWindow(marker, item) {
+      // 设置信息窗口的内容
+      const content = `
+        <div>
+          <p><strong>资源名称:</strong> ${item.name}</p>
+          <p><strong>位置:</strong> ${item.detailedLocation}</p>
+        </div>
+      `;
+
+      // 设置信息窗口的位置和内容
+      this.infoWindow.setPosition(marker.getPosition());
+      this.infoWindow.setContent(content);
+      this.infoWindow.open();
+    }
+  }
+}
+</script>
+
+<style scoped>
+.map {
+  width: 100%;
+  height: 400px;
+}
+
+.address-info {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 999999;
+  background: #fff;
+}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/resourceCommodity/index copy.vue b/admin-web-master/src/components/resourceCommodity/index copy.vue
new file mode 100644
index 0000000..c7eaad0
--- /dev/null
+++ b/admin-web-master/src/components/resourceCommodity/index copy.vue
@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <div>
+      <el-tabs v-model="xiangTab">
+        <el-tab-pane label="资源信息" name="first">
+          <div style="margin-top: 30px;" class="editcss">
+            <TitleWithCircle title="基础信息" />
+            <div style="padding: 20px;">
+              <el-form :model="editbgid" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="商铺名称" prop="shopName">
+                      <div class="duiqi">{{editbgid.shopName}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="场地编号" prop="venueNumber">
+                      <div class="duiqi">{{editbgid.venueNumber}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="门牌号" prop="houseNumber">
+                      <div class="duiqi">{{editbgid.houseNumber}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="建筑形式" prop="architecturalForm">
+                      <div class="duiqi">{{editbgid.architecturalForm}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+                      <div class="duiqi">{{editbgid.belongingGreenwaySection}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+                      <div class="duiqi">{{editbgid.belongingParkTrail}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="建筑面积" prop="floorSpace">
+                      <div class="duiqi">{{editbgid.floorSpace}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="实际使用面积" prop="actualUsableArea">
+                      <div class="duiqi">{{editbgid.actualUsableArea}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属区域" prop="belongingRegion">
+                      <div class="duiqi">{{editbgid.belongingRegion}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="归属部门" prop="belongingDepartment">
+                      <div class="duiqi">{{editbgid.belongingDepartment}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="负责人" prop="head">
+                      <div class="duiqi">{{editbgid.head}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="详细位置" prop="detailedLocation">
+                      <div class="duiqi">{{editbgid.detailedLocation}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="地图标点" prop="mapPunctuation" v-if="false">
+                  <div style="width: 100%;height: 300px;">
+                    <!-- :edit='edit' :sendMap='getChildDate' -->
+                    <MapXian :message="parentMessage"></MapXian>
+                  </div>
+                </el-form-item>
+                <el-form-item label="建筑图纸" prop="architecturalDrawings">
+                  <div>
+                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
+                      v-for="item in editbgid.architecturalDrawings.split(',')">
+                  </div>
+                </el-form-item>
+                <el-form-item label="商铺描述" prop="shopDescription">
+                  <div class="duiqi">{{editbgid.shopDescription}}</div>
+                </el-form-item>
+                <el-form-item label="展示主图" prop="displayMainImage">
+                  <img  v-for="item in editbgid.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                </el-form-item>
+                <!-- <el-form-item label="其他图片/视频" prop="otherImageVideos"  >
+                  <div class="duiqi" v-for="item in editbgid.otherImageVideos.split(',')">{{item}}</div>
+                </el-form-item> -->
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="招商方案信息" name="second">
+          <div style="margin-top: 30px;" class="editcss">
+            <!-- <TitleWithCircle title="招商方案信息" />
+            <div style="padding: 20px;">
+              <el-table :data="datalist1"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="招商方案名称" prop="planName" min-width="200">
+                </el-table-column>
+                <el-table-column label="创建日期" prop="createTime" min-width="100">
+                </el-table-column>
+              </el-table>
+            </div> -->
+            <TitleWithCircle title="策略方案" />
+            <div style="padding: 20px;">
+              <el-table :data="datalist"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="策略名称" prop="policyName" min-width="200">
+                </el-table-column>
+                <el-table-column label="适用资源" prop="applicableResources" min-width="100">
+                </el-table-column>
+                <el-table-column label="经营类型" prop="businessType" min-width="100">
+
+                </el-table-column>
+                <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
+                </el-table-column>
+                <el-table-column label="租期" prop="leaseTerm" min-width="100">
+                </el-table-column>
+                <el-table-column label="是否出租" prop="isRental" min-width="100">
+                  <template slot-scope="scope">
+                    {{scope.row.isRental == '0'?'否':'是'}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
+                  <template slot-scope="scope">
+                    {{scope.row.isSelfOperated == '0'?'否':'是'}}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </el-tab-pane>
+        <!-- <el-tab-pane label="租赁记录" name="third" v-if="edit">
+          <div style="margin-top: 30px;" class="editcss">
+            <div class="titles">
+              租赁记录
+            </div>
+            <div style="padding: 20px;">
+              <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="承租商家" min-width="80">
+
+                </el-table-column>
+                <el-table-column label="租赁期限" prop="houseNumber" min-width="80" show-overflow-tooltip>
+
+                </el-table-column>
+                <el-table-column label="经营类型" prop="actualUsableArea" min-width="150" show-overflow-tooltip>
+                </el-table-column>
+
+                <el-table-column label="租金/周期" prop="head" min-width="120" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="租赁状态" prop="rentalStatus" min-width="120" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.rentalStatus=='0'?'待租':'已租'}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="当前状态" prop="publishStatus" min-width="150" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':'已审核'}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="操作" min-width="160" fixed="right">
+                  <template slot-scope="scope">
+                    <div @click="handleEditForm(scope.row)" class="tableBtn greens">查看</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </el-tab-pane> -->
+        <!--   <el-tab-pane label="人流情况" name="fourth" v-if="edit">
+            <div style="margin-top: 30px;" class="editcss">
+              <div class="titles">
+                人流量情况
+              </div>
+             </div>
+          </el-tab-pane>
+          <el-tab-pane label="物业维护记录" name="five" v-if="edit">
+            <div style="margin-top: 30px;" class="editcss">
+              <div class="titles">
+                物业维护记录
+              </div>
+             </div>
+          </el-tab-pane> -->
+      </el-tabs>
+    </div>
+    <div>
+      <el-button class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+        @click="changetype">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import MapXian from "@/components/MapContainer/MapXian";
+  import TitleWithCircle from '@/components/top/index';
+  import {
+    cereResourceStrategylist,
+    cereBusinessPlan
+  } from '@/api/newly';
+  export default {
+    components: {
+      TitleWithCircle,
+      MapXian
+    },
+    props: {
+      editbgid: {
+        type: Object,
+        default: function() {
+          return {};
+        },
+      },
+    },
+    data() {
+      return {
+        xiangTab: 'first',
+        list: [],
+        parentMessage: {},
+        datalist: [],
+        datalist1:[]
+      }
+    },
+    created() {
+
+      console.error(this.editbgid)
+      if (this.editbgid.id) {
+        let c1 = {
+          pageNumber: 0,
+          pageSize: 10,
+          resourcesId: 'sp' + this.editbgid.id
+        }
+        cereResourceStrategylist(c1).then(res => {
+          console.error(res)
+          this.datalist = res.data
+        })
+        cereBusinessPlan(c1).then(res => {
+          console.error(res)
+          this.datalist1 = res.data
+        })
+        if (typeof this.editbgid.mapPunctuation == 'string' && this.editbgid.mapPunctuation != '') {
+         this.parentMessage = JSON.parse(this.editbgid.mapPunctuation)
+        } else {
+          this.parentMessage = this.editbgid.mapPunctuation
+        }
+      }
+    },
+    computed: {
+
+    },
+    methods: {
+      changetype() {
+        this.xiangTab = 'first'
+        this.$emit('removeonaction', '1')
+      },
+    }
+  }
+</script>
+<style>
+  .el-form-item__label {
+    color: #a2a2a2;
+    
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+</style>
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index c7eaad0..4fd1900 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -19,83 +19,86 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="门牌号" prop="houseNumber">
-                      <div class="duiqi">{{editbgid.houseNumber}}</div>
+                    <el-form-item label="商铺类型" prop="shopType">
+                      <div class="duiqi">{{editbgid.shopType=='1'?'移动铺位':editbgid.shopType=='2'?'固定铺位':'无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="建筑形式" prop="architecturalForm">
-                      <div class="duiqi">{{editbgid.architecturalForm}}</div>
+                    <el-form-item label="测绘面积" prop="surveyingArea">
+                      <div class="duiqi">{{editbgid.surveyingArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-                      <div class="duiqi">{{editbgid.belongingGreenwaySection}}</div>
+                    <el-form-item label="产权面积" prop="propertyArea">
+                      <div class="duiqi">{{editbgid.propertyArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
-                      <div class="duiqi">{{editbgid.belongingParkTrail}}</div>
+                    <el-form-item label="实际使用面积" prop="actualUsableArea">
+                      <div class="duiqi">{{editbgid.actualUsableArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="建筑面积" prop="floorSpace">
-                      <div class="duiqi">{{editbgid.floorSpace}}</div>
+                    <el-form-item label="所属区域" prop="belongingRegion">
+                      <div class="duiqi">{{editbgid.belongingRegion || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="实际使用面积" prop="actualUsableArea">
-                      <div class="duiqi">{{editbgid.actualUsableArea}}</div>
+                    <el-form-item label="归属部门" prop="belongingDepartment">
+                      <div class="duiqi">{{editbgid.belongingDepartment || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属区域" prop="belongingRegion">
-                      <div class="duiqi">{{editbgid.belongingRegion}}</div>
+                    <el-form-item label="负责人" prop="head">
+                      <div class="duiqi">{{editbgid.head || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="归属部门" prop="belongingDepartment">
-                      <div class="duiqi">{{editbgid.belongingDepartment}}</div>
+                    <el-form-item label="联系人" prop="contacts">
+                      <div class="duiqi">{{editbgid.contacts || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="负责人" prop="head">
-                      <div class="duiqi">{{editbgid.head}}</div>
+                    <el-form-item label="联系方式" prop="telephone">
+                      <div class="duiqi">{{editbgid.telephone || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="详细位置" prop="detailedLocation">
-                      <div class="duiqi">{{editbgid.detailedLocation}}</div>
-                    </el-form-item>
+                    
                   </el-col>
                 </el-row>
-                <el-form-item label="地图标点" prop="mapPunctuation" v-if="false">
+                <el-form-item label="详细位置" prop="detailedLocation">
+                  <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapPunctuation">
                   <div style="width: 100%;height: 300px;">
                     <!-- :edit='edit' :sendMap='getChildDate' -->
-                    <MapXian :message="parentMessage"></MapXian>
+                    <newmap :isx="false" :message="editbgid.mapPunctuation"></newmap>
                   </div>
                 </el-form-item>
                 <el-form-item label="建筑图纸" prop="architecturalDrawings">
-                  <div>
+                  <div v-if="editbgid.architecturalDrawings">
                     <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
                       v-for="item in editbgid.architecturalDrawings.split(',')">
                   </div>
+                  <div  class="duiqi" v-else>无</div>
                 </el-form-item>
                 <el-form-item label="商铺描述" prop="shopDescription">
-                  <div class="duiqi">{{editbgid.shopDescription}}</div>
+                  <div class="duiqi">{{editbgid.shopDescription || '无'}}</div>
                 </el-form-item>
                 <el-form-item label="展示主图" prop="displayMainImage">
                   <img  v-for="item in editbgid.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
                 </el-form-item>
-                <!-- <el-form-item label="其他图片/视频" prop="otherImageVideos"  >
-                  <div class="duiqi" v-for="item in editbgid.otherImageVideos.split(',')">{{item}}</div>
-                </el-form-item> -->
+                <el-form-item label="其他视频" prop="otherImageVideos"  >
+                  <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
+                  <!-- <div class="duiqi" v-for="item in editbgid.otherImageVideos.split(',')">{{$baseURL+item}}</div> -->
+                </el-form-item>
               </el-form>
             </div>
           </div>
@@ -214,10 +217,12 @@
     cereResourceStrategylist,
     cereBusinessPlan
   } from '@/api/newly';
+  import newmap from "@/components/newmap/index";
   export default {
     components: {
       TitleWithCircle,
-      MapXian
+      MapXian,
+      newmap
     },
     props: {
       editbgid: {
@@ -247,23 +252,39 @@
         }
         cereResourceStrategylist(c1).then(res => {
           console.error(res)
+          if (!Array.isArray(res.data)) {
+            this.datalist = [];
+            return;
+          }
           this.datalist = res.data
         })
         cereBusinessPlan(c1).then(res => {
           console.error(res)
+          if (!Array.isArray(res.data)) {
+            this.datalist1 = [];
+            return;
+          }
           this.datalist1 = res.data
         })
-        if (typeof this.editbgid.mapPunctuation == 'string' && this.editbgid.mapPunctuation != '') {
-         this.parentMessage = JSON.parse(this.editbgid.mapPunctuation)
-        } else {
-          this.parentMessage = this.editbgid.mapPunctuation
-        }
+        
       }
     },
     computed: {
 
     },
     methods: {
+      openfile(e) {
+        if (e) {
+          const fullUrl = e;
+          try {
+            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+          } catch (error) {
+            console.error('打开文件失败:', error);
+          }
+        } else {
+          console.error('无文件可查看');
+        }
+      },
       changetype() {
         this.xiangTab = 'first'
         this.$emit('removeonaction', '1')
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 8bee358..ac6bbd1 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -260,7 +260,7 @@ export default {
       listMune:[],
       list:[
       // ['招商资源监测','招商租赁管理','系统设置']
-      ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置'],
+      ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','客服服务管理','商户意向管理'],
            // ['问卷调查'],
         // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'],
         // ['品牌策划','活动策划','氛围策划','媒体推广'],
@@ -641,7 +641,7 @@ this.listMune[0] = All
             this.listMune = []
             this.list=[
             // ['招商资源监测','招商租赁管理','系统设置']
-            ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置'],
+            ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','客服服务管理','商户意向管理'],
               // ['问卷调查'],
               // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','问卷调查','招商过程管理','商户寻租管理','轮播图设置','平台活动','客服配置','优惠券管理'],
               // ['品牌策划','活动策划','氛围策划','媒体推广'],
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 4566312..a0a7758 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -17,7 +17,7 @@ let baseURL =  ''
 // || host === 'localhost:9528'
 if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528') {
   // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
-  baseURL = 'http://8.130.38.56:9004';
+  baseURL = 'http://172.16.61.125:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/couponmanagement/capitalpool.vue b/admin-web-master/src/views/couponmanagement/capitalpool.vue
index 7d791e7..c7dce7b 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpool.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpool.vue
@@ -33,7 +33,7 @@
         <!-- 表格 -->
         <div class="tableBox">
           <el-table ref="multipleTable" :data="tableData"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
             tooltip-effect="light">
             <!-- <el-table-column label="编号">
               <template slot-scope="scope">{{ scope.row.poolId }}</template>
diff --git a/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
index 246a492..d2ed10d 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
@@ -44,7 +44,7 @@
             <el-table
               ref="multipleTable"
               :data="tableData"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
               tooltip-effect="light"
             >
               <el-table-column label="优惠券名称" >
diff --git a/admin-web-master/src/views/couponmanagement/couponinfo.vue b/admin-web-master/src/views/couponmanagement/couponinfo.vue
index b6ffd7d..a6d4635 100644
--- a/admin-web-master/src/views/couponmanagement/couponinfo.vue
+++ b/admin-web-master/src/views/couponmanagement/couponinfo.vue
@@ -44,7 +44,7 @@
     <!-- 表格 -->
     <div class="tableBox">
       <el-table ref="multipleTable" :data="qdlist" v-if="activeName == 'first'"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         tooltip-effect="light">
         <el-table-column label="渠道方">
           <template slot-scope="scope">{{ scope.row.channelParty }}</template>
@@ -57,7 +57,7 @@
         </el-table-column>
       </el-table>
       <el-table ref="multipleTable" :data="qdlist" v-if="activeName == 'second'"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         tooltip-effect="light">
         <el-table-column label="优惠券">
           <template slot-scope="scope">{{ infoyhq.couponName}}</template>
@@ -70,7 +70,7 @@
         </el-table-column>
       </el-table>
       <el-table ref="multipleTable" :data="qdlist" v-if="activeName == 'third'"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         tooltip-effect="light">
         <el-table-column label="优惠券">
           <template slot-scope="scope">{{ infoyhq.couponName}}</template>
@@ -83,7 +83,7 @@
         </el-table-column>
       </el-table>
       <el-table ref="multipleTable" :data="qdlist" v-if="activeName == 'fourth'"
-        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         tooltip-effect="light">
         <el-table-column label="商家">
           <template slot-scope="scope">{{ scope.row.shop.shopName }}</template>
diff --git a/admin-web-master/src/views/couponmanagement/couponlist.vue b/admin-web-master/src/views/couponmanagement/couponlist.vue
index 4cc9dca..e2495aa 100644
--- a/admin-web-master/src/views/couponmanagement/couponlist.vue
+++ b/admin-web-master/src/views/couponmanagement/couponlist.vue
@@ -24,7 +24,7 @@
             <el-table
               ref="multipleTable"
               :data="tableData"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
               tooltip-effect="light"
               
             > 
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 591454e..3567b3f 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -5,6 +5,21 @@
         <div style="color:#0006"> <span>招商资源监测</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">资源地图</span></div>
       </div>
+      <div class="formSearch">
+        <el-form :inline="true">
+          <el-form-item label="资源名称" prop="name">
+            <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
+          </el-form-item>
+        </el-form>
+
+        <div>
+          <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+          </el-button>
+          <el-button @click="resetting" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+          </el-button>
+        </div>
+      </div>
       <!-- 线上 -->
       <div>
         <div style="margin-bottom: 20px;">
@@ -15,7 +30,7 @@
         <!-- 地图 -->
         <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
           <div style="width: 100%;height: 400px; border: 1px solid #3F9B6A;position: relative;">
-            <MapContainer :message="tableData" @MapItem='HandMapItem' ref="mapComponent"></MapContainer>
+            <mapchakannew :ontype="ontype" ref="mapchakannewrefs"></mapchakannew>
           </div>
         </div>
         <div style="margin: 20px 0;">
@@ -29,39 +44,41 @@
           </div>
         </div>
         <!-- 表格 -->
-        <el-table v-if="ontype=='1'" :data="tableData"
+        <el-table v-if="ontype=='1'" :data="tableData" 
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="80">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <el-table-column label="编号" prop="venueNumber" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
-
-          </el-table-column>
-          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
-
+          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
+            </template>
           </el-table-column>
           <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="建筑形式" prop="architecturalForm" show-overflow-tooltip>
+          <el-table-column prop="detailedLocation"  width="180" label="详细地址" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
+            <template slot-scope="scope">
+              {{scope.row.actualUsableArea || '无'}}
+            </template>
           </el-table-column>
           <el-table-column label="负责人" prop="head" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.head || '无'}}
+            </template>
           </el-table-column>
           <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="250" fixed="right">
+          <el-table-column label="操作" min-width="100" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
@@ -74,42 +91,24 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='2'" :data="tableData"
+        <el-table v-if="ontype=='2'" :data="tableData" 
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="100">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1}}
             </template>
           </el-table-column>
-          <el-table-column label="广告位名称" prop="advertisingName" min-width="200">
-          </el-table-column>
-          <el-table-column label="广告位类型" prop="advertisingType" min-width="150">
-          </el-table-column>
-          <!-- <el-table-column label="详细地址" prop="detailedLocation" min-width="200">
+          <el-table-column label="广告位名称" prop="advertisingName">
           </el-table-column>
-          <el-table-column label="设备类型" prop="deviceType" min-width="150">
+          <el-table-column label="广告位类型" prop="advertisingType" >
           </el-table-column>
-          <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200">
-          </el-table-column>
-          <el-table-column label="场地编号" prop="venueNumber" min-width="150">
-          </el-table-column>
-          <el-table-column label="广告尺寸" prop="dimensions" min-width="200">
-          </el-table-column>
-          <el-table-column label="广告材质" prop="advertisingMaterial" min-width="150">
-          </el-table-column>
-          <el-table-column prop="createUser" label="创建人" min-width="120">
-          </el-table-column>
-          <el-table-column prop="rentalStatus" label="租赁状态" min-width="120">
+          <el-table-column label="广告尺寸" prop="dimensions"  show-overflow-tooltip></el-table-column>
+          <el-table-column prop="publishStatus" label="发布状态" >
             <template slot-scope="scope">
-              {{scope.row.rentalStatus == 0?'未租':'已租'}}
-            </template>
-          </el-table-column> -->
-          <el-table-column prop="publishStatus" label="发布状态" min-width="120">
-              <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200">
+          <el-table-column prop="leaseExpirationDate" label="租赁到期时间" >
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
@@ -124,45 +123,38 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='3'" :data="tableData"
+        <el-table v-if="ontype=='3'" :data="tableData" 
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="编号" prop="id" v-if="activeName == 'second'">
-                     </el-table-column> -->
-          <el-table-column label="场地名称" prop="venueName">
+          <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualArea">
+          <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="场地类型" prop="venueType">
+          <el-table-column label="实际使用面积" prop="actualArea" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="所属区域" prop="district">
+          <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="详细位置" prop="detailedLocation">
+          <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
           </el-table-column>
-          <!-- <el-table-column label="租赁状态" >
-          </el-table-column> -->
-          <!-- <el-table-column label="状态" >
-          </el-table-column> -->
-          <el-table-column prop="publishStatus" label="发布状态" min-width="120">
+          <el-table-column prop="publishStatus" label="发布状态">
             <template slot-scope="scope">
-              {{scope.row.publishStatus == 0?'待发布':'已提交'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作"  fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <!-- <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div> -->
-              <div class="tableBtn greens" @click="removeinfo(scope.row,'编辑')">编辑
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
-              <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-                @click="removeinfozz(scope.row,'1','发布')">发布</div>
+              @click="opencl(scope.row,'cd')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div> -->
+                @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -185,10 +177,10 @@
 
     <div class="zhuti" v-if="onaction == '2'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">新增</span></div>
       </div>
-      <div style="margin: 20px 0;">
+      <div style="margin: 0 0;">
         <div style="display: flex;font-size: 14px">
           <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
           </div>
@@ -202,7 +194,7 @@
         <add @removeonaction="removeonaction"></add>
       </div>
       <div v-if="ontype == '2'" style="padding: 20px 20px 20px 0;">
-        <addmap @removeonaction="removeonaction" :leixing="leixing"></addmap>
+        <addmap @removeonaction="removeonaction" type="all" :leixing="leixing"></addmap>
       </div>
       <div v-if="ontype == '3'" style="padding: 20px 20px 20px 0;">
         <addcd @removeonaction="removeonaction"></addcd>
@@ -210,7 +202,7 @@
     </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">查看</span></div>
       </div>
       <div v-if="ontype == '1'">
@@ -225,7 +217,7 @@
     </div>
     <div class="zhuti" v-if="onaction == '4'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{onaction == '1'?'商铺基本信息':onaction == '2'?'广告位基本信息管理':onaction == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">{{contractChangeReason}}</span></div>
       </div>
       <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
@@ -271,12 +263,11 @@
   import chakanmap from '../../components/chakan/map'
   import chakancd from '../../components/chakan/cd'
     import cl from '@/components/change/cl.vue'
-  import {
-    on
-  } from 'screenfull';
+     import mapchakannew from '@/components/newmap/map'
   export default {
     data() {
       return {
+        name:'',
         oninfo: {},
         celueData: [],
         clData: [],
@@ -289,10 +280,8 @@
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
-          dataStatus: '1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
         },
         tableData: [],
         total: 0,
@@ -305,6 +294,7 @@
       }
     },
     components: {
+      mapchakannew,
       cl,
       chakancd,
       addcd,
@@ -483,18 +473,21 @@
       },
       async getAll() {
         if (this.ontype == '1') {
-          const res = await getAlls(this.pagequery)
+          const res = await getAlls({...this.pagequery,shopName:this.name})
           this.tableData = res.data.content
           this.total = res.data.totalElements
         } else if (this.ontype == '2') {
-          const res = await likeGet(this.pagequery)
+          const res = await likeGet({...this.pagequery,advertisingName:this.name})
           this.tableData = res.data.content
           this.total = res.data.totalElements
         } else if (this.ontype == '3') {
-          const res = await changAlls(this.pagequery)
+          const res = await changAlls({...this.pagequery,venueName:this.name})
           this.tableData = res.data.content
           this.total = res.data.totalElements
         }
+        // console.error(']]]]]]]]]')
+        // console.error(this.tableData)
+        this.$refs.mapchakannewrefs.initMap(this.tableData)
 
       },
       removeonaction(e) {
@@ -520,9 +513,8 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            dataStatus: '1',
-            contractName: ''
           },
+          this.name = ''
           this.getAll()
       },
       //删除
@@ -627,6 +619,12 @@
   }
 </script>
 <style lang="scss" scoped>
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
   .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
@@ -644,6 +642,13 @@
     margin-right: 10px;
     cursor: pointer;
   }
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
+  .el-dialog__header{
+    padding: 0;
+    display: none;
+  }
 </style>
 
 
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index 2aefcdb..1490ed2 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -8,26 +8,18 @@
       <!-- 线上 -->
       <div>
         <!-- 搜索 -->
-        <!-- <div class="formSearch">
-          <el-form :inline="true" :model="pagequery">
-            <el-form-item label="所属区域" prop="belongingRegion">
-              <el-select v-model="pagequery.belongingRegion" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="成华区" value="成华区"></el-option>
-                <el-option label="武侯区" value="武侯区"></el-option>
-                <el-option label="锦江区" value="锦江区"></el-option>
-                <el-option label="青羊区" value="青羊区"></el-option>
-                <el-option label="金牛区" value="金牛区"></el-option>
-                <el-option label="双流区" value="双流区"></el-option>
-                <el-option label="郫都区" value="郫都区"></el-option>
-                <el-option label="龙泉驿区" value="龙泉驿区"></el-option>
-                <el-option label="温江区" value="温江区"></el-option>
-              </el-select>
+        <div class="formSearch">
+          <el-form :inline="true">
+            <el-form-item label="资源名称" prop="name">
+              <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
+            </el-form-item>
+            <el-form-item label="策略名称" prop="clName">
+              <el-input v-model="clName" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
-            <el-form-item label="建筑形式" prop="architecturalForm">
-              <el-select v-model="pagequery.architecturalForm" placeholder="请选择"
+            <el-form-item label="审核状态" prop="publishStatus">
+              <el-select v-model="publishStatus" placeholder="请选择"
                 style="width: 168px;margin-right: 15px">
-                <el-option label="框剪结构" value="框剪结构"></el-option>
-                <el-option label="区域二" value="区域二"></el-option>
+                <el-option label="待审核" value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -39,20 +31,20 @@
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
-        </div> -->
-        <div style="margin: 20px 0;">
+        </div>
+        <div style="margin-bottom: 20px;">
           <div style="display: flex;font-size: 14px">
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
             </div>
-            <!-- <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
+            <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
               广告位</div>
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
-            </div> -->
+            </div>
           </div>
         </div>
         <!-- 表格 -->
         <!--  -->
-        <el-table border v-if="ontype=='1'" :span-method="objectSpanMethod" :data="tableData"
+        <el-table  v-if="ontype=='1'"  :span-method="objectSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -86,16 +78,12 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'已下架':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <!-- <div @click="opencl(scope.row,'sp')" class="tableBtn greens">绑定策略</div> -->
               <div @click="details(scope.row.cereBasicInformationShop)" class="tableBtn greens">查看</div>
-              <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
-              </div> -->
-              <!-- <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div> -->
               <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 
                 @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div>
               <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"
@@ -103,100 +91,102 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='2'" :data="tableData"
+        <el-table v-if="ontype=='2'" :span-method="objectSpanMethod"   :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="100">
+          <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.$index +1}}
+              {{scope.row.cereAdvertisingInformation.advertisingName}}
             </template>
           </el-table-column>
-          <el-table-column label="广告位名称" prop="advertisingName" min-width="200">
-          </el-table-column>
-          <el-table-column label="广告位类型" prop="advertisingType" min-width="150">
-          </el-table-column>
-          <!-- <el-table-column label="详细地址" prop="detailedLocation" min-width="200">
-          </el-table-column>
-          <el-table-column label="设备类型" prop="deviceType" min-width="150">
-          </el-table-column>
-          <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200">
-          </el-table-column>
-          <el-table-column label="场地编号" prop="venueNumber" min-width="150">
-          </el-table-column>
-          <el-table-column label="广告尺寸" prop="dimensions" min-width="200">
+          <el-table-column prop="advertisingType" label="广告位类型" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereAdvertisingInformation.advertisingType}}
+            </template>
           </el-table-column>
-          <el-table-column label="广告材质" prop="advertisingMaterial" min-width="150">
+          <el-table-column label="所属端" prop="affiliation" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereAdvertisingInformation.affiliation}}
+            </template>
           </el-table-column>
-          <el-table-column prop="createUser" label="创建人" min-width="120">
+          <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.policyName}}
+            </template>
           </el-table-column>
-          <el-table-column prop="rentalStatus" label="租赁状态" min-width="120">
+          <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.rentalStatus == 0?'未租':'已租'}}
+              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
             </template>
-          </el-table-column> -->
-          <el-table-column prop="publishStatus" label="发布状态" min-width="120">
+          </el-table-column>
+          <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus == 0?'待发布':'已提交'}}
+              {{scope.row.shopinfo.payDay}}
             </template>
           </el-table-column>
-          <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="200">
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'待发布':scope.row.cereAdvertisingInformation.publishStatus=='1'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='2'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='3'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='4'?'驳回':'-'}}
+            </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="250" fixed="right">
+        
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="opencl(scope.row,'gg')" class="tableBtn greens">绑定策略</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
-              </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-                @click="removeinfozz(scope.row,'1','发布')">发布</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+              <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div>
+              <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 
+                @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div>
+              <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"
+                @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div>
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='3'" :data="tableData"
+        <el-table  v-if="ontype=='3'" :span-method="objectSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号">
+          <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.$index +1}}
+              {{scope.row.cereBasicInformationVenue.venueName}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="编号" prop="id" v-if="activeName == 'second'">
-                     </el-table-column> -->
-          <el-table-column label="场地名称" prop="venueName">
+          <el-table-column prop="venueType" label="场地类型" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereBasicInformationVenue.venueType}}
+            </template>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualArea">
+          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.cereBasicInformationVenue.actualUsableArea}}
+            </template>
           </el-table-column>
-          <el-table-column label="场地类型" prop="venueType">
+          <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.policyName}}
+            </template>
           </el-table-column>
-          <el-table-column label="所属区域" prop="district">
+          <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+            </template>
           </el-table-column>
-          <el-table-column label="详细位置" prop="detailedLocation">
+          <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopinfo.payDay}}
+            </template>
           </el-table-column>
-          <!-- <el-table-column label="租赁状态" >
-          </el-table-column> -->
-          <!-- <el-table-column label="状态" >
-          </el-table-column> -->
-          <el-table-column prop="publishStatus" label="发布状态" min-width="120">
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus == 0?'待发布':'已提交'}}
+              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'待发布':scope.row.cereBasicInformationVenue.publishStatus=='1'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='2'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='3'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="250" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="opencl(scope.row,'cd')" class="tableBtn greens">绑定策略</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
-              </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-                @click="removeinfozz(scope.row,'1','发布')">发布</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+              <div @click="details(scope.row.cereBasicInformationVenue)" class="tableBtn greens">查看</div>
+              <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens" 
+                @click="removeinfozz(scope.row.cereBasicInformationVenue,'1','通过')">通过</div>
+              <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens"
+                @click="removeinfozz(scope.row.cereBasicInformationVenue,'4','驳回')">驳回</div>
             </template>
           </el-table-column>
         </el-table>
-        <div style="display: flex;justify-content: space-between;" class="bom">
+        <div v-if="total>0" style="display: flex;justify-content: space-between;" class="bom">
           <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
           <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
             background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
@@ -314,6 +304,9 @@
   export default {
     data() {
       return {
+        publishStatus:'',
+        clName:'',
+        name:'',
         oninfo: {},
         celueData: [],
         clData: [],
@@ -559,7 +552,8 @@
         if (this.ontype == '1') {
           const res = await getResourceStrategy({
             ...this.pagequery,
-            resourcesId: 'sp'
+            resourcesId: 'sp',
+            shopName:this.name
           })
           let c1 = []
           for (let index = 0; index < res.data.length; index++) {
@@ -583,16 +577,52 @@
         } else if (this.ontype == '2') {
           const res = await getResourceStrategy({
             ...this.pagequery,
-            resourcesId: 'gg'
+            resourcesId: 'gg',
+            advertisingName:this.name
           })
-          this.tableData = res.data.list
+          let c1 = []
+          for (let index = 0; index < res.data.length; index++) {
+            const element = res.data[index];
+            if (element.cereAdvertisingInformation.id) {
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                var element1 = element.cereRentalPolicies[i];
+                
+                var obj = {
+                  cereAdvertisingInformation: element.cereAdvertisingInformation,
+                  num: element.cereRentalPolicies.length,
+                  shopinfo: element1
+                };
+                c1.push(obj);
+              }
+            }
+          }
+          this.tableData = c1
+          console.error(this.tableData)
           this.total = res.data.total
         } else if (this.ontype == '3') {
           const res = await getResourceStrategy({
             ...this.pagequery,
-            resourcesId: 'cd'
+            resourcesId: 'cd',
+            // venueName:this.name
           })
-          this.tableData = res.data.list
+          let c1 = []
+          for (let index = 0; index < res.data.length; index++) {
+            const element = res.data[index];
+            if (element.cereBasicInformationVenue.id) {
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                var element1 = element.cereRentalPolicies[i];
+                
+                var obj = {
+                  cereBasicInformationVenue: element.cereBasicInformationVenue,
+                  num: element.cereRentalPolicies.length,
+                  shopinfo: element1
+                };
+                c1.push(obj);
+              }
+            }
+          }
+          this.tableData = c1
+          console.error(this.tableData)
           this.total = res.data.total
         }
 
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 1842013..8a23d17 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -19,12 +19,12 @@
                 :key="index" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+            <!-- <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
               <el-select v-model="pagequery.belongingGreenwaySection" placeholder="请选择">
                 <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
                   :key="index"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="归属部门" prop="belongingDepartment">
               <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
@@ -45,36 +45,43 @@
         </div>
         <!-- 表格 -->
 
-        <el-table :data="tableData" border :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}">
-          <el-table-column label="序号" min-width="50">
+        <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
-
-          </el-table-column>
-          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
+          <!-- <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
 
+          </el-table-column> -->
+          <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
+            </template>
           </el-table-column>
           <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="建筑形式" prop="architecturalForm" show-overflow-tooltip>
+          <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="detailedLocation" label="详细地址" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
+            <template slot-scope="scope">
+              {{scope.row.actualUsableArea || '无'}}
+            </template>
           </el-table-column>
           <el-table-column label="负责人" prop="head" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.head || '无'}}
+            </template>
           </el-table-column>
           <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="200" fixed="right">
+          <el-table-column label="操作" min-width="100" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="removeinfo(scope.row,'编辑')">编辑
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index e3fee82..e314328 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -44,62 +44,38 @@
           <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
         </div>
         <!-- 表格 -->
-
         <el-table :data="tableData"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}">
-          <el-table-column label="序号" min-width="80">
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <el-table-column label="广告位名称" prop="advertisingName" min-width="150" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="广告位类型" prop="advertisingType" min-width="120" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="所属端" prop="affiliation" min-width="120" v-if="leixing" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="详细地址" prop="detailedLocation" min-width="200" v-if="leixing == false"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="设备类型" prop="deviceType" min-width="200" v-if="leixing == false" show-overflow-tooltip>
+          <el-table-column label="广告位名称"  prop="advertisingName"  show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="设备尺寸" prop="equipmentSize" min-width="200" v-if="leixing == false">
+          <el-table-column label="广告位类型"  prop="advertisingType"  show-overflow-tooltip>
           </el-table-column>
-          <!-- <el-table-column label="场地编号" prop="venueNumber" min-width="120" v-if="leixing == false"
-            show-overflow-tooltip>
-          </el-table-column> -->
-          <el-table-column label="轮播顺序" prop="rotationOrder" min-width="80" v-if="leixing">
 
-          </el-table-column>
-          <el-table-column label="广告尺寸" prop="dimensions" min-width="200" v-if="leixing == false">
-          </el-table-column>
-          <el-table-column label="广告材质" prop="advertisingMaterial" min-width="120" v-if="leixing == false">
-          </el-table-column>
-          <el-table-column label="可上传大小" prop="size" min-width="120" v-if="leixing">
 
-          </el-table-column>
-          <el-table-column label="上传格式" prop="uploadFormat" min-width="150" v-if="leixing">
-          </el-table-column>
-          <!-- <el-table-column prop="createUser" label="创建人" min-width="120">
-          </el-table-column> -->
-          <!-- <el-table-column prop="rentalStatus" label="租赁状态" min-width="120">
-            <template slot-scope="scope">
-              {{scope.row.rentalStatus=='0'?'待租':'已租'}}
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column prop="publishStatus" label="发布状态" min-width="120">
-            <template slot-scope="scope">
-              {{scope.row.rentalStatus=='0'?'待发布':scope.row.rentalStatus=='1'?'待审核':'已审核'}}
-            </template>
-          </el-table-column> -->
-          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
+          <el-table-column label="所属端" width="100" prop="affiliation" v-if="leixing" show-overflow-tooltip></el-table-column>
+          <el-table-column label="轮播顺序" width="100"  prop="rotationOrder" v-if="leixing"> </el-table-column>
+          <el-table-column label="广告尺寸" width="120" prop="dimensions"  v-if="leixing" show-overflow-tooltip></el-table-column>
+          <el-table-column label="上传大小" prop="size"  v-if="leixing"></el-table-column>
+
+
+          <el-table-column label="详细位置" prop="detailedLocation"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
+          <el-table-column label="设备类型" width="100"  prop="deviceType"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
+          <el-table-column label="广告尺寸" width="120" prop="dimensions"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
+          <el-table-column label="广告材质" width="100"  prop="advertisingMaterial"  v-if="leixing == false"></el-table-column>
+
+          <el-table-column  label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'已下架':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
-          <el-table-column prop="leaseExpirationDate" label="租赁到期时间" min-width="150" show-overflow-tooltip>
+          <el-table-column prop="leaseExpirationDate" label="租赁到期时间"  show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="操作" min-width="250" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
diff --git a/admin-web-master/src/views/serve/MarkActivity/index copy.vue b/admin-web-master/src/views/serve/MarkActivity/index copy.vue
new file mode 100644
index 0000000..ac703af
--- /dev/null
+++ b/admin-web-master/src/views/serve/MarkActivity/index copy.vue
@@ -0,0 +1,974 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">营销推广活动</span></div>
+      </div>
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <el-form :inline="true" :model="formSel">
+            <el-form-item label="活动标题">
+              <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="场地名称">
+              <el-input v-model="formSel.venue" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="联系人">
+              <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="联系电话">
+              <el-input v-model="formSel.contactPhone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="起止时间">
+              <el-select v-model="formSel.startTime" placeholder="请选择" style="width:168px;margin-right: 15px">
+                <el-option label="" value="" />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="margin-bottom: 20px;">
+          <div>
+            <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+              icon="el-icon-circle-plus-outline" @click="ggXin = true">新增</el-button>
+          </div>
+        </div>
+        <!-- 表格 -->
+
+        <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" min-width="150">
+            <template slot-scope="scope">
+              {{scope.$index +1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="活动标题" min-width="200" prop="title">
+          </el-table-column>
+          <el-table-column label="场地名称" min-width="150" prop="venue">
+          </el-table-column>
+          <el-table-column label="起止时间" prop="startTime" min-width="250">
+          </el-table-column>
+          <el-table-column label="联系人" prop="contactPerson" min-width="150">
+
+          </el-table-column>
+          <el-table-column label="联系电话" prop="contactPhone" min-width="150">
+
+          </el-table-column>
+          <el-table-column label="已参与报名人数" prop="registeredCount" min-width="150">
+          </el-table-column>
+          <el-table-column prop="createdAt" label="创建时间" min-width="250">
+
+          </el-table-column>
+          <el-table-column label="创建人" prop="createdBy" min-width="150">
+          </el-table-column>
+          <el-table-column prop="reviewStatus" label="状态" min-width="150">
+            <template slot-scope="scope">
+              {{scope.row.reviewStatus=='1'?'未发布':'已发布'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="350">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div @click="fabu(scope.row,'2')" class="tableBtn greens" v-if="scope.row.reviewStatus=='1'">发布</div>
+              <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.reviewStatus=='2'">下架</div>
+              <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">编辑</div>
+              <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.reviewStatus!='1'">报名名单</div>
+              <div @click="deltab(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">删除</div>
+              <div @click="Qcode(scope.row)" class="tableBtn greens">活动二维码</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </div>
+
+    </div>
+    <!-- 详情框 -->
+    <el-dialog :visible.sync="detbox" custom-class='tongyong_css' style="padding: 0;" width="65%" center
+      :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
+        <div>
+
+          <el-form ref="form" :model="xiangData" label-width="120px">
+            <el-form-item label="营销活动标题" prop="title">
+              <el-input placeholder="请输入" v-model="xiangData.title" :disabled="edit"></el-input>
+            </el-form-item>
+            <el-form-item label="内容" prop="content" tyle="width: 100%;">
+              <wang-editor v-model="xiangData.content" ref="editor" :height="200" v-if="!edit"></wang-editor>
+              <div v-html="xiangData.content" style="line-height:40px" v-else></div>
+            </el-form-item>
+          </el-form>
+          <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
+            <div
+              style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
+              <div>场地选择</div>
+              <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true" v-if="!edit">
+                添加
+              </div>
+            </div>
+            <div style="padding:20px;">
+              <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                <el-table-column label="序号" width="80">
+                  <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="资源编号" prop="id" width="150">
+
+                </el-table-column>
+                </el-table-column>
+                <el-table-column label="场地名称" prop="venueName" width="150">
+
+                </el-table-column>
+                <el-table-column label="所属区域" prop="district" min-width="150">
+                </el-table-column>
+                <el-table-column label="场地类型" prop="venueType" width="150">
+
+                </el-table-column>
+                <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
+                </el-table-column>
+                <el-table-column label="操作" min-width="150">
+                  <template slot-scope="scope">
+                    <div class="tableBtn greens" @click="addziyuanData = []">删除</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+          <el-form ref="form" :model="xiangData" label-width="120px">
+            <el-form-item label="起止时间">
+              <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="edit" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+                end-placeholder="结束日期" align="right">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="联系人" prop="contactPerson">
+              <el-input placeholder="请输入" v-model="xiangData.contactPerson" :disabled="edit"></el-input>
+            </el-form-item>
+            <el-form-item label="联系电话" prop="contactPhone">
+              <el-input placeholder="请输入" v-model="xiangData.contactPhone" :disabled="edit"></el-input>
+            </el-form-item>
+            <el-form-item label="封面图片" prop="coverImage">
+              <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
+              <img :src="xiangData.coverImage" alt="" v-else>
+            </el-form-item>
+
+          </el-form>
+        </div>
+
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="closeFn(2)">返回</el-button>
+          <el-button @click="edit = false" style="background-color: #3F9B6A;color: #fff"
+            v-if="edit && xiangData.reviewStatus!='2'">编辑</el-button>
+          <el-button @click="addbuss(2)" style="background-color: #3F9B6A;color: #fff" v-else>确认</el-button>
+
+
+        </div>
+      </div>
+
+    </el-dialog>
+
+    <!-- 新增 -->
+    <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
+      class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
+      <div style="margin-bottom: 20px;">
+        <el-form ref="form" :model="formInline" label-width="120px">
+          <el-form-item label="营销活动标题" prop="title">
+            <el-input placeholder="请输入" v-model="formInline.title"></el-input>
+          </el-form-item>
+          <el-form-item label="内容" prop="content" tyle="width: 100%;">
+            <wang-editor v-model="formInline.content" ref="editor" :height="200"></wang-editor>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
+        <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
+          <div>场地选择</div>
+          <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">
+            添加
+          </div>
+        </div>
+        <div style="padding:20px;">
+          <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+            <el-table-column label="序号" width="80">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="资源编号" prop="id" width="150">
+
+            </el-table-column>
+            </el-table-column>
+            <el-table-column label="场地名称" prop="venueName" width="150">
+
+            </el-table-column>
+            <el-table-column label="所属区域" prop="district" min-width="150">
+            </el-table-column>
+            <el-table-column label="场地类型" prop="venueType" width="150">
+
+            </el-table-column>
+            <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
+            </el-table-column>
+            <el-table-column label="操作" min-width="150">
+              <template slot-scope="scope">
+                <div class="tableBtn greens" @click="addziyuanData = []">删除</div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <el-form ref="form" :model="formInline" label-width="120px">
+        <el-form-item label="起止时间">
+          <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="联系人" prop="currentStage">
+          <el-input placeholder="请输入" v-model="formInline.contactPerson"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input placeholder="请输入" v-model="formInline.contactPhone"></el-input>
+        </el-form-item>
+        <el-form-item label="封面图片">
+          <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+        </el-form-item>
+
+      </el-form>
+      <div style="display: flex;justify-content: flex-end;">
+        <el-button @click="closeFn(1)" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+        <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+      </div>
+      <!-- 场地选择 -->
+      <el-dialog :visible.sync="addziyuan" custom-class='XDD_css' style="padding: 0;" width="50%" append-to-body center
+        :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+        <div
+          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div>添加</div>
+        </div>
+        <div style="padding: 15px;width:100%">
+
+          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+            <div
+              style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+              <div>选择场地</div>
+            </div>
+            <div style="padding: 15px;">
+              <div style="padding: 0px 20px 0px 0px">
+                <el-table :data="ziyuanData" highlight-current-row @current-change="handleSelectionChange"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+
+                  <el-table-column label="序号" min-width="8%">
+                    <template slot-scope="scope">
+                      {{scope.$index + 1}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="编号" prop="id" min-width="22%">
+
+                  </el-table-column>
+                  <el-table-column label="场地名称" prop="venueName" min-width="15%">
+
+                  </el-table-column>
+                  <el-table-column label="场地类型" prop="venueType" min-width="15%">
+
+                  </el-table-column>
+                  <el-table-column prop="notes" label="对应策略" min-width="15%">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
+          <el-button @click="mingClose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+          </el-button>
+          <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+          </el-button>
+
+        </div>
+      </el-dialog>
+
+    </el-dialog>
+    <el-dialog :visible.sync="showQF" custom-class='tongyong_css' style="padding: 0;" width="25%" center
+      :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
+        <div style="padding:20px;">
+          <img :src="qfUrl" alt="" style="height:330px;width:80%">
+        </div>
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="showQF =false">返回</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+    <!-- 报名名单 -->
+    <el-dialog :visible.sync="baoming" custom-class='tongyong_css' style="padding: 0;" width="55%" center
+      :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报名名单</div>
+        <div style="padding:20px;">
+          <el-table :data="mingList"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+            <el-table-column label="序号" min-width="150">
+              <template slot-scope="scope">
+                {{scope.$index +1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人" prop="userName" min-width="150">
+
+            </el-table-column>
+            <el-table-column label="联系电话" prop="userPhone" min-width="150">
+
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="baoming =false">返回</el-button>
+        </div>
+      </div>
+
+    </el-dialog>
+  </div>
+
+
+</template>
+
+<script>
+  import {
+    async
+  } from 'q'
+  import axios from 'axios'
+  import wangEditor from "@/components/editor/index";
+  import {
+    MarkGetAll,
+    MarkAdd,
+    MarkEdit,
+    MarkDel,
+    QRcode,
+    Registration
+  } from '../../../api/MarkActivity.js'
+  import upimg from "@/components/ImageUpload/index"
+  import {
+    changAlls
+  } from '../../../api/information.js'
+
+  export default {
+    components: {
+      upimg,
+      wangEditor
+    },
+    data() {
+      return {
+        hetongBox: false,
+        detbox: false, //详情
+        leixing: true, //切换
+        currentPage: 1,
+        total: 10,
+        flag: false,
+        pageSize: 10,
+        ggXin: false,
+        formInline: {
+          title: '',
+          content: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          coverImage: '',
+          registeredCount: '',
+        },
+        plan_Time: [],
+        followUpTime: [],
+        tableData: [],
+        secondData: {},
+        formSel: {
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+        },
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        bianjiBox: 1,
+        chengeTatle: 1,
+        zhong: {},
+        edit: true, //编辑切换
+        xiangTabs: 'first',
+        addkehu: false,
+        addziyuan: false,
+        ziyuanData: [], //资源
+        addziyuanData: [],
+        multipleSelection: [],
+        xiangData: {},
+        showQF: false,
+        qfUrl: '',
+        baoming: false,
+        mingList: []
+      }
+    },
+    created() {
+      this.getAll()
+    },
+    computed: {
+
+    },
+    methods: {
+      // 获取时间
+      currentTime() {
+        let date = new Date();
+        let year = date.getFullYear(); //月份从0~11，所以加一
+        let month = date.getMonth();
+        let dateArr = [date.getMonth() + 1, date.getDate(), date.getHours()]
+        for (let i = 0; i < dateArr.length; i++) {
+          if (dateArr[i] >= 1 && dateArr[i] <= 9) {
+            dateArr[i] = '0' + dateArr[i]
+          }
+        }
+        let strDate = year + '-' + dateArr[0] + '-' + dateArr[1]
+        return strDate
+      },
+      chenge(val) {
+        this.formSel = {
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+        }
+        this.leixing = !this.leixing
+        this.chengeTatle = val
+      },
+      async getAll() {
+        const res = await MarkGetAll(this.pageindex)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+        const ziyuan = await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content]
+
+      },
+
+      // 新增确定按钮
+      async addCheck(val) {
+        if (this.addziyuanData.length != 0) {
+          this.formInline.venue = this.addziyuanData.map(item => item.id).join(',');
+        }
+        if (this.plan_Time.length != 0) {
+          this.formInline.startTime = this.plan_Time[0]
+          this.formInline.endTime = this.plan_Time[1]
+        }
+        this.formInline.reviewStatus = '2'
+        this.formInline.createdAt = this.currentTime()
+        await MarkAdd(this.formInline)
+        this.ggXin = false
+        this.formInline = {
+          title: '',
+          content: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          coverImage: '',
+          registeredCount: '',
+
+        }
+
+        this.plan_Time = []
+        this.addziyuanData = []
+        this.getAll()
+      },
+      // 获取时间
+      currentTime() {
+        let date = new Date();
+        let year = date.getFullYear();
+        let month = date.getMonth() + 1; // 月份从0~11，所以加一
+        let day = date.getDate();
+        let hours = date.getHours();
+        let minutes = date.getMinutes();
+        let seconds = date.getSeconds();
+
+        // 为月、日、小时、分钟和秒添加前导零（如果需要）
+        month = month < 10 ? '0' + month : month;
+        day = day < 10 ? '0' + day : day;
+        hours = hours < 10 ? '0' + hours : hours;
+        minutes = minutes < 10 ? '0' + minutes : minutes;
+        seconds = seconds < 10 ? '0' + seconds : seconds;
+
+        // 返回格式化的日期和时间字符串
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      },
+
+      //详情
+      details(item) {
+        this.plan_Time[0] = item.startTime
+        this.plan_Time[1] = item.endTime
+        this.edit = true
+        this.xiangData = item
+        this.detbox = true
+
+
+
+      },
+      zhongzhi(item) {
+        this.edit = false
+        this.xiangData = item
+        this.detbox = true
+        this.plan_Time[0] = item.startTime
+        this.plan_Time[1] = item.endTime
+      },
+      async addbuss() {
+        if (this.plan_Time.length != 0) {
+          this.xiangData.startTime = this.plan_Time[0]
+          this.xiangData.endTime = this.plan_Time[1]
+        }
+
+        await MarkEdit(this.xiangData)
+        this.plan_Time = []
+        this.detbox = false
+        this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+      },
+
+      closeFn(val) {
+        this.plan_Time = []
+        this.addziyuanData = []
+        this.formInline = {
+          title: '',
+          content: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          coverImage: '',
+          registeredCount: '',
+
+        }
+        this.bianjiBox = 1
+        if (val == 1) {
+          this.ggXin = false
+        } else {
+          this.detbox = false
+        }
+      },
+      //查看合同
+      lookHetong(val) {
+        this.hetongBox = true
+      },
+      // 查询按钮
+      async onSubmit() {
+        this.formSel.pageNumber = 1
+        this.formSel.pageSize = 10
+        const res = await MarkGetAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+        this.formSel = {
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+        }
+      },
+      //重置按钮
+      resetting() {
+        this.formSel = {
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+        }
+        this.getAll()
+      },
+
+      minSev() {
+        this.addziyuanData = this.multipleSelection
+        this.addziyuan = false
+        this.multipleSelection = []
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.addziyuan = false
+      },
+      handleSelectionChange(val) {
+
+        this.multipleSelection.push(val)
+      },
+      deltab(item) {
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否删除 '),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              MarkDel({
+                id: item.id
+              }).then(res => {
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+      },
+      fabu(item, val) {
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否处理'),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              MarkEdit({
+                id: item.id,
+                reviewStatus: val
+              }).then(res => {
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
+
+      },
+      Qcode(items) {
+        this.showQF = true
+        let pgs = {
+          scene: `item='${items.id}'`,
+          // scene:items,
+          page: "pages/marketing/marketingDetail/marketingDetail"
+        }
+        QRcode(pgs).then(res => {
+          this.qfUrl = res.data
+        })
+      },
+      async getMing(ids) {
+        let page = {
+          activityId: ids
+        }
+        const res = await Registration(page)
+        this.mingList = res.data
+        this.baoming = true
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
+  }
+
+  /deep/ .el-form-item__content {
+    line-height: 0;
+  }
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    color: #ACACAC;
+  }
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+  /deep/ .el-table__row {
+    font-size: 14px;
+    color: #000000e6;
+    height: 42px;
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #d3dce6;
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .bg-purple[data-v-3bebae82] {
+    background: #fff;
+    height: 50px;
+  }
+
+  ::v-deep .bg-purple {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+
+  ::v-deep .el-form-item {
+    margin-bottom: 16px;
+  }
+
+  .device-form .el-form-item__label::after {
+    content: "*";
+    color: #1A1A1A;
+    margin-left: 5px;
+    font-size: 16px;
+  }
+
+
+  ::v-deep .el-dialog__wrapper {
+    .el-dialog__header {
+      background-color: #FAFAFA;
+    }
+  }
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    border-top: solid rgba(209, 209, 209, 0.2) 2px;
+    padding-top: 20px;
+  }
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-input__inner:hover {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-select .el-input.is-focus .el-input__inner {
+    border-color: #3F9B6A
+  }
+
+  .el-select-dropdown__item.selected {
+    color: #3F9B6A;
+  }
+
+  .el-pagination__sizes .el-input .el-input__inner:hover {
+    border-color: #3F9B6A;
+  }
+
+  ::v-deep .el-dialog__wrapper {
+
+    .dialog_css {
+      margin-right: 12px;
+      margin-top: 61px !important;
+
+      .el-dialog__title {
+        font-size: 16px !important;
+        font-weight: 600;
+        color: #000;
+      }
+    }
+
+    .diaslog_zhong {
+      margin-left: 25%;
+      margin-top: 61px !important;
+    }
+
+  }
+
+  ::v-deep .diaslog_zhong {
+    margin-left: 20%;
+    margin-top: 61px !important;
+
+    .el-dialog__header {
+      background-color: #fff;
+      border-bottom: 1px solid #EFEFEF;
+
+      .el-dialog__title {
+        font-size: 14px;
+        color: #000000e6;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 10px 30px 30px 20px
+    }
+  }
+
+  /deep/ .el-table_1_column_8 .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
+  }
+
+  /deep/ .first-column-bg {
+    background-color: #FAFAFA !important;
+  }
+
+  ::v-deep .textarea {
+    width: 85%;
+
+    .el-textarea__inner {
+      width: 100%;
+    }
+  }
+
+  ::v-deep .pass_input {
+    width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
+  }
+
+  ::v-deep .pass_select {
+    width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
+
+    .el-icon-arrow-up:before {
+      content: ''
+    }
+
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: #fff;
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 0px;
+    }
+
+    .el-input__inner {
+      height: 18px;
+      border: 0px;
+      margin-top: 0px;
+    }
+
+    .el-input__inner:hover {
+      border: 0px;
+    }
+
+    .el-input__inner:focus {
+      border: 0px;
+    }
+  }
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 33px;
+  }
+
+  ::v-deep .diaslog_zhong {
+    .el-dialog__body {
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-upload--picture-card {
+      width: 130px;
+      height: 130px;
+    }
+  }
+</style>
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index 4aef8dc..45dd843 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -1,32 +1,20 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="zhuti">
+    <div class="zhuti" v-if="onaction == '1'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">营销推广活动</span></div>
       </div>
+      <!-- 线上 -->
       <div>
         <!-- 搜索 -->
         <div class="formSearch">
-          <el-form :inline="true" :model="formSel">
-            <el-form-item label="活动标题">
-              <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
-            </el-form-item>
-            <el-form-item label="场地名称">
-              <el-input v-model="formSel.venue" placeholder="请输入" style="width:168px;" />
-            </el-form-item>
-            <el-form-item label="联系人">
-              <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
-            </el-form-item>
-            <el-form-item label="联系电话">
-              <el-input v-model="formSel.contactPhone" placeholder="请输入" style="width:168px;" />
-            </el-form-item>
-            <el-form-item label="起止时间">
-              <el-select v-model="formSel.startTime" placeholder="请选择" style="width:168px;margin-right: 15px">
-                <el-option label="" value="" />
-              </el-select>
+          <el-form :inline="true" :model="pagequery">
+            <el-form-item label="名称">
+              <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
             </el-form-item>
           </el-form>
+
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -35,690 +23,281 @@
             </el-button>
           </div>
         </div>
-        <div style="margin-bottom: 20px;">
-          <div>
-            <el-button
-            style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
-              @click="ggXin = true">新增</el-button>
-          </div>
-        </div>
+      <div style="margin-bottom:20px;">
+        <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
+        </el-button>
+      </div>
         <!-- 表格 -->
 
-        <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-         >
-          <el-table-column label="序号" min-width="150">
-              <template slot-scope="scope">
-                {{scope.$index +1 }}
-                 </template>
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号" width="50">
+            <template slot-scope="scope">
+              {{scope.$index + 1}}
+            </template>
           </el-table-column>
-          <el-table-column label="活动标题" min-width="200" prop="title">
+          <el-table-column label="活动标题" prop="title">
           </el-table-column>
-          <el-table-column label="场地名称" min-width="150" prop="venue">
+          <el-table-column label="场地名称"  prop="venue">
           </el-table-column>
-          <el-table-column label="起止时间" prop="startTime" min-width="250">
+          <el-table-column label="起止时间" prop="startTime" >
           </el-table-column>
-          <el-table-column label="联系人" prop="contactPerson" min-width="150">
+          <el-table-column label="联系人" prop="contactPerson" >
 
           </el-table-column>
-          <el-table-column label="联系电话" prop="contactPhone" min-width="150">
+          <el-table-column label="联系电话" prop="contactPhone" >
 
           </el-table-column>
-          <el-table-column label="已参与报名人数" prop="registeredCount" min-width="150">
+          <el-table-column label="已参与报名人数" prop="registeredCount" >
           </el-table-column>
-          <el-table-column prop="createdAt" label="创建时间" min-width="250">
+          <el-table-column prop="createdAt" label="创建时间" >
 
           </el-table-column>
-          <el-table-column label="创建人" prop="createdBy" min-width="150">
+          <el-table-column label="创建人" prop="createdBy" >
           </el-table-column>
-          <el-table-column prop="reviewStatus" label="状态" min-width="150">
+          <el-table-column prop="reviewStatus" label="状态" >
              <template slot-scope="scope">
                {{scope.row.reviewStatus=='1'?'未发布':'已发布'}}
                 </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="350">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="fabu(scope.row,'2')" class="tableBtn greens" v-if="scope.row.reviewStatus=='1'">发布</div>
-              <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.reviewStatus=='2'">下架</div>
-              <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">编辑</div>
-              <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.reviewStatus!='1'">报名名单</div>
-              <div @click="deltab(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">删除</div>
-              <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div>
+              <!-- <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div> -->
             </template>
           </el-table-column>
         </el-table>
-        <div class="fenye">
-          <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
-            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        <div style="display: flex;justify-content: space-between;" class="bom">
+          <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
         </div>
+
       </div>
 
     </div>
-    <!-- 详情框 -->
-    <el-dialog :visible.sync="detbox" custom-class='tongyong_css' style="padding: 0;" width="65%" center
-      :close-on-click-modal="false" :show-close="false">
-      <div style="padding:20px;">
-        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
-        <div>
-
-          <el-form ref="form" :model="xiangData" label-width="120px">
-            <el-form-item label="营销活动标题" prop="title">
-              <el-input placeholder="请输入"  v-model="xiangData.title" :disabled="edit" ></el-input>
-            </el-form-item>
-            <el-form-item label="内容" prop="content" tyle="width: 100%;">
-              <wang-editor v-model="xiangData.content" ref="editor" :height="200" v-if="!edit"></wang-editor>
-              <div v-html="xiangData.content" style="line-height:40px" v-else></div>
-            </el-form-item>
-          </el-form>
-          <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
-                 <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
-                   <div>场地选择</div>
-                   <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true" v-if="!edit">
-                     添加
-                   </div>
-                 </div>
-                 <div style="padding:20px;">
-                   <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-                     :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                  >
-                     <el-table-column label="序号" width="80" >
-                       <template slot-scope="scope">
-                         {{scope.$index + 1}}
-                       </template>
-                     </el-table-column>
-                     <el-table-column label="资源编号" prop="id" width="150">
-
-                     </el-table-column>
-                     </el-table-column>
-                     <el-table-column label="场地名称"   prop="venueName"
-          width="150">
-
-                     </el-table-column>
-                     <el-table-column label="所属区域" prop="district" min-width="150">
-                     </el-table-column>
-                     <el-table-column label="场地类型"  prop="venueType"  width="150">
-
-                     </el-table-column>
-                     <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
-                     </el-table-column>
-                     <el-table-column label="操作"  min-width="150">
-                       <template slot-scope="scope">
-                       <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
-                       </template>
-                     </el-table-column>
-                   </el-table>
-                 </div>
-               </div>
-               <el-form ref="form" :model="xiangData" label-width="120px">
-                 <el-form-item label="起止时间">
-                   <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" :disabled="edit"
-                     type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
-                   </el-date-picker>
-                 </el-form-item>
-                 <el-form-item label="联系人" prop="contactPerson">
-                   <el-input placeholder="请输入"  v-model="xiangData.contactPerson"  :disabled="edit"></el-input>
-                 </el-form-item>
-                 <el-form-item label="联系电话"  prop="contactPhone">
-                   <el-input placeholder="请输入"  v-model="xiangData.contactPhone"  :disabled="edit"></el-input>
-                 </el-form-item>
-                 <el-form-item label="封面图片" prop="coverImage">
-                   <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
-                   <img :src="xiangData.coverImage" alt="" v-else>
-                 </el-form-item>
-
-               </el-form>
-        </div>
 
-        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-            @click="closeFn(2)">返回</el-button>
-          <el-button @click="edit = false" style="background-color: #3F9B6A;color: #fff" v-if="edit && xiangData.reviewStatus!='2'">编辑</el-button>
-          <el-button @click="addbuss(2)" style="background-color: #3F9B6A;color: #fff" v-else>确认</el-button>
 
 
-        </div>
-      </div>
 
-    </el-dialog>
 
-    <!-- 新增 -->
-    <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
-      class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
-      <div style="margin-bottom: 20px;">
-        <el-form ref="form" :model="formInline" label-width="120px">
-          <el-form-item label="营销活动标题" prop="title">
-            <el-input placeholder="请输入"  v-model="formInline.title" ></el-input>
-          </el-form-item>
-          <el-form-item label="内容" prop="content" tyle="width: 100%;">
-            <wang-editor v-model="formInline.content" ref="editor" :height="200"></wang-editor>
-          </el-form-item>
-        </el-form>
-      </div>
 
-      <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
-        <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
-          <div>场地选择</div>
-          <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">
-            添加
-          </div>
+    <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
+      <div>
+        <div style="margin-bottom: 20px;">
+          <el-form ref="form" :model="detailsinfo" label-width="120px">
+            <el-form-item label="审核状态" prop="checkState">
+              <el-select v-model="detailsinfo.checkState" placeholder="请选择" style="width: 100%;">
+                <!-- <el-option label="待审核" value="1"></el-option> -->
+                <el-option label="同意" value="2"></el-option>
+                <el-option label="拒绝" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审核意见">
+              <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
+            </el-form-item>
+          </el-form>
+
         </div>
-        <div style="padding:20px;">
-          <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-         >
-            <el-table-column label="序号" width="80" >
-              <template slot-scope="scope">
-                {{scope.$index + 1}}
-              </template>
-            </el-table-column>
-            <el-table-column label="资源编号" prop="id" width="150">
-
-            </el-table-column>
-            </el-table-column>
-            <el-table-column label="场地名称"   prop="venueName"
- width="150">
-
-            </el-table-column>
-            <el-table-column label="所属区域" prop="district" min-width="150">
-            </el-table-column>
-            <el-table-column label="场地类型"  prop="venueType"  width="150">
-
-            </el-table-column>
-            <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
-            </el-table-column>
-            <el-table-column label="操作"  min-width="150">
-              <template slot-scope="scope">
-              <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
-              </template>
-            </el-table-column>
-          </el-table>
+        <div style="display: flex;justify-content: flex-end;">
+          <el-button @click="yuclose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+          <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
         </div>
       </div>
-      <el-form ref="form" :model="formInline" label-width="120px">
-        <el-form-item label="起止时间">
-          <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="联系人" prop="currentStage">
-          <el-input placeholder="请输入"  v-model="formInline.contactPerson" ></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input placeholder="请输入"  v-model="formInline.contactPhone" ></el-input>
-        </el-form-item>
-        <el-form-item label="封面图片">
-          <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-        </el-form-item>
-
-      </el-form>
-      <div style="display: flex;justify-content: flex-end;">
-        <el-button @click="closeFn(1)" class="buttonHover"
-          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-        <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+    </el-dialog>
+    <div class="zhuti" v-if="onaction == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">新增</span></div>
       </div>
-      <!-- 场地选择 -->
-      <el-dialog :visible.sync="addziyuan" custom-class='XDD_css' style="padding: 0;" width="50%"
-        append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-        <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-          <div>添加</div>
-        </div>
-        <div style="padding: 15px;width:100%">
-
-          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-            <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-              <div>选择场地</div>
-            </div>
-            <div style="padding: 15px;">
-              <div style="padding: 0px 20px 0px 0px">
-                <el-table :data="ziyuanData"
-                highlight-current-row
-                    @current-change="handleSelectionChange"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                  >
-
-                  <el-table-column label="序号"  min-width="8%" >
-                    <template slot-scope="scope">
-                      {{scope.$index + 1}}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="编号" prop="id" min-width="22%">
-
-                  </el-table-column>
-                  <el-table-column label="场地名称" prop="venueName" min-width="15%">
-
-                  </el-table-column>
-                  <el-table-column label="场地类型"  prop="venueType" min-width="15%">
-
-                  </el-table-column>
-                  <el-table-column prop="notes" label="对应策略" min-width="15%">
-                  </el-table-column>
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-          <el-button  @click="mingClose" class="buttonHover"
-                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
-          </el-button>
-          <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
-          </el-button>
 
-        </div>
-      </el-dialog>
-
-    </el-dialog>
-    <el-dialog :visible.sync="showQF" custom-class='tongyong_css' style="padding: 0;" width="25%" center
-          :close-on-click-modal="false" :show-close="false">
-          <div style="padding:20px;">
-            <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
-            <div style="padding:20px;">
-               <img :src="qfUrl" alt="" style="height:330px;width:80%">
-            </div>
-            <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="showQF =false">返回</el-button>
-            </div>
-          </div>
+      <div style="padding: 20px 20px 20px 0;">
+        <add @removeonaction="removeonaction"></add>
+      </div>
+    </div>
+    <div class="zhuti" v-if="onaction == '3'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">查看</span></div>
+      </div>
+      <div>
+        <merchantInformation :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
+      </div>
+      <!-- <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="removeonaction('1')">返回</el-button>
+      </div> -->
+    </div>
 
-        </el-dialog>
-        <!-- 报名名单 -->
-        <el-dialog :visible.sync="baoming" custom-class='tongyong_css' style="padding: 0;" width="55%" center
-              :close-on-click-modal="false" :show-close="false">
-              <div style="padding:20px;">
-                <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报名名单</div>
-                <div style="padding:20px;">
-                   <el-table :data="mingList"
-                     :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                    >
-                     <el-table-column label="序号" min-width="150">
-                         <template slot-scope="scope">
-                           {{scope.$index +1 }}
-                            </template>
-                     </el-table-column>
-                     <el-table-column label="联系人" prop="userName" min-width="150">
-
-                     </el-table-column>
-                     <el-table-column label="联系电话" prop="userPhone" min-width="150">
-
-                     </el-table-column>
-                   </el-table>
-                </div>
-                <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-                  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                    @click="baoming =false">返回</el-button>
-                </div>
-              </div>
-
-            </el-dialog>
   </div>
-
+  <!-- </div> -->
 
 </template>
 
 <script>
+  import add from '@/components/add/addMarkActivity.vue'
   import {
-    async
-  } from 'q'
-  import axios from 'axios'
-  import wangEditor from "@/components/editor/index";
-  import {
-   MarkGetAll,
-   MarkAdd,
-   MarkEdit,
-   MarkDel,
-   QRcode,
-   Registration
+    MarkGetAll,
+    MarkAdd,
+    MarkEdit,
+    MarkDel,
+    QRcode,
+    Registration
   } from '../../../api/MarkActivity.js'
-  import upimg from "@/components/ImageUpload/index"
   import {
-   changAlls
-  } from '../../../api/information.js'
-
+    cereReminderSet,
+    cereReminderSetedit
+  } from '../../../api/commodityLease.js'
+  import merchantInformation from '../../../components/merchantInformation/index.vue'
+  import wangEditor from "@/components/editor/index"
   export default {
-    components: {
-      upimg,
-      wangEditor
-    },
     data() {
       return {
-        hetongBox: false,
-        detbox: false, //详情
-        leixing: true, //切换
-        currentPage: 1,
-        total: 10,
-        flag: false,
-        pageSize: 10,
-        ggXin: false,
-        formInline: {
-          title:'',
-          content:'',
-          venue:'',
-          contactPerson:'',
-          contactPhone:'',
-          coverImage:'',
-          registeredCount:'',
-        },
-        plan_Time:[],
-        followUpTime:[],
-        tableData: [],
-        secondData: {},
-        formSel: {
-         title:'',
-         venue:'',
-         contactPerson:'',
-         contactPhone:'',
+        zhong: {
+
         },
-        pageindex: {
-      pageNumber: 1,
-      pageSize: 10,
+        yujingSet: false,
+        detailsinfo: {},
+        pagequery: {
+          pageNumber: 0,
+          pageSize: 10,
+          checkState:'2',
+          name: '',
+
         },
-        bianjiBox: 1,
-        chengeTatle: 1,
-        zhong: {},
-        edit: true, //编辑切换
-        xiangTabs:'first',
-        addkehu:false,
-        addziyuan:false,
-        ziyuanData:[],//资源
-        addziyuanData:[],
-        multipleSelection:[],
-        xiangData:{},
-        showQF:false,
-        qfUrl:'',
-        baoming:false,
-        mingList:[]
+        tableData: [],
+        total: 0,
+        onaction: '1',
+        info: {}
       }
     },
+    components: {
+      add,
+      merchantInformation,
+      wangEditor
+    },
     created() {
       this.getAll()
-    },
-    computed: {
 
     },
     methods: {
-      // 获取时间
-      currentTime() {
-        let date = new Date();
-        let year = date.getFullYear(); //月份从0~11，所以加一
-        let month = date.getMonth();
-        let dateArr = [date.getMonth() + 1, date.getDate(), date.getHours()]
-        for (let i = 0; i < dateArr.length; i++) {
-          if (dateArr[i] >= 1 && dateArr[i] <= 9) {
-            dateArr[i] = '0' + dateArr[i]
+      calculateDaysUntilExpiration(endDateString) {
+            const endDate = new Date(endDateString);
+            const today = new Date();
+            const timeDifference = endDate - today;
+            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+            return daysDifference >= 0 ? daysDifference : '已过期';
+        },
+      yuclose() {
+        this.yujingSet = false
+      },
+      yuChenk() {
+        console.error(this.detailsinfo)
+        cerePlatformMerchantedit(this.detailsinfo).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.yujingSet = false
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
           }
-        }
-        let strDate = year + '-' + dateArr[0] + '-' + dateArr[1]
-        return strDate
+        })
+        
       },
-      chenge(val) {
-        this.formSel = {
-          title:'',
-         venue:'',
-         contactPerson:'',
-         contactPhone:'',}
-        this.leixing = !this.leixing
-        this.chengeTatle = val
+      openyujingSet(row) {
+        // cereReminderSet({
+        //   reminderType: '1'
+        // }).then(res => {
+        //   console.error(res)
+        //   this.zhong = res.data
+        // })
+        this.detailsinfo = JSON.parse(JSON.stringify(row))
+        this.yujingSet = true
       },
-      async getAll() {
-        const res = await MarkGetAll(this.pageindex)
-        this.tableData = res.data.content
-        this.total = res.data.content.length
-        const ziyuan =  await changAlls(this.pageindex)
-        this.ziyuanData = [...ziyuan.data.content]
-
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
       },
-
-      // 新增确定按钮
-      async addCheck(val) {
-        if(this.addziyuanData.length !=0){
-          this.formInline.venue  = this.addziyuanData.map(item => item.id).join(',');
-        }
-        if(this.plan_Time.length !=0){
-          this.formInline.startTime =  this.plan_Time[0]
-          this.formInline.endTime = this.plan_Time[1]
-        }
-        this.formInline.reviewStatus = '2'
-        this.formInline.createdAt = this.currentTime()
-        await MarkAdd(this.formInline)
-        this.ggXin = false
-        this.formInline =  {
-            title:'',
-            content:'',
-            venue:'',
-            contactPerson:'',
-            contactPhone:'',
-            coverImage:'',
-            registeredCount:'',
-
-        }
-
-        this.plan_Time =[]
-        this.addziyuanData =[]
-        this.getAll()
+      biangeng(row) {
+        alert(`合同变更 - 店铺ID: ${row.id}`);
       },
-      // 获取时间
-      currentTime() {
-       let date = new Date();
-        let year = date.getFullYear();
-        let month = date.getMonth() + 1; // 月份从0~11，所以加一
-        let day = date.getDate();
-        let hours = date.getHours();
-        let minutes = date.getMinutes();
-        let seconds = date.getSeconds();
-
-        // 为月、日、小时、分钟和秒添加前导零（如果需要）
-        month = month < 10 ? '0' + month : month;
-        day = day < 10 ? '0' + day : day;
-        hours = hours < 10 ? '0' + hours : hours;
-        minutes = minutes < 10 ? '0' + minutes : minutes;
-        seconds = seconds < 10 ? '0' + seconds : seconds;
-
-        // 返回格式化的日期和时间字符串
-        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      xuyue(row) {
+        alert(`合同续约 - 店铺ID: ${row.id}`);
       },
-
-      //详情
-       details(item) {
-         this.plan_Time[0] = item.startTime
-         this.plan_Time[1] = item.endTime
-        this.edit = true
-        this.xiangData = item
-        this.detbox = true
-
-
-
-      },
-      zhongzhi(item){
-        this.edit = false
-        this.xiangData = item
-        this.detbox = true
- this.plan_Time[0] = item.startTime
-        this.plan_Time[1] = item.endTime
+      zhongzhi(row) {
+        alert(`合同终止 - 店铺ID: ${row.id}`);
       },
-     async addbuss() {
-       if(this.plan_Time.length !=0){
-         this.xiangData.startTime =  this.plan_Time[0]
-         this.xiangData.endTime = this.plan_Time[1]
-       }
-
-       await MarkEdit(this.xiangData)
-       this.plan_Time = []
-        this.detbox = false
-        this.getAll()
+      async getAll() {
+        const res = await MarkGetAll(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
       },
-      handleSizeChange(val) {
-        this.pageSize = val
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
+        this.onSubmit()
       },
       handleCurrentChange(val) {
-        this.currentPage = val
-      },
-
-      closeFn(val) {
-        this.plan_Time =[]
-        this.addziyuanData =[]
- this.formInline =  {
-            title:'',
-            content:'',
-            venue:'',
-            contactPerson:'',
-            contactPhone:'',
-            coverImage:'',
-            registeredCount:'',
-
-        }
-        this.bianjiBox = 1
-        if (val == 1) {
-          this.ggXin = false
-        } else {
-          this.detbox = false
-        }
+        this.pagequery.pageNumber = val - 1
+        this.getAll()
       },
-      //查看合同
-      lookHetong(val) {
-        this.hetongBox = true
+      handleSizeChange(val) {
+        this.pagequery.pageSize = val
       },
       // 查询按钮
       async onSubmit() {
-      this.formSel.pageNumber = 1
-      this.formSel.pageSize = 10
-       const res =  await MarkGetAll(this.formSel)
-        this.tableData = res.data.content
-        this.total = res.data.content.length
- this.formSel = {
-          title:'',
-         venue:'',
-         contactPerson:'',
-         contactPhone:'',
-         }
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
       //重置按钮
       resetting() {
-        this.formSel = {
-          title:'',
-         venue:'',
-         contactPerson:'',
-         contactPhone:'',}
+        this.pagequery = {
+            pageNumber: 0,
+            pageSize: 10,
+            checkState:'2',
+            name: ''
+          },
           this.getAll()
       },
-
-  minSev() {
-        this.addziyuanData = this.multipleSelection
-        this.addziyuan = false
-        this.multipleSelection =[]
-      },
-      mingClose(){
-        this.multipleSelection =[]
-        this.addziyuan = false
-      },
-      handleSelectionChange(val) {
-
-        this.multipleSelection.push(val)
-      },
-      deltab(item){
-            const h = this.$createElement;
-                    this.$msgbox({
-                      title: '消息',
-                      message: h('p', null, [
-                        h('span', null, '是否删除 '),
-                      ]),
-                      showCancelButton: true,
-                      showClose:false,
-                      confirmButtonText: '确定',
-                      cancelButtonText: '取消',
-                      customClass:'oe-dialog-btn',
-                      beforeClose: (action, instance, done) => {
-                        if (action === 'confirm') {
-                          MarkDel({id:item.id}).then(res=>{
-                             this.getAll()
-                            done();
-                          })
-                        } else {
-                          done();
-                        }
-          }
-          })
-      },
-      fabu(item,val){
-        const h = this.$createElement;
-                  this.$msgbox({
-                    title: '消息',
-                    message: h('p', null, [
-                      h('span', null, '是否处理'),
-                    ]),
-                    showCancelButton: true,
-                    showClose:false,
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    customClass:'oe-dialog-btn',
-                    beforeClose: (action, instance, done) => {
-                      if (action === 'confirm') {
-                        MarkEdit({id:item.id,reviewStatus:val}).then(res=>{
-                           this.getAll()
-                          done();
-                        })
-                      } else {
-                        done();
-                      }
-        }
-        })
-
-      },
-      Qcode(items){
-        this.showQF = true
-        let pgs={
-           scene:`item='${items.id}'`,
-           // scene:items,
-           page:"pages/marketing/marketingDetail/marketingDetail"
-        }
-         QRcode(pgs).then(res=>{
-            this.qfUrl = res.data
-         })
-      },
-     async getMing(ids){
-       let page={
-         activityId:ids
-       }
-      const res =  await Registration(page)
-      this.mingList = res.data
-        this.baoming = true
-      }
-
     }
+
   }
 </script>
 
 <style scoped>
   .zhuti {
-    padding: 0 20px 20px 20px;
+    padding: 0  20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
 
   }
-
-  .chengeXia {
-    border-bottom: 6px solid #3F9B6A;
-    padding-bottom: 4px;
-    color: #3F9B6A;
+  .chengeXia{
+    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
   }
 
   /deep/ .el-form-item__content {
-    line-height: 0;
+    /* line-height: 0; */
   }
 
-  .tableBtn {
-    display: inline-block;
-    margin-right: 10px;
-    color: #ACACAC;
-  }
+ 
 
   .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
+    padding-bottom: 10px;
+
   }
 
   .greens {
@@ -727,8 +306,8 @@
 
   /deep/ .el-table__row {
     font-size: 14px;
-    color: #000000e6;
-    height: 42px;
+    color:#000000e6;
+    height:42px;
   }
 
   .fenye {
@@ -779,25 +358,21 @@
     background: #fff;
     height: 50px;
   }
-
-  /deep/ .bg-purple[data-v-3bebae82] {
+    /deep/ .bg-purple[data-v-3bebae82]{
     background: #fff;
     height: 50px;
   }
 
-  ::v-deep .bg-purple {
+::v-deep .bg-purple{
     background: #fff;
     height: 50px;
   }
-
   /deep/ .el-form--label-top .el-form-item__label {
     padding: 0;
   }
-
-  ::v-deep .el-form-item {
-    margin-bottom: 16px;
-  }
-
+::v-deep .el-form-item{
+  margin-bottom:16px;
+}
   .device-form .el-form-item__label::after {
     content: "*";
     color: #1A1A1A;
@@ -811,162 +386,133 @@
       background-color: #FAFAFA;
     }
   }
-
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
-  }
-
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
   .dialog-footer {
     display: flex;
     justify-content: flex-end;
     border-top: solid rgba(209, 209, 209, 0.2) 2px;
     padding-top: 20px;
   }
-
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
-  }
-
-  ::v-deep .el-input__inner:hover {
-    border: #3F9B6A 1px solid;
-  }
-
-  ::v-deep .el-select .el-input.is-focus .el-input__inner {
-    border-color: #3F9B6A
-  }
-
-  .el-select-dropdown__item.selected {
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
+   ::v-deep .el-input__inner:hover {
+        border: #3F9B6A 1px solid;
+     }
+     ::v-deep .el-select .el-input.is-focus .el-input__inner{
+         border-color:#3F9B6A
+     }
+::v-deep .btn .el-button:focus,
+.el-button:hover {
+  border: 1px solid #3F9B6A;
+}
+.el-select-dropdown__item.selected{
     color: #3F9B6A;
-  }
+}
 
-  .el-pagination__sizes .el-input .el-input__inner:hover {
+.el-pagination__sizes .el-input .el-input__inner:hover{
     border-color: #3F9B6A;
-  }
-
-  ::v-deep .el-dialog__wrapper {
+}
+::v-deep .el-dialog__wrapper{
 
-    .dialog_css {
+  .dialog_css{
       margin-right: 12px;
-      margin-top: 61px !important;
-
+      margin-top:61px !important;
       .el-dialog__title {
         font-size: 16px !important;
         font-weight: 600;
         color: #000;
       }
-    }
-
-    .diaslog_zhong {
-      margin-left: 25%;
-      margin-top: 61px !important;
-    }
-
   }
-
-  ::v-deep .diaslog_zhong {
-    margin-left: 20%;
-    margin-top: 61px !important;
-
-    .el-dialog__header {
-      background-color: #fff;
-      border-bottom: 1px solid #EFEFEF;
-
-      .el-dialog__title {
-        font-size: 14px;
-        color: #000000e6;
-      }
-    }
-
-    .el-dialog__body {
-      padding: 10px 30px 30px 20px
-    }
-  }
-
-  /deep/ .el-table_1_column_8 .hetong {
-    color: #7DBB9A;
-    text-decoration: underline;
+  .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+  }
+
+}
+ ::v-deep .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+     .el-dialog__header{
+       background-color:#fff;
+       border-bottom:1px solid #EFEFEF;
+       .el-dialog__title{
+         font-size: 14px;
+          color: #000000e6;
+       }
+     }
+     .el-dialog__body{
+       padding:10px 20px 30px 20px
+     }
   }
 
-  /deep/ .first-column-bg {
+ /deep/ .el-table_1_column_8 .hetong{
+   color:#7DBB9A;
+   text-decoration: underline;
+}
+/deep/ .first-column-bg {
     background-color: #FAFAFA !important;
   }
 
-  ::v-deep .textarea {
-    width: 85%;
+.el-table tr{
+  height:56px;
+}
 
-    .el-textarea__inner {
-      width: 100%;
-    }
+::v-deep .table3{
+  .el-table__empty-block{
+    display:none;
   }
-
-  ::v-deep .pass_input {
+}
+::v-deep .textarea{
+  width: 85%;
+   .el-textarea__inner{
     width: 100%;
-
-    .el-input__inner {
-      border: none;
-      padding: 0;
-    }
   }
-
-  ::v-deep .pass_select {
+}
+::v-deep .el-button--mini{
+  padding: 7px 10px;
+}
+::v-deep .pass_input{
     width: 100%;
-
     .el-input__inner {
       border: none;
-      padding: 0;
+       padding:0;
+       }
+  }
+::v-deep .pass_select{
+  width: 100%;
+ .el-input__inner {
+   border: none;
+   padding:0;
     }
+  .el-icon-arrow-up:before{
+    content:''
+  }
 
-    .el-icon-arrow-up:before {
-      content: ''
-    }
+}
+ /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+  background-color: #fff;
+}
 
-  }
 
-  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-    background-color: #fff;
-  }
 </style>
 <style lang="scss" scoped>
-  ::v-deep .bian_css {
-    .el-dialog__header {
-      padding: 0px;
-    }
-
-    .el-input__inner {
-      height: 18px;
-      border: 0px;
-      margin-top: 0px;
-    }
-
-    .el-input__inner:hover {
-      border: 0px;
-    }
-
-    .el-input__inner:focus {
-      border: 0px;
+  ::v-deep .bian_css{
+    .el-dialog__header{
+      padding:0px;
     }
   }
-
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
+  ::v-deep .buttonHover:hover{
+    color:#3f9b6a !important;
     border-color: #c5e1d2 !important;
     background-color: #ecf5f0 !important;
     outline: none;
   }
-
-  ::v-deep .el-pagination__total {
-    position: absolute;
-    left: 33px;
-  }
-
-  ::v-deep .diaslog_zhong {
-    .el-dialog__body {
-      padding: 10px 20px 20px 20px;
-    }
-
-    .el-upload--picture-card {
-      width: 130px;
-      height: 130px;
-    }
+  ::v-deep .el-pagination__total{
+        position: absolute;
+        left: 33px;
   }
 </style>
+
diff --git a/wenjuan/.env.staging b/wenjuan/.env.staging
index 6fcc798..92c884e 100644
--- a/wenjuan/.env.staging
+++ b/wenjuan/.env.staging
@@ -6,4 +6,4 @@ ENV = 'staging'
 # base api
 VUE_APP_BASE_API = '/stage-api'
 
-VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'
+VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'