diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue
index 96449f0..386d781 100644
--- a/admin-web-master/src/App.vue
+++ b/admin-web-master/src/App.vue
@@ -22,7 +22,8 @@ export default {
   name: "App",
   data() {
     return {
-      tipShow: false
+      tipShow: false,
+
     };
   },
   created() {
@@ -76,14 +77,16 @@ export default {
   .el-pagination.is-background .el-pager li:not(.disabled).active {
     background-color: #3F9B6A;
   }
-  ::v-deep .buttonHover:hover {
-    color: #fff !important;
+  .buttonHover:hover {
+    color: #3f9b6a !important;
     border-color: #c5e1d2 !important;
     background-color: #ecf5f0 !important;
     outline: none;
   }
 
-
+  .greens {
+    color: #3F9B6A;
+  }
 .font{
    font-family: "Alibaba-PuHuiTi-Regular";
 }
@@ -157,9 +160,9 @@ export default {
            border-color:#3F9B6A;
          }
          .el-button:focus, .el-button:hover{
-           color:#606266;
+           /* color:#606266;
            border-color:#DCDFE6;
-           background-color:#fff;
+           background-color:#fff; */
          }
         .el-button--primary{
            background-color:#3F9B6A;
@@ -227,10 +230,7 @@ export default {
         font-weight: 400;
   }
   .el-button:hover{
-      color: #ffffff;
-      border-color: #79b997;
-      background-color: #79b997 !important;
-      outline: none;
+        opacity: 0.8;
       }
       .el-upload--picture-card:hover, .el-upload:focus{
         border-color:#3F9B6A;
diff --git a/admin-web-master/src/assets/images/upload.png b/admin-web-master/src/assets/images/upload.png
new file mode 100644
index 0000000..0794110
--- /dev/null
+++ b/admin-web-master/src/assets/images/upload.png
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index 3b18ddd..d57d8ec 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -1,81 +1,112 @@
 <template>
   <div>
     <el-form :model="ruleForm" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
-      <el-form-item label="商铺名称" prop="shopName">
-        <el-input v-model="ruleForm.shopName" placeholder="请输入" maxlength="50"></el-input>
-      </el-form-item>
-      <el-form-item label="商铺类型" prop="shopType">
-        <el-select v-model="ruleForm.shopType" placeholder="请选择" style="width: 100%;">
-          <el-option label="移动铺位" value="1"></el-option>
-          <el-option label="固定铺位" value="2"></el-option>
-        </el-select>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="商铺名称" prop="shopName">
+            <el-input v-model="ruleForm.shopName" placeholder="请输入" maxlength="20"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商铺类型" prop="shopType">
+            <el-select v-model="ruleForm.shopType" placeholder="请选择" style="width: 100%;">
+              <el-option label="移动铺位" value="1"></el-option>
+              <el-option label="固定铺位" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="测绘面积" prop="surveyingArea">
+            <el-input v-model.number="ruleForm.surveyingArea" placeholder="请输入" maxlength="10" @input="validateNumber('surveyingArea', $event)">
+              <template slot="append">M<sup>2</sup></template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产权面积" prop="propertyArea">
+            <el-input v-model.number="ruleForm.propertyArea" placeholder="请输入" maxlength="10" @input="validateNumber('propertyArea', $event)">
+              <template slot="append">M<sup>2</sup></template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="实际使用面积" prop="actualUsableArea">
+            <el-input v-model.number="ruleForm.actualUsableArea" placeholder="请输入" maxlength="10" @input="validateNumber('actualUsableArea', $event)">
+              <template slot="append">M<sup>2</sup></template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属区域" prop="belongingRegion">
+            <el-select v-model="ruleForm.belongingRegion" 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="belongingDepartment">
+            <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" maxlength="20">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人" prop="head">
+            <el-input v-model="ruleForm.head" placeholder="请输入" maxlength="10">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="contacts">
+            <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="10">
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系方式" prop="telephone">
+            <el-input v-model="ruleForm.telephone" placeholder="请输入" maxlength="20">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
 
-      </el-form-item>
-      <el-form-item label="测绘面积" prop="surveyingArea">
-        <el-input v-model="ruleForm.surveyingArea" placeholder="请输入">
-          <template slot="append">M<sup>2</sup></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="产权面积" prop="propertyArea">
-        <el-input v-model="ruleForm.propertyArea" placeholder="请输入">
-          <template slot="append">M<sup>2</sup></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="实际使用面积" prop="actualUsableArea">
-        <el-input v-model="ruleForm.actualUsableArea" placeholder="请输入">
-          <template slot="append">M<sup>2</sup></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="所属区域" prop="belongingRegion">
-        <el-select v-model="ruleForm.belongingRegion" placeholder="请选择" style="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-form-item label="归属部门" prop="belongingDepartment">
-        <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" maxlength="50">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="负责人" prop="head">
-        <el-input v-model="ruleForm.head" placeholder="请输入" maxlength="20">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="联系人" prop="contacts">
-        <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="20">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="联系方式" prop="telephone">
-        <el-input v-model="ruleForm.telephone" placeholder="请输入" maxlength="20">
-        </el-input>
-      </el-form-item>
       <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="mapPunctuation">
         <div style="width: 100%;height: 300px;">
-          <newmap :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
+          <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
         </div>
       </el-form-item>
       <el-form-item label="商铺描述" prop="shopDescription">
         <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.shopDescription" placeholder="请输入"
           type="textarea" />
       </el-form-item>
-      <el-form-item label="建筑图纸" prop="architecturalDrawings">
-        <upimg filePath="sp" inputtype="architecturalDrawings" :value="ruleForm.architecturalDrawings"
+      <el-form-item  label="建筑图纸" prop="architecturalDrawings">
+        <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="sp" inputtype="architecturalDrawings" :value="ruleForm.architecturalDrawings"
           @changimg="e=>changimg(e,'architecturalDrawings')"></upimg>
       </el-form-item>
-      <el-form-item label="展示主图" prop="displayMainImage">
+      <el-form-item label="宣传图" prop="displayMainImage">
         <upimg filePath="sp" inputtype="displayMainImage" :value="ruleForm.displayMainImage"
           @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>
+      </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -115,10 +146,15 @@
       MapMark,
       newmap
     },
+    computed: {
+      regionOptions() {
+        return this.$store.state.app.regionOptions;
+      }
+    },
     data() {
       return {
-        lat:30.67,
-        lng:104.06,
+        lat: 30.67,
+        lng: 104.06,
         uploadFileUrl: uploadUrl, // 请求地址
         ruleForm: {
           shopName: '', // 商铺名称
@@ -135,7 +171,7 @@
           shopDescription: '', // 商铺描述
           displayMainImage: '', // 展示主图
           otherImageVideos: '', // 其他图片视频
-          rentalStatus: '', // 租赁状态（0.待租  1.已租）
+          rentalStatus: '', // 租赁状态
           publishStatus: '', // 发布状态
           leaseExpirationDate: '', // 租赁到期时间
           createDate: '', // 创建时间
@@ -143,12 +179,17 @@
           updateDate: '', // 修改时间
           updateUser: '', // 修改人
           businessNature: '', // 经营性质
-          telephone: '', // 联系方式
+          telephone: '', // 联系电话
           identityCard: '', // 身份证号码
           belongingGreenwaySection: '', // 所属绿道段
           belongingParkTrail: '', // 所属公园/步道
           floorSpace: '', // 建筑面积
-          contractNumber: '' // 合同编号
+          contractNumber: '', // 合同编号
+          shopType: '1', // 商铺类型
+          surveyingArea: '', // 测绘面积
+          propertyArea: '', // 产权面积
+          contacts: '', // 联系人
+          planningDrawings: '' // 规划图纸
         },
         rulesHetong: {
           shopName: [{
@@ -156,46 +197,31 @@
             message: '请输入商铺名称',
             trigger: 'blur'
           }, ],
-          houseNumber: [{
+          shopType: [{
             required: true,
-            message: '请输入门牌号',
+            message: '请选择商铺类型',
             trigger: 'blur'
           }, ],
-          architecturalForm: [{
-            required: true,
-            message: '请选择建筑形式',
-            trigger: 'change'
-          }],
-          actualUsableArea: [{
-            required: true,
-            message: '请输入实际使用面积',
-            trigger: 'blur'
-          }],
           belongingRegion: [{
             required: true,
             message: '请选择所属区域',
             trigger: 'change'
           }],
-          head: [{
-            required: true,
-            message: '请输入负责人',
-            trigger: 'blur'
-          }, ],
           detailedLocation: [{
             required: true,
             message: '请输入详细位置',
             trigger: 'blur'
           }, ],
-          // displayMainImage: [{
-          //   required: true,
-          //   message: '请上传主图',
-          //   trigger: 'blur'
-          // }, ],
-          // belongingGreenwaySection: [{
-          //   required: true,
-          //   message: '请选择所属绿道段',
-          //   trigger: 'change'
-          // }],
+          mapPunctuation: [{
+            required: true,
+            message: '请选择地图标点',
+            trigger: 'change'
+          }],
+          displayMainImage: [{
+            required: true,
+            message: '请上传宣传图',
+            trigger: 'change'
+          }]
         },
         uploadFiles: [],
         filesLength: 1,
@@ -215,14 +241,24 @@
       console.error(this.info)
       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]
+        }
       }
       const lvdao = await lvdaoduan()
       this.lvdaoList = lvdao.data
     },
     methods: {
+      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)
+        console.error('-----------', e)
         this.ruleForm.detailedLocation = e.address
       },
       changimg(e, type) {
@@ -257,15 +293,17 @@
         console.log({
           ...this.ruleForm
         })
+        if(this.lat) {
+          this.ruleForm.mapPunctuation = this.lat + ',' + this.lng
+        }
+        
         // return
         if (this.ruleForm.id) {
           this.$refs.heForm.validate((valid) => {
             console.log(valid)
             if (valid) {
               this.ruleForm.updateDate = this.updateCurrentTime()
-              // if (Object.keys(this.mapData).length != 0) {
-              //   this.ruleForm.mapPunctuation = JSON.stringify(this.mapData)
-              // }
+              this.ruleForm.updateUser = localStorage.getItem('roleName')
               editList(this.ruleForm).then(res => {
                 if (res.code == 200) {
                   this.$message({
@@ -295,9 +333,9 @@
             console.log(valid)
             if (valid) {
               this.ruleForm.createDate = this.updateCurrentTime()
-              this.ruleForm.mapPunctuation = JSON.stringify(this.mapData)
               this.ruleForm.rentalStatus = 0
               this.ruleForm.publishStatus = 0
+              this.ruleForm.createUser = localStorage.getItem('roleName')
               addList(this.ruleForm).then(res => {
                 if (res.code == 200) {
                   this.$message({
diff --git a/admin-web-master/src/components/fujianUpload/fujianList copy.vue b/admin-web-master/src/components/fujianUpload/fujianList copy.vue
new file mode 100644
index 0000000..36f0561
--- /dev/null
+++ b/admin-web-master/src/components/fujianUpload/fujianList copy.vue
@@ -0,0 +1,245 @@
+<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}">
+    <el-button v-if="fileList.length < limit" style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover">+点击上传</el-button>
+    <div v-if="fileList.length < limit" slot="tip" class="el-upload__tip">只能上传{{fileType}}文件，且不超过{{ fileSize }}MB</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;
+  }
+</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 36f0561..251a95b 100644
--- a/admin-web-master/src/components/fujianUpload/fujianList.vue
+++ b/admin-web-master/src/components/fujianUpload/fujianList.vue
@@ -3,8 +3,15 @@
     :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}">
-    <el-button v-if="fileList.length < limit" style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover">+点击上传</el-button>
-    <div v-if="fileList.length < limit" slot="tip" class="el-upload__tip">只能上传{{fileType}}文件，且不超过{{ fileSize }}MB</div>
+    <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>
@@ -242,4 +249,9 @@
   ::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/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 28a7c9f..7846caa 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -22,6 +22,10 @@
         type: Number,
         default: 104.06
       },
+      isonloed:{
+        type: Boolean,
+        default: false
+      }
     },
     data() {
       return {
@@ -45,10 +49,18 @@
           zoom: 13
         });
         // 创建标记
-        this.marker = new qq.maps.Marker({
-          position: centerLatLng,
-          map: this.map
-        });
+        if(this.isonloed) {
+          this.marker = new qq.maps.Marker({
+            position: centerLatLng,
+            map: this.map
+          });
+        } else {
+          this.marker = new qq.maps.Marker({
+            // position: centerLatLng,
+            map: this.map
+          });
+        }
+        
 
         // 添加点击事件监听器
         // qq.maps.event.addListener(this.marker, 'click', this.onMarkerClick);
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 92de16c..8bee358 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/main.js b/admin-web-master/src/main.js
index f4c9305..c2804f2 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -19,6 +19,7 @@ import '@/icons' // icon
 import '@/permission' // permission control
 import { env } from 'echarts/lib/export'
 
+
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/admin-web-master/src/store/modules/app.js b/admin-web-master/src/store/modules/app.js
index cb4b26e..79dcd69 100644
--- a/admin-web-master/src/store/modules/app.js
+++ b/admin-web-master/src/store/modules/app.js
@@ -6,7 +6,18 @@ const state = {
     opened: false,
     withoutAnimation: true
   },
-  device: 'desktop'
+  device: 'desktop',
+  regionOptions:[
+    { label: '成华区', value: '成华区' },
+    { label: '武侯区', value: '武侯区' },
+    { label: '锦江区', value: '锦江区' },
+    { label: '青羊区', value: '青羊区' },
+    { label: '金牛区', value: '金牛区' },
+    { label: '双流区', value: '双流区' },
+    { label: '郫都区', value: '郫都区' },
+    { label: '龙泉驿区', value: '龙泉驿区' },
+    { label: '温江区', value: '温江区' }
+]
 }
 
 const mutations = {
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 6831894..1842013 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -15,15 +15,8 @@
             </el-form-item>
             <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-option v-for="(item,index) in regionOptions"
+                :key="index" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
@@ -182,11 +175,16 @@
         },
         tableData: [],
         total: 0,
-        onaction: '2',
+        onaction: '1',
         formInline: {
         },
       }
     },
+    computed: {
+      regionOptions() {
+        return this.$store.state.app.regionOptions;
+      }
+    },
     components: {
       cl,
       add,
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 3e38a88..e3fee82 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -7,15 +7,16 @@
       </div>
       <!-- 线上 -->
       <div>
-        <div style="display: flex;font-size: 14px">
-          <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia':''">线上</div>
-          ({{xsNum}})
-          <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)"
-            :class="leixing?'':'chengeXia'">实体</div>({{xxNum}})
+        <div style="display: flex;font-size: 14px;" >
+          <div style="margin-right: 4px;cursor: pointer;" @click="chenge(1)" :class="leixing?'chengeXia greens':''">线上({{xsNum}})</div>
+          <div style="margin-left: 20px;margin-right: 4px;cursor: pointer;" @click="chenge(2)" :class="leixing?'':'chengeXia greens'">实体({{xxNum}})</div>
         </div>
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery" style="margin-top: 15px;">
+            <el-form-item label="广告位名称" prop="advertisingName">
+              <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input>
+            </el-form-item>
             <el-form-item label="所属端" prop="affiliation" v-if="leixing">
               <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="游客小程序" value="游客小程序" />
@@ -45,7 +46,7 @@
         <!-- 表格 -->
 
         <el-table :data="tableData"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}">
           <el-table-column label="序号" min-width="80">
             <template slot-scope="scope">
               {{scope.$index +1 }}
@@ -197,7 +198,7 @@
           advertisingType: '线上广告位',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
+          advertisingName:''
         },
         tableData: [],
         total: 0,
@@ -406,8 +407,7 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            dataStatus: '1',
-            contractName: ''
+            advertisingName:''
           },
           this.getAll()
       },
@@ -467,9 +467,7 @@
     font-size: 14px;
     justify-content: space-between;
   }
-  .greens {
-    color: #3F9B6A;
-  }
+
   .bg-purple-dark {
     background: #99a9bf;
   }
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index d494ae1..3ccc53c 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -544,10 +544,5 @@
     padding: 0 0 !important;
   }
 
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
-  }
+
 </style>