diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 7e3c816..7b35d41 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,6 +1,18 @@
 import request from '@/utils/request'
 import requestnew from '@/utils/request2'
 
+// 上下架
+// 添加
+export function cereBusinessOperationadd(data) {
+  return requestnew({
+    url: '/cereBusinessOperation/add',
+    method: 'post',
+    data
+  })
+}
+
+
+
 //   资源获取方案
 
 export function cereBusinessPlan(data) {
diff --git a/admin-web-master/src/components/add/addMarkActivity.vue b/admin-web-master/src/components/add/addMarkActivity.vue
index 8bb0079..b090bd6 100644
--- a/admin-web-master/src/components/add/addMarkActivity.vue
+++ b/admin-web-master/src/components/add/addMarkActivity.vue
@@ -9,7 +9,7 @@
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-form-item label="场地" prop="shopNumber">
+          <el-form-item label="场地" prop="venue">
             <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;">
@@ -92,121 +92,79 @@
     </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>
+      <zycd v-if="addMing" @minSev="minSev" @mingClose="mingClose"></zycd>
     </el-dialog>
   </div>
 </template>
 
 <script>
-   import zy from '@/components/change/zy.vue'
-  import {
-    businessListGetAll,
-  } from '@/api/business'
+  import zycd from '@/components/change/zycd.vue'
   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,
+      zycd,
       upimg,
       wangEditor
     },
     data() {
       return {
-        AddData: [], //最后资源
-        multipleSelection: [], //资源
-        addMing: false,
-        ziyuanData: [],
-        shopId: null,
-        hefuData: [], //合同附件
-        uploadFileUrl: uploadUrl, // 请求地址
-        shopList: [],
-        plan_Time: [],
+        addMing:false,//添加资源弹窗
+        AddData:[],//资源数据
+        plan_Time: [],//时间范围
         formInline: {
-          title: '',
-          content: '',
-          venue: '',
-          contactPerson: '',
-          contactPhone: '',
-          coverImage: '',
-          registeredCount: '',
+          title: '', // 营销活动标题
+          content: '', // 内容
+          venue: '', // 场地
+          startTime: '', // 开始时间
+          endTime: '', // 结束时间
+          contactPerson: '', // 联系人
+          contactPhone: '', // 联系电话
+          coverImage: '', // 封面图片（存储图片的路径或URL）
+          organizer: '', // 举办方
+          registeredCount: null, // 已参与报名人数
+          createdAt: '', // 创建时间
+          createdBy: '', // 创建人
+          reviewStatus: '', // 审核状态（待审核、已批准、已拒绝）
+          reviewComment: '', // 审核意见
+          onlineType: '' // 线上类型
         },
         rules: {
           title: [{
             required: true,
-            message: '请选择合同类型',
-            trigger: 'change'
+            message: '请输入营销活动标题',
+            trigger: 'blur'
           }],
           content: [{
             required: true,
-            message: '请输入合同编号',
+            message: '请输入内容',
             trigger: 'blur'
           }],
           venue: [{
             required: true,
-            message: '请输入标段号',
+            message: '请输入场地',
             trigger: 'blur'
           }],
+          startTime: [{
+            required: true,
+            message: '请选择开始时间',
+            trigger: 'change'
+          }],
           contactPerson: [{
             required: true,
-            message: '请输入合同名称',
+            message: '请输入联系人',
             trigger: 'blur'
           }],
           contactPhone: [{
             required: true,
-            message: '请输入押金',
+            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: {
@@ -216,12 +174,12 @@
       }
     },
     created() {
-      cerePlatformMerchant(this.shopfrom).then(res => {
-        this.shopList = res.data.content
-        console.error(this.shopList)
-      })
+  
     },
     methods: {
+      mingShow(){
+        console.error(';;')
+      },
       changimg(e, type) {
         this.formInline[type] = e
         console.error(this.ruleForm[type])
@@ -229,6 +187,36 @@
       add() {
 
         if (this.formInline.id) {
+          
+          this.$refs.heForm.validate((valid) => {
+            console.log(valid)
+            if (valid) {
+              MarkEdit({
+                ...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;
+            }
+          })
         } else {
           this.$refs.heForm.validate((valid) => {
             console.log(valid)
@@ -266,63 +254,8 @@
         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)
-        })
-      },
-
 
     },
   };
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 981bb1f..996282c 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -18,7 +18,8 @@
         </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"
+            <el-table ref="multipleTable" :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>
@@ -34,9 +35,9 @@
     </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 :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;">
@@ -48,9 +49,13 @@
 </template>
 
 <script>
+    import {
+    cereResourceStrategylist
+  } from '@/api/newly.js'
   import {
     ceGetAll
   } from '@/api/sam.js'
+
   export default {
     name: 'PolicySelector',
     data() {
@@ -62,21 +67,111 @@
           policyName: ''
         },
         selectedRows: [],
-        celueData: []
+        celueData: [],
+        changelist: [],
+        yelist: [
+
+        ], //页码处理数据
+        isone:false,
+        datalist:[]
       };
     },
-    created() {
-      this.getAll()
+    async created() {
+
+      await this.getAll()
+      this.intdatalist()
+    },
+    props: {
+      resourcesId: {
+        type: String,
+        default: function () {
+          return ''
+        }
+      }
     },
     methods: {
+      async intdatalist() {
+        let c1 = {
+          pageNumber: 0,
+          pageSize: 10,
+          resourcesId: this.resourcesId
+        }
+        await cereResourceStrategylist(c1).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data)) {
+            this.datalist = [];
+            return;
+          }
+          this.datalist = res.data
+        })
+        let listfy = []
+        const celue = await ceGetAll({
+          pageNumber: 0,
+          pageSize: 100
+        })
+        const total = celue.data.totalElements > 0 ? Math.ceil(celue.data.totalElements / this.pageindex.pageSize) : 0
+        for (let index = 0; index < total; index++) {
+          const element = {
+            num: index,
+            list: []
+          }
+          for (let i = 0; i < this.pageindex.pageSize; i++) {
+            if ((index * (this.pageindex.pageSize)) + i < celue.data.totalElements) {
+              const element1 = celue.data.content[(index * (this.pageindex.pageSize)) + i];
+              var iscz = this.datalist.findIndex(item => item.id === element1.id)
+              if (iscz == -1) { //说明arr中不存在id为objid的对象
+              } else {
+                element.list.push(element1)
+              }
+            }
+
+          }
+
+          listfy.push(element)
+        }
+        console.log(listfy)
+        this.yelist = listfy
+        if (this.yelist.length > 0) {
+          this.setchange()
+        }
+
+      },
+      toggleSelection(rows) {
+        // console.error(rows)
+        for (let index = 0; index < rows.length; index++) {
+          const element = rows[index];
+          this.changelist.push(element)
+        }
+      },
+      setchange() {
+        // console.error('改变已选中')
+        // console.error(this.yelist[this.pageindex.pageNumber])
+        for (let index = 0; index < this.yelist[this.pageindex.pageNumber].list.length; index++) {
+          const element = this.yelist[this.pageindex.pageNumber].list[index];
+          // console.error(element)
+          for (let i = 0; i < this.celueData.length; i++) {
+            const element1 = this.celueData[i];
+            if (element.id == element1.id) {
+              // console.error(element1.id)
+              this.$refs.multipleTable.toggleRowSelection(element1);
+            }
+          }
+        }
+        this.isone =  true
+      },
       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()
+      async handleCurrentChange(val) {
+        this.isone = false
+        this.pageindex.pageNumber = val - 1
+        await this.getAll()
+        this.$nextTick(() => {
+          this.setchange()
+        })
       },
       handleSizeChange(val) {
         this.pageindex.pageSize = val
@@ -86,7 +181,7 @@
         this.getAll()
       },
       resetting() {
-        this.pageindex ={
+        this.pageindex = {
           pageNumber: 0,
           pageSize: 5,
           policyName: ''
@@ -95,9 +190,26 @@
       },
       handleSelectionChange(selection) {
         this.selectedRows = selection;
+        // console.error('改变')
+        // console.error(this.selectedRows)
+        if(this.isone) {
+          // console.error('--------')
+          this.yelist[this.pageindex.pageNumber].list = JSON.parse(JSON.stringify(this.selectedRows))
+        }
+        
       },
       confirm() {
-        this.$emit('minSev', this.selectedRows);
+        var list = []
+        for (let i = 0; i < this.yelist.length; i++) {
+          let item = this.yelist[i]
+          if(item.list) {
+            for (let index = 0; index < item.list.length; index++) {
+              const element = item.list[index];
+              list.push(element)
+            }
+          }
+        }
+        this.$emit('minSev',list);
       },
       cancel() {
         this.$emit('mingClose');
diff --git a/admin-web-master/src/components/change/zy.vue b/admin-web-master/src/components/change/zycd.vue
index 3b107e3..3b107e3 100644
--- a/admin-web-master/src/components/change/zy.vue
+++ b/admin-web-master/src/components/change/zycd.vue
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index ac6bbd1..4cea6ec 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/views/advertisement/advertisingReview/advertisingReview copy.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview copy.vue
new file mode 100644
index 0000000..35f985f
--- /dev/null
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview copy.vue
@@ -0,0 +1,1623 @@
+<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 style="display: flex;font-size: 14px">
+        <div style="margin-right: 4px" @click="chenge(1)" :class="leixing == 1?'chengeXia':''">线上</div>
+        ({{xxNum}}个申请)
+        <div style="margin-left: 20px;margin-right: 4px" @click="chenge(2)" :class="leixing == 1?'':'chengeXia'">实体
+        </div>({{stNum}}个申请)
+      </div>
+      <!-- 主体 -->
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <el-form :inline="true" :model="formSel">
+            <el-form-item label="编号" prop="affiliation">
+              <el-input v-model="formSel.contacts" placeholder="请输入" style="width: 168px;margin-right: 15px" />
+            </el-form-item>
+            <el-form-item label="所属端" prop="createUser" v-if="leixing == 1">
+              <el-select v-model="formSel.createUser" placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="李四" value="李四" />
+                <el-option label="张三" value="张三" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="服务类型" prop="businessScope" v-if="leixing == 1">
+              <el-input v-model="formSel.businessScope" placeholder="请输入" style="width: 168px;margin-right: 15px" />
+
+            </el-form-item>
+            <el-form-item label="申请人" prop="applicant">
+              <el-input v-model="formSel.applicant" placeholder="请输入" style="width: 168px;margin-right: 15px" />
+            </el-form-item>
+            <el-form-item label="起租日期" prop="createDate">
+              <el-date-picker style="width:168px;margin-right:5px" v-model="formSel.plan_Time" value-format="yyyy-MM-dd"
+                type="datetimerange" range-separator="-" start-placeholder="" end-placeholder="" prefix-icon="none">
+              </el-date-picker>
+            </el-form-item>
+
+          </el-form>
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+            </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="序号" width="50" prop="id">
+            <template slot-scope="scope">
+              {{scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="编号" prop="id">
+          </el-table-column>
+          <el-table-column label="所属端"  v-if="leixing == 1">
+            <template slot-scope="scope">
+              {{scope.row.cereAdvertisingInformation.affiliation}}
+            </template>
+          </el-table-column>
+          <el-table-column label="轮播顺序"  v-if="leixing == 1">
+            <template slot-scope="scope">
+              {{scope.row.cereAdvertisingInformation.rotationOrder}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="申请人" prop="applicant" ></el-table-column>
+          <el-table-column label="投放定价" prop="tenant">
+            <template slot-scope="scope">
+              {{scope.row.rotationOrde}}
+            </template>
+          </el-table-column>
+          <el-table-column label="投放时间" prop="scheduleTime" >
+          </el-table-column>
+          <el-table-column prop="applicationTime" label="提交时间" >
+          </el-table-column>
+          <el-table-column label="状态" prop="auditStatus" >
+            <template slot-scope="scope">
+              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待签约':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已签约':'已终止'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="100">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">审核</div>
+              <div @click="lookHetong(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">录入合同</div>
+              <!-- <div @click="fukuan(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">付款提醒</div> -->
+              <div @click="zhongzhi(scope.row)" class="tableBtn greens"
+                v-if="scope.row.auditStatus !='1' && scope.row.auditStatus !='3' && scope.row.auditStatus !='5'">终止
+              </div>
+
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination :hide-on-single-page='flag' background small :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 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>
+        <zl :info="detailsinfo" @removeonaction="removeonaction"></zl>
+      </div>
+    </div>
+      <!-- 详情框 -->
+      <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
+        :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+        <div style="
+              background-color: #fafafa;
+              border: 1px solid #eaeaea;
+              height: 42px;
+              width: 100%;
+              padding: 0 20px;
+              line-height: 42px;
+            ">
+          详情
+        </div>
+        <div style="padding: 0 20px">
+          <div style="
+                font-size: 14px;
+                margin-bottom: 20px;
+              ">
+            <div>
+              <div style="padding:10px 10px 10px 0;">审核信息</div>
+              <div style="">
+                审核状态：<span
+                  style="">{{secondData.auditStatus =='1'?'待审核':secondData.auditStatus =='2'?'待签约':secondData.auditStatus =='3'?'已驳回':secondData.auditStatus =='4'?'已签约':'已终止'}}</span>
+              </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="5%">
+                  <template slot-scope="scope">
+                    {{scope.$index+1}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="审核人" prop="id" min-width="8%" />
+                <el-table-column label="审核时间" prop="belongingRegion" min-width="10%" />
+                <el-table-column label="审核结果" prop="temporaryPavingPlanName" min-width="10%" />
+                <el-table-column label="意见" prop="temporaryPavingPlanName" min-width="20%" />
+              </el-table> -->
+            </div>
+            <el-tabs v-model="card">
+              <el-tab-pane label="租赁人信息" name="first">
+                <el-form ref="form" label-width="140px">
+                  <el-form-item label="承租人名称">
+                    <el-input v-model="secondData.lesseeName" disabled></el-input>
+                  </el-form-item>
+                  <!-- <el-form-item label="联系电话">
+                    <el-input v-model="secondData.contactPhone" disabled ></el-input>
+                  </el-form-item> -->
+                  <el-form-item label="证件类型">
+                    <el-input v-model="secondData.idCardType" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="身份证号码">
+                    <el-input v-model="secondData.idCardNumber" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="身份证有效期">
+                    <el-date-picker style="width: 100%;" v-model="idCardValidStart" value-format="yyyy-MM-dd"
+                      type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                      align="right" disabled>
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="身份证照片(正面)">
+                    <img :src="secondData.idCardPhotoFront" alt="" style="width:150px;height:150px;">
+                    <!-- <upimg v-model="secondData.idCardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                  </el-form-item>
+                  <el-form-item label="身份证照片(反面)">
+                    <img :src="secondData.idCardPhotoBack" alt="" style="width:150px;height:150px;">
+                    <!-- <upimg v-model="secondData.idCardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                  </el-form-item>
+                  <el-form-item label="是否为法人">
+
+                    <el-select v-model="secondData.isLegalPerson" disabled>
+                      <el-option label="是" value="1" />
+                      <el-option label="否" value="0" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="企业授权书">
+                    <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px;">
+                    <!-- <upimg v-model="secondData.enterpriseAuthorization" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                  </el-form-item>
+                </el-form>
+              </el-tab-pane>
+              <el-tab-pane label="主体信息" name="three">
+                <el-form ref="form" label-width="140px">
+                  <el-form-item label="主体名称">
+                    <el-input v-model="secondData.subjectName" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="统一社会信用代码">
+                    <el-input v-model="secondData.unifiedSocialCreditCode" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="类型">
+                    <el-select v-model="secondData.type" placeholder="请选择" disabled>
+                      <el-option label="个人" value="个人" />
+                      <el-option label="企业" value="企业" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="法定代表人">
+                    <el-input v-model="secondData.legalRepresentative" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="经营范围">
+                    <el-input type="textarea" v-model="secondData.businessScope" :rows="4" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="注册资本">
+                    <el-input v-model="secondData.registeredCapital" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="成立日期">
+                    <el-input v-model="secondData.establishmentDate" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="住所">
+                    <el-input v-model="secondData.address" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="邮箱地址">
+                    <el-input v-model="secondData.emailAddress" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="营业期限">
+                    <el-date-picker style="width: 100%;" v-model="businessStartDate" value-format="yyyy-MM-dd"
+                      type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                      align="right" disabled>
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="营业执照">
+                    <img :src="secondData.businessLicense" alt="" style="width:150px;height:150px;">
+                    <!-- <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                  </el-form-item>
+                </el-form>
+              </el-tab-pane>
+              <el-tab-pane label="投放内容" name="second">
+                <el-form ref="form" label-width="140px">
+                  <el-form-item label="Banner图">
+                    <img :src="secondData.coverImage" alt="" style="width:150px;height:150px;">
+                    <!-- <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                  </el-form-item>
+                  <el-form-item label="投放内容">
+                    <el-input v-model="secondData.advertisementContent" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="跳转链接">
+                    <el-input v-model="secondData.redirectUrl" disabled></el-input>
+                  </el-form-item>
+                  <el-form-item label="计划时间">
+                    <el-input v-model="secondData.scheduleTime" disabled></el-input>
+                    <!-- <el-date-picker style="width: 100%;" v-model="secondData.scheduleTime"
+                      value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
+                      start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
+                    </el-date-picker> -->
+                  </el-form-item>
+
+                </el-form>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+
+          <div style="
+                width: 99%;
+                padding: 10px;
+                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 class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="delXiang">删除</el-button>
+          </div>
+        </div>
+      </el-dialog>
+
+      <!-- 审核 -->
+      <el-dialog :visible.sync="actSpye" custom-class='actSpye_dialog' style="padding: 0;" width="70%" center
+        :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false">
+        <div style="padding:10px 20px;">
+          <div
+            style="display: flex;justify-content: space-between;border-bottom: 1px solid #E5E5E5;padding: 0 0 10px 0;">
+            <div style="display: flex;align-items: center;">
+              <div style="margin-right: 10px;">代办任务</div>
+              <div
+                style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
+                发起人：</div>
+              <div
+                style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
+                任务节点：部门领导审批</div>
+            </div>
+            <div style="margin-right:20px ">
+              <el-button style="background-color: #3F9B6A;color: #fff;" @click="actSpye=false">关闭</el-button>
+            </div>
+          </div>
+          <div style="padding:20px 15px 15px 15px;">
+            <el-tabs v-model="actCard">
+              <el-tab-pane label="表单信息" name='1'>
+                <div style="margin:0 0 10px 30%">方案文件 {{secondData.planName}}</div>
+                <div style="margin:15px 0;padding:0 20%; padding-bottom:20px;border-bottom: 1px solid #E1EEEF;">
+                  <el-button @click="MsgShen(1)" style="background-color: #3F9B6A;color: #fff;">租赁人信息查看</el-button>
+                  <el-button @click="MsgShen(2)" style="background-color: #3F9B6A;color: #fff;">主体信息查看</el-button>
+                  <el-button @click="MsgShen(3)" style="background-color: #3F9B6A;color: #fff;">投放内容信息查看</el-button>
+                  <!-- <el-button @click="MsgShen(4)" style="background-color: #3F9B6A;color: #fff;">预估效果信息查看</el-button> -->
+                </div>
+                <div style="padding:20px 0;display:flex;justify-content:flex-end;" v-if="secondData.state != '5'">
+                  <el-button icon="el-icon-edit" @click="LiuYes(1)"
+                    style="background-color: #3F9B6A;color: #fff;">同意</el-button>
+                  <!-- <el-button icon="el-icon-refresh-left"  @click="Liunie=true"
+                                              style="background-color: #3F9B6A;color: #fff;">退回</el-button> -->
+                  <el-button icon="el-icon-circle-close" @click="LiuYes(2)"
+                    style="background-color: #3F9B6A;color: #fff;">驳回</el-button>
+                </div>
+                <el-dialog width="60%" :visible.sync="MsgSp" append-to-body :show-close="false" title="审批信息"
+                  custom-class='liucheng_css' :close-on-press-escape="false" :close-on-click-modal="false">
+                  <div style="padding:0px">
+                    <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 1">
+                      <div style="padding: 15px;">
+                        <el-form ref="form" label-width="140px">
+                          <el-form-item label="承租人名称">
+                            <el-input v-model="secondData.lesseeName" disabled></el-input>
+                          </el-form-item>
+                          <!-- <el-form-item label="联系电话">
+                            <el-input v-model="secondData.contactPhone" disabled></el-input>
+                          </el-form-item> -->
+                          <el-form-item label="证件类型">
+                            <el-input v-model="secondData.idCardType" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="身份证号码">
+                            <el-input v-model="secondData.idCardNumber" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="身份证有效期">
+                            <el-date-picker style="width: 100%;" v-model="idCardValidStart"
+                              value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
+                            </el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="身份证照片(正面)">
+                            <img :src="secondData.idCardPhotoFront" alt="" style="width:150px;height:150px;">
+
+                          </el-form-item>
+                          <el-form-item label="身份证照片(反面)">
+                            <img :src="secondData.idCardPhotoBack" alt="" style="width:150px;height:150px;">
+
+                          </el-form-item>
+                          <el-form-item label="是否为法人">
+                            <el-select v-model="secondData.isLegalPerson" disabled>
+                              <el-option label="是" value="1" />
+                              <el-option label="否" value="0" />
+                            </el-select>
+                          </el-form-item>
+                          <el-form-item label="企业授权书">
+                            <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px;">
+
+                          </el-form-item>
+                        </el-form>
+                      </div>
+                    </div>
+                    <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 2">
+                      <div style="padding: 15px;">
+                        <el-form ref="form" label-width="140px">
+                          <el-form-item label="主体名称">
+                            <el-input v-model="secondData.subjectName" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="统一社会信用代码">
+                            <el-input v-model="secondData.unifiedSocialCreditCode" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="类型">
+                            <el-select v-model="secondData.type" placeholder="请选择" disabled>
+                              <el-option label="个人" value="个人" />
+                              <el-option label="企业" value="企业" />
+                            </el-select>
+                          </el-form-item>
+                          <el-form-item label="法定代表人">
+                            <el-input v-model="secondData.legalRepresentative" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="经营范围">
+                            <el-input type="textarea" v-model="secondData.businessScope" :rows="4" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="注册资本">
+                            <el-input v-model="secondData.registeredCapital" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="成立日期">
+                            <el-input v-model="secondData.establishmentDate" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="住所">
+                            <el-input v-model="secondData.address" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="邮箱地址">
+                            <el-input v-model="secondData.emailAddress" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="营业期限">
+                            <el-date-picker style="width: 100%;" v-model="businessStartDate"
+                              value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
+                            </el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="营业执照">
+                            <img :src="secondData.businessLicense" alt="" style="width:150px;height:150px;">
+
+                          </el-form-item>
+                        </el-form>
+                      </div>
+                    </div>
+                    <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 3">
+                      <div style="padding: 15px;">
+                        <el-form ref="form" label-width="140px">
+                          <el-form-item label="Banner图">
+                            <img :src="secondData.coverImage" alt="" style="width:150px;height:150px;">
+
+                          </el-form-item>
+                          <el-form-item label="投放内容">
+                            <el-input v-model="secondData.advertisementContent" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="跳转链接">
+                            <el-input v-model="secondData.redirectUrl" disabled></el-input>
+                          </el-form-item>
+                          <el-form-item label="计划时间">
+                            <el-input v-model="secondData.scheduleTime" disabled></el-input>
+                          </el-form-item>
+                        </el-form>
+                      </div>
+                    </div>
+
+                  </div>
+                  <div style="display:flex;justify-content: flex-end;padding:20px;">
+                    <el-button @click="MsgSp=false" class="buttonHover"
+                      style="background-color: #3F9B6A;color: #fff;">返回</el-button>
+                  </div>
+                </el-dialog>
+                <el-dialog width="40%" :visible.sync="Liunie" :close-on-click-modal="false" title="流程审批"
+                  custom-class='liucheng_css' :close-on-press-escape="false" :show-close='false' append-to-body>
+                  <div style="padding:30px 20px 0 20px">
+                    <el-form ref="ruleFormInfo" :model="secondData" label-width="120px" style="position: relative">
+                      <el-form-item label="处理意见" class="grid-content bg-purple" prop="name">
+                        <el-input type="textarea" v-model="secondData.yijian" placeholder="请输入处理意见" />
+                      </el-form-item>
+
+                    </el-form>
+                  </div>
+                  <div style="display:flex;justify-content: flex-end;padding:20px;">
+                    <el-button @click="Liunie=false" style="background-color: #3F9B6A;color: #fff;">取消</el-button>
+                    <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                  </div>
+                </el-dialog>
+              </el-tab-pane>
+              <el-tab-pane label="流转记录" name="2">
+                <div style="">
+                  <el-steps direction="vertical" :active="secondData.state!=5? secondData.state - 1: 1"
+                    class="shen_steps1">
+                    <el-step>
+                      <template slot="title">
+                        <div style="font-size: 14px;font-weight: 600;">部门领导审批</div>
+                      </template>
+                      <template slot="description">
+                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
+                          <div>
+                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle"
+                              :contentStyle="contentStyle">
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-user"></i>
+                                  办理人
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  接收时间
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  处理时间
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  处理意见
+                                </template>
+
+                              </el-descriptions-item>
+                            </el-descriptions>
+                          </div>
+                        </div>
+                      </template>
+                    </el-step>
+                    <el-step>
+                      <template slot="title">
+                        <div style="font-size: 14px;font-weight: 600;">公司领导审批</div>
+                      </template>
+                      <template slot="description">
+                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
+                          <div>
+                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle"
+                              :contentStyle="contentStyle">
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-user"></i>
+                                  办理人
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  接收时间
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  处理时间
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  处理意见
+                                </template>
+
+                              </el-descriptions-item>
+                            </el-descriptions>
+                          </div>
+                        </div>
+                      </template>
+                    </el-step>
+                    <el-step>
+                      <template slot="title">
+                        <div style="font-size: 14px;font-weight: 600;">其他审批</div>
+                      </template>
+                      <template slot="description">
+                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
+                          <div>
+                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle"
+                              :contentStyle="contentStyle">
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-user"></i>
+                                  办理人
+                                </template>
+
+                              </el-descriptions-item>
+                              <el-descriptions-item>
+                                <template slot="label">
+                                  <i class="el-icon-mobile-phone"></i>
+                                  接收时间
+                                </template>
+
+                              </el-descriptions-item>
+                            </el-descriptions>
+                          </div>
+
+                        </div>
+                      </template>
+                    </el-step>
+                  </el-steps>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="流程图" name="3">
+                <div style="height:120px;width:70%;margin-left:18%;margin-top: 78px;">
+                  <el-steps :active="secondData.state!=5? secondData.state: 1" class="liu_steps">
+                    <el-step class="step_start">
+                      <template slot="icon">
+                        <!--  <div style="background:green;width:150px;height:100px;">
+                                                 </div> -->
+                      </template>
+                    </el-step>
+                    <el-step class="step_buen">
+                      <template slot="icon">
+                        <div>
+                          <div>部门领导审批</div>
+                        </div>
+                      </template>
+                    </el-step>
+                    <el-step class="step_buen">
+                      <template slot="icon">
+                        <div>
+                          <div>公司领导审批</div>
+                        </div>
+                      </template>
+                    </el-step>
+                    <el-step class="step_buen">
+                      <template slot="icon">
+                        <div>
+                          <div>其他审批</div>
+                        </div>
+                      </template>
+                    </el-step>
+                    <el-step class="step_start">
+                      <template slot="icon">
+
+                      </template>
+                    </el-step>
+                  </el-steps>
+                </div>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </el-dialog>
+      <el-dialog title="合同录入" :visible.sync="hetong" custom-class='XDD_css' style="padding: 0;" width="70%" center
+        :close-on-click-modal="false" :show-close="false">
+        <div style="padding:20px; ">
+          <div style="padding: 0px 20px 0 0;">
+            <el-descriptions class="margin-top" :column="3" title="合同信息" border :labelStyle="labelStyle"
+              :contentStyle="contentStyle">
+              <el-descriptions-item>
+                <template slot="label">
+                  合同编号
+                </template>
+                <el-input v-model="heForm.contractNumber" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+
+                  标段号
+                </template>
+                <el-input v-model="heForm.sectionNumber" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  合同名称
+                </template>
+                <el-input v-model="heForm.contractName" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  合同金额
+                </template>
+                <el-input v-model="heForm.contractAmount" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  保证金
+                </template>
+                <el-input v-model="heForm.earnestMoney" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  合同签订日期
+                </template>
+                <el-input v-model="heForm.contractSigningDate" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  合同终止日期
+                </template>
+                <el-input v-model="heForm.contractTerminationDate" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  起止日期
+                </template>
+                <el-input v-model="heForm.leaseStartDate" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  出租人名称
+                </template>
+                <el-input v-model="heForm.lessorName" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  联系电话
+                </template>
+                <el-input v-model="heForm.telephone" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  银行账号
+                </template>
+                <el-input v-model="heForm.bankAccount" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  承担人名称
+                </template>
+                <el-input v-model="heForm.tenantName" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  承担人联系电话
+                </template>
+                <el-input v-model="heForm.tenantTelephone" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  承担人银行账号
+                </template>
+                <el-input v-model="heForm.tenantBankAccount" class="pass_input" placeholder="请输入" />
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  资源编号
+                </template>
+                {{heForm.shopNumber}}
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  合同附件
+                </template>
+                <el-upload class="upload-demo" :on-remove="hetongRemove" :action="uploadFileUrl"
+                  :on-success="hetongUploadSuccess" :file-list="hetongData" :auto-upload="true">
+                  <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
+                </el-upload>
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </div>
+
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="heClose" class="buttonHover"
+            style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
+          <el-button @click="heCheck" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+  </div>
+  <!-- 合同录入 -->
+
+  </div>
+</template>
+
+<script>
+  import {
+    async
+  } from 'q'
+  import axios from 'axios'
+  import {
+    contractGetAll,
+    contractDel,
+    addList,
+    updateList,
+    queryById,
+    hetongById,
+    hetongadd,
+    hetongEdit,
+    AdvertiserInfoGetAll,
+    AdvertiserInfoEdit,
+    AdvertiserInfoDel
+  } from '../../../api/advertisement.js'
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  export default {
+    data() {
+      return {
+        uploadFileUrl: uploadUrl, // 请求地址
+        fileList: [], //上传
+        detbox: false, //详情
+        leixing: 1, // 1是线上 2是实体
+        currentPage: 1,
+        total: 100,
+        flag: false,
+        pageSize: 10,
+        ggXin: false,
+        radio: '1',
+        formInl: {
+          leixing: '',
+          pageview: '',
+          highFrequencyTime: [],
+          averageClickThroughPrice: ''
+        },
+        tableData: [],
+        formSel: {
+          affiliation: '',
+          createUser: '',
+          createDate: '',
+          contacts: ''
+        },
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+          advertisingSpaceType: '线上广告位'
+        },
+        chengeTatle: 1,
+        contractId: '',
+        card: 'first', // 切换
+        actSpye: false, //审核框
+        actCard: '1',
+        MsgSp: false,
+        index: 0,
+        MsgSp: false,
+        liuYe: 1, //通过or驳回
+        Liunie: false,
+        secondData: {},
+        detaiList: {},
+        formInline: {
+
+        },
+        hetong: false,
+        fukuanBox: false,
+        idCardValidStart: [],
+        businessStartDate: [],
+        heForm: {
+          contractNumber: '', //合同对应的ID
+          sectionNumber: '',
+          contractName: '',
+          contractAmount: '',
+          earnestMoney: '',
+          contractSigningDate: '',
+          contractTerminationDate: '',
+          leaseStartDate: '',
+          lessorName: '',
+          telephone: '',
+          bankAccount: '',
+          tenantName: '',
+          tenantTelephone: '',
+          tenantBankAccount: '',
+          relatedMerchants: '',
+          shopNumber: '',
+          appendicesContract: '', //附件
+          contractStatus: '', //合同状态
+          dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
+        }, //合同字段
+        contentStyle: {
+          width: '20%',
+          height: '42px',
+        },
+        labelStyle: {
+          width: '150px',
+          height: '42px',
+          color: '#000',
+        },
+        hetongData: [],
+        xxNum: 0,
+        stNum: 0
+      }
+    },
+    created() {
+      this.getAll(1)
+
+    },
+    computed: {
+
+    },
+    methods: {
+      getTable(val) {
+
+      },
+      chenge(val) {
+        this.formSel = {
+          affiliation: '',
+          createUser: '',
+          createDate: '',
+          contacts: ''
+        }
+        this.leixing = val
+        this.chengeTatle = val
+        if (val == 1) {
+          this.pageindex.advertisingSpaceType = '线上广告位'
+
+        } else {
+          this.pageindex.advertisingSpaceType = '实体广告位'
+        }
+        this.getAll(val)
+      },
+      async getAll(val) {
+        if (val == 1) {
+          let pageindex = {
+            pageNumber: 1,
+            pageSize: 10,
+            advertisingSpaceType: '实体广告位'
+          }
+          const res = await AdvertiserInfoGetAll(this.pageindex)
+          this.tableData = res.data.content
+          this.total = res.data.content.length
+          this.xxNum = res.data.content.length
+
+          const stList = await AdvertiserInfoGetAll(pageindex)
+          this.stNum = stList.data.content.length
+
+        } else {
+          let pageindex = {
+            pageNumber: 1,
+            pageSize: 10,
+            advertisingSpaceType: '线上广告位'
+          }
+          const res = await AdvertiserInfoGetAll(this.pageindex)
+          this.tableData = res.data.content
+          this.total = res.data.content.length
+          this.stNum = res.data.content.length
+
+          const stList = await AdvertiserInfoGetAll(pageindex)
+          this.xxNum = stList.data.content.length
+        }
+
+      },
+
+      //删除记录按钮
+      async handleDelete(val) {
+        const res = await contractDel({
+          id: val.id
+        })
+        this.getTable(this.chengeTatle)
+        this.getAll()
+      },
+      //详情
+      details(val) {
+        this.idCardValidStart = []
+        this.businessStartDate = []
+        this.secondData = val
+        this.$set(this.idCardValidStart, 0, val.idCardValidStart)
+        this.$set(this.idCardValidStart, 1, val.idCardValidEnd)
+        this.$set(this.businessStartDate, 0, val.businessStartDate)
+        this.$set(this.businessStartDate, 1, val.businessEndDate)
+        this.detbox = true
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+      },
+      closeFn(val) {
+        if (val == 1) {
+          this.ggXin = false
+        } else if (val == 2) {
+          this.detbox = false
+
+        } else {
+          this.hetongBox = false
+          this.editHetong = false
+        }
+      },
+      // 查询按钮
+      async onSubmit() {
+        let cha = {
+          rotationOrder: this.formSel.contacts,
+          id: this.formSel.contacts,
+          rotationOrder: this.formSel.contacts,
+          scopeDeployment: this.formSel.contacts,
+          advertisingSpaceStrategy: this.formSel.contacts,
+          contactInformation: this.formSel.contacts,
+          applicationTime: this.formSel.contacts,
+          marketTime: this.formSel.contacts,
+          advertisingContent: this.formSel.contacts,
+          launchStatus: this.formSel.contacts
+        }
+
+        let res = await queryById(cha)
+        this.tableData = res.data
+
+      },
+      //重置按钮
+      resetting() {
+        this.formSel = {
+          affiliation: '',
+          createUser: '',
+          createDate: '',
+          contacts: ''
+        }
+        this.getTable(this.chengeTatle)
+      },
+      MsgShen(val) {
+        this.index = val
+        this.MsgSp = true
+      },
+      LiuYes(val) {
+        this.liuYe = val
+        this.Liunie = true
+      },
+      OAshen() {
+
+        if (this.liuYe == 1) {
+          AdvertiserInfoEdit({
+            id: this.secondData.id,
+            auditStatus: '2'
+          }).then(res => {
+            this.getAll()
+          })
+        } else {
+          AdvertiserInfoEdit({
+            id: this.secondData.id,
+            auditStatus: '3'
+          }).then(res => {
+            this.getAll()
+          })
+        }
+        this.Liunie = false
+        this.actSpye = false
+
+      },
+      zhongzhi(item) {
+        AdvertiserInfoEdit({
+          id: item.id,
+          auditStatus: '5'
+        }).then(res => {
+          this.getAll()
+        })
+      },
+      shenhe(item) {
+        this.idCardValidStart = []
+        this.businessStartDate = []
+        this.secondData = item
+        this.$set(this.idCardValidStart, 0, item.idCardValidStart)
+        this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
+        this.$set(this.businessStartDate, 0, item.businessStartDate)
+        this.$set(this.businessStartDate, 1, item.businessEndDate)
+        this.actSpye = true
+      },
+      lookHetong(item) {
+        this.secondData = item
+
+        this.heForm = {
+          contractNumber: '', //合同对应的ID
+          sectionNumber: '',
+          contractName: '',
+          contractAmount: '',
+          earnestMoney: '',
+          contractSigningDate: '',
+          contractTerminationDate: '',
+          leaseStartDate: '',
+          lessorName: '',
+          telephone: '',
+          bankAccount: '',
+          tenantName: '',
+          tenantTelephone: '',
+          tenantBankAccount: '',
+          relatedMerchants: '',
+          shopNumber: '',
+          contractStatus: '', //合同状态
+          appendicesContract: '', //附件
+          dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
+        }
+        this.heForm.relatedMerchants = item.applicant
+        this.heForm.shopNumber = item.rentalResourcesId
+        this.hetong = true
+      },
+      fukuan() {
+        this.secondData = item
+        this.fukuanBox = true
+      },
+      heClose() {
+        this.heForm = {
+          contractNumber: '', //合同对应的ID
+          sectionNumber: '',
+          contractName: '',
+          contractAmount: '',
+          earnestMoney: '',
+          contractSigningDate: '',
+          contractTerminationDate: '',
+          leaseStartDate: '',
+          lessorName: '',
+          telephone: '',
+          bankAccount: '',
+          tenantName: '',
+          tenantTelephone: '',
+          tenantBankAccount: '',
+          relatedMerchants: '',
+          shopNumber: '',
+          contractStatus: '', //合同状态
+          appendicesContract: '', //附件
+          dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
+        } //合同字段
+        this.hetong = false
+      },
+      heCheck() {
+        if (this.hetongData.length != 0) {
+          this.heForm.appendicesContract = JSON.stringify(this.hetongData[0])
+        }
+        hetongadd(this.heForm).then(res => {
+          AdvertiserInfoEdit({
+            id: this.secondData.id,
+            contractId: res.data.id,
+            auditStatus: '4',
+          }).then(item => {
+            this.getAll()
+          })
+        })
+        this.hetong = false
+      },
+      hetongRemove() {
+        this.hetongData = []
+      },
+      hetongUploadSuccess(response, file, num) {
+        const fileMsg = {
+          name: file.name,
+          url: file.response.data.url,
+        }
+        // 将文件地址存储在 uploadedFiles 数组中
+        this.hetongData.push(fileMsg);
+      },
+
+      async delXiang() {
+        await AdvertiserInfoDel({
+          id: this.secondData.id
+        })
+        this.detbox = false
+        this.getAll()
+      },
+    }
+  }
+</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;
+    cursor: pointer;
+  }
+
+  .formSearch {
+    margin-top: 20px;
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
+  /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;
+  }
+
+
+  /deep/.el-form-item__content label:nth-child(1) .is-checked+.el-radio__label {
+    color: #757575 !important;
+  }
+
+  /deep/.el-form-item__content label:nth-child(1) .is-checked .el-radio__inner {
+    border-color: #757575 !important;
+    background: #757575 !important;
+  }
+
+
+
+  ::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-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;
+  }
+
+  .hetong {
+    color: #3F9B6A;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+  .tfneirong {
+    padding: 5px;
+  }
+
+  /deep/ .first-column-bg {
+    background-color: #FAFAFA !important;
+  }
+
+  .el-table tr {
+    height: 56px;
+  }
+
+
+
+  ::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: ''
+    }
+
+  }
+
+  ::v-deep .table3 {
+    .el-table__empty-block {
+      display: none;
+    }
+  }
+
+  .radio-right-side {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  /deep/ .radio-right-side .el-radio__label {
+    display: flex;
+    align-items: center;
+  }
+
+  /deep/ .radio-right-side .el-radio__inner {
+    order: 1;
+  }
+
+  /deep/ .radio-right-side .el-radio__input {
+    display: flex;
+    order: 2;
+  }
+
+  /deep/ .radio-right-side {
+    &:hover {
+      color: #000;
+
+    }
+
+    .el-radio__input.is-checked {
+
+      border-color: none;
+
+    }
+
+    .el-radio__input.is-checked .el-radio__inner {
+      background: #3F9B6A;
+      border-color: #3F9B6A;
+    }
+
+    .el-radio__input.is-checked .el-radio__inner {
+      color: #000;
+
+    }
+
+    .el-radio__inner::after {
+      border: 1px solid #3F9B6A !important;
+    }
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background: none;
+  }
+
+  /* /deep/ .el-input--mini .el-input__inner{
+  color: #000;
+  font-weight: 600;
+} */
+</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: 10px;
+  }
+
+  ::v-deep .shen_steps1 {
+    .is-process {
+      /* 待执行步骤颜色 */
+      color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
+      }
+
+      .el-step__icon-inner {
+        color: #fff;
+      }
+
+      .el-step__line {
+        background-color: #3F9B6A;
+      }
+
+    }
+
+    .is-finish {
+      color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
+      }
+
+      .el-step__icon-inner {
+        color: #fff;
+      }
+
+      .el-step__line {
+        background-color: #3F9B6A;
+      }
+    }
+
+  }
+
+  ::v-deep .liu_steps {
+    .step_start {
+      flex-basis: 15% !important;
+
+      .is-finish {
+        border: none;
+        color: #3F9B6A;
+
+        .el-step__icon {
+          background-color: #D3E6CC;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
+      .is-wait {
+
+        border: none;
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          background-color: #000;
+        }
+
+      }
+
+      .is-process {
+        border: none;
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          background-color: #000;
+        }
+      }
+    }
+
+    .step_buen {
+      flex-basis: 25% !important;
+
+      .is-process {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
+      }
+
+      .is-wait {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
+      }
+
+      .is-finish {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #3F9B6A;
+          background-color: #D3E6CC;
+          font-size: 12px;
+          color: #3F9B6A;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #3F9B6A;
+          font-size: 12px;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
+      }
+    }
+
+    ::v-deep .xiang_steps {
+      .is-process {
+        /* 待执行步骤颜色 */
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
+
+      }
+
+      .is-finish {
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
+
+    }
+  }
+
+  ::v-deep .el-tabs__nav-wrap::after {
+    background-color: #fff;
+  }
+
+  ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+    padding: 0 0 0 10px;
+  }
+
+  ::v-deep .el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
+    padding-bottom: 0px;
+  }
+
+  ::v-deep .el-descriptions__title {
+    font-weight: 100;
+    font-size: 14px;
+  }
+</style>
diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index e935a49..f11174b 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -1,797 +1,152 @@
 <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 style="display: flex;font-size: 14px">
-        <div style="margin-right: 4px" @click="chenge(1)" :class="leixing == 1?'chengeXia':''">线上</div>
-        ({{xxNum}}个申请)
-        <div style="margin-left: 20px;margin-right: 4px" @click="chenge(2)" :class="leixing == 1?'':'chengeXia'">实体
-        </div>({{stNum}}个申请)
-      </div>
-      <!-- 主体 -->
+      <!-- 线上 -->
       <div>
+        <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="formSel">
-            <el-form-item label="编号" prop="affiliation">
-              <el-input v-model="formSel.contacts" placeholder="请输入" style="width: 168px;margin-right: 15px" />
+          <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="createUser" v-if="leixing == 1">
-              <el-select v-model="formSel.createUser" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="李四" value="李四" />
-                <el-option label="张三" value="张三" />
+            <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="游客小程序" />
+                <el-option label="商家客户端" value="商家客户端" />
               </el-select>
             </el-form-item>
-            <el-form-item label="服务类型" prop="businessScope" v-if="leixing == 1">
-              <el-input v-model="formSel.businessScope" placeholder="请输入" style="width: 168px;margin-right: 15px" />
-
-            </el-form-item>
-            <el-form-item label="申请人" prop="applicant" >
-              <el-input v-model="formSel.applicant" placeholder="请输入" style="width: 168px;margin-right: 15px" />
-            </el-form-item>
-            <el-form-item label="起租日期" prop="createDate">
-              <el-date-picker style="width:168px;margin-right:5px" v-model="formSel.plan_Time"
-                value-format="yyyy-MM-dd" type="datetimerange" range-separator="-" start-placeholder=""
-                end-placeholder="" prefix-icon="none" >
-              </el-date-picker>
+            <el-form-item label="设备类型" prop="deviceType" v-if="leixing == false">
+              <el-select v-model="pagequery.deviceType" placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
+              </el-select>
             </el-form-item>
-
           </el-form>
+
           <div>
-            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">查询
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
             <el-button @click="resetting" class="buttonHover"
-              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
         </div>
+        <div style="margin-bottom: 20px;">
+          <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+            icon="el-icon-circle-plus-outline">新增</el-button>
+          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
+        </div>
         <!-- 表格 -->
-
-        <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+        <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" min-width="80" prop="id">
+          <el-table-column label="序号" width="50" prop="id">
             <template slot-scope="scope">
               {{scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column label="编号" min-width="150" prop="id">
+          <el-table-column label="编号" prop="id">
           </el-table-column>
-          <el-table-column label="所属端" min-width="150"  v-if="leixing == 1">
+          <el-table-column label="所属端"  v-if="leixing == 1">
             <template slot-scope="scope">
-            {{scope.row.cereAdvertisingInformation.affiliation}}
-
+              {{scope.row.cereAdvertisingInformation.affiliation}}
             </template>
-
-
           </el-table-column>
-          <el-table-column label="轮播顺序"  min-width="80" v-if="leixing == 1">
+          <el-table-column label="轮播顺序"  v-if="leixing == 1">
             <template slot-scope="scope">
               {{scope.row.cereAdvertisingInformation.rotationOrder}}
-
             </template>
-
           </el-table-column>
-          <el-table-column label="服务类型" prop="businessScope" min-width="150">
-            <template slot-scope="scope">
-              {{scope.row.businessScope}}
 
-            </template>
-          </el-table-column>
-          <el-table-column label="申请人" prop="applicant" min-width="200">
 
-
-          </el-table-column>
-          <el-table-column label="投放定价" prop="tenant" min-width="150">
+          <el-table-column label="申请人" prop="applicant" ></el-table-column>
+          <el-table-column label="投放定价" prop="tenant">
             <template slot-scope="scope">
               {{scope.row.rotationOrde}}
-
             </template>
           </el-table-column>
-
-
-          <el-table-column label="计划时间" prop="scheduleTime" min-width="250">
+          <el-table-column label="投放时间" prop="scheduleTime" >
           </el-table-column>
-          <el-table-column prop="applicationTime" label="提交时间" min-width="250">
-
+          <el-table-column prop="applicationTime" label="提交时间" >
           </el-table-column>
-          <el-table-column label="状态" prop="auditStatus" min-width="120">
+          <el-table-column label="状态" prop="auditStatus" >
             <template slot-scope="scope">
               {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待签约':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已签约':'已终止'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="300">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">审核</div>
-              <div @click="lookHetong(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">录入合同</div>
-              <!-- <div @click="fukuan(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">付款提醒</div> -->
-              <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus !='1' && scope.row.auditStatus !='3' && scope.row.auditStatus !='5'">终止</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' || scope.row.publishStatus=='2'" @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="opencl(scope.row,'gg')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'" @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
-        <div class="fenye">
-          <el-pagination :hide-on-single-page='flag' background small :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>
 
-      <!-- 详情框 -->
-      <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
-        :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
-        <div style="
-              background-color: #fafafa;
-              border: 1px solid #eaeaea;
-              height: 42px;
-              width: 100%;
-              padding: 0 20px;
-              line-height: 42px;
-            ">
-          详情
-        </div>
-        <div style="padding: 0 20px">
-          <div style="
-                font-size: 14px;
-                margin-bottom: 20px;
-              ">
-            <div>
-              <div style="padding:10px 10px 10px 0;">审核信息</div>
-              <div style="">
-                 审核状态：<span style="">{{secondData.auditStatus =='1'?'待审核':secondData.auditStatus =='2'?'待签约':secondData.auditStatus =='3'?'已驳回':secondData.auditStatus =='4'?'已签约':'已终止'}}</span>
-              </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="5%">
-                  <template slot-scope="scope">
-                    {{scope.$index+1}}
-                  </template>
-                </el-table-column>
-                <el-table-column label="审核人" prop="id" min-width="8%" />
-                <el-table-column label="审核时间" prop="belongingRegion" min-width="10%" />
-                <el-table-column label="审核结果" prop="temporaryPavingPlanName" min-width="10%" />
-                <el-table-column label="意见" prop="temporaryPavingPlanName" min-width="20%" />
-              </el-table> -->
-            </div>
-            <el-tabs v-model="card">
-              <el-tab-pane label="租赁人信息" name="first">
-                <el-form ref="form" label-width="140px">
-                  <el-form-item label="承租人名称">
-                    <el-input v-model="secondData.lesseeName" disabled ></el-input>
-                  </el-form-item>
-                  <!-- <el-form-item label="联系电话">
-                    <el-input v-model="secondData.contactPhone" disabled ></el-input>
-                  </el-form-item> -->
-                  <el-form-item label="证件类型">
-                    <el-input v-model="secondData.idCardType" disabled ></el-input>
-                  </el-form-item>
-                  <el-form-item label="身份证号码">
-                    <el-input v-model="secondData.idCardNumber" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="身份证有效期">
-                    <el-date-picker style="width: 100%;" v-model="idCardValidStart" value-format="yyyy-MM-dd"
-                      type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                      align="right" disabled>
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="身份证照片(正面)">
-                    <img :src="secondData.idCardPhotoFront" alt="" style="width:150px;height:150px;">
-                    <!-- <upimg v-model="secondData.idCardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
-                  </el-form-item>
-                  <el-form-item label="身份证照片(反面)">
-                    <img :src="secondData.idCardPhotoBack" alt="" style="width:150px;height:150px;">
-                    <!-- <upimg v-model="secondData.idCardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
-                  </el-form-item>
-                  <el-form-item label="是否为法人">
-
-                    <el-select v-model="secondData.isLegalPerson"  disabled>
-                      <el-option label="是" value="1" />
-                      <el-option label="否" value="0" />
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="企业授权书">
-                    <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px;">
-                    <!-- <upimg v-model="secondData.enterpriseAuthorization" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
-                  </el-form-item>
-                </el-form>
-              </el-tab-pane>
-              <el-tab-pane label="主体信息" name="three">
-                <el-form ref="form" label-width="140px">
-                  <el-form-item label="主体名称">
-                    <el-input v-model="secondData.subjectName" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="统一社会信用代码">
-                    <el-input v-model="secondData.unifiedSocialCreditCode" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="类型">
-                    <el-select v-model="secondData.type" placeholder="请选择" disabled>
-                      <el-option label="个人" value="个人" />
-                      <el-option label="企业" value="企业" />
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="法定代表人">
-                    <el-input v-model="secondData.legalRepresentative" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="经营范围">
-                    <el-input type="textarea" v-model="secondData.businessScope" :rows="4" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="注册资本">
-                    <el-input v-model="secondData.registeredCapital" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="成立日期">
-                    <el-input v-model="secondData.establishmentDate" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="住所">
-                    <el-input v-model="secondData.address" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="邮箱地址">
-                    <el-input v-model="secondData.emailAddress" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="营业期限">
-                    <el-date-picker style="width: 100%;" v-model="businessStartDate" value-format="yyyy-MM-dd"
-                      type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                      align="right" disabled>
-                    </el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="营业执照">
-                    <img :src="secondData.businessLicense" alt="" style="width:150px;height:150px;">
-                    <!-- <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
-                  </el-form-item>
-                </el-form>
-              </el-tab-pane>
-              <el-tab-pane label="投放内容" name="second">
-                <el-form ref="form" label-width="140px">
-                  <el-form-item label="Banner图">
-                    <img :src="secondData.coverImage" alt="" style="width:150px;height:150px;">
-                    <!-- <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
-                  </el-form-item>
-                  <el-form-item label="投放内容">
-                    <el-input v-model="secondData.advertisementContent" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="跳转链接">
-                    <el-input v-model="secondData.redirectUrl" disabled></el-input>
-                  </el-form-item>
-                  <el-form-item label="计划时间">
-                    <el-input v-model="secondData.scheduleTime" disabled></el-input>
-                    <!-- <el-date-picker style="width: 100%;" v-model="secondData.scheduleTime"
-                      value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
-                      start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
-                    </el-date-picker> -->
-                  </el-form-item>
-
-                </el-form>
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-
-          <div style="
-                width: 99%;
-                padding: 10px;
-                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 class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="delXiang">删除</el-button>
-          </div>
-        </div>
-      </el-dialog>
-
-      <!-- 审核 -->
-      <el-dialog :visible.sync="actSpye" custom-class='actSpye_dialog' style="padding: 0;" width="70%" center
-        :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false">
-        <div style="padding:10px 20px;">
-          <div
-            style="display: flex;justify-content: space-between;border-bottom: 1px solid #E5E5E5;padding: 0 0 10px 0;">
-            <div style="display: flex;align-items: center;">
-              <div style="margin-right: 10px;">代办任务</div>
-              <div
-                style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
-                发起人：</div>
-              <div
-                style="background-color: #E8F6F3;padding: 5px;margin-right: 10px;font-size:12px;color:#56AC83;border-radius: 3px;">
-                任务节点：部门领导审批</div>
-            </div>
-            <div style="margin-right:20px ">
-              <el-button style="background-color: #3F9B6A;color: #fff;" @click="actSpye=false">关闭</el-button>
-            </div>
-          </div>
-          <div style="padding:20px 15px 15px 15px;">
-            <el-tabs v-model="actCard" >
-              <el-tab-pane label="表单信息" name='1'>
-                <div style="margin:0 0 10px 30%">方案文件 {{secondData.planName}}</div>
-                <div style="margin:15px 0;padding:0 20%; padding-bottom:20px;border-bottom: 1px solid #E1EEEF;">
-                  <el-button @click="MsgShen(1)" style="background-color: #3F9B6A;color: #fff;">租赁人信息查看</el-button>
-                  <el-button @click="MsgShen(2)" style="background-color: #3F9B6A;color: #fff;">主体信息查看</el-button>
-                  <el-button @click="MsgShen(3)" style="background-color: #3F9B6A;color: #fff;">投放内容信息查看</el-button>
-                  <!-- <el-button @click="MsgShen(4)" style="background-color: #3F9B6A;color: #fff;">预估效果信息查看</el-button> -->
-                </div>
-                <div style="padding:20px 0;display:flex;justify-content:flex-end;" v-if="secondData.state != '5'">
-                  <el-button icon="el-icon-edit" @click="LiuYes(1)"
-                    style="background-color: #3F9B6A;color: #fff;">同意</el-button>
-                  <!-- <el-button icon="el-icon-refresh-left"  @click="Liunie=true"
-                                              style="background-color: #3F9B6A;color: #fff;">退回</el-button> -->
-                  <el-button icon="el-icon-circle-close" @click="LiuYes(2)"
-                    style="background-color: #3F9B6A;color: #fff;">驳回</el-button>
-                </div>
-                <el-dialog width="60%" :visible.sync="MsgSp" append-to-body :show-close="false" title="审批信息"
-                  custom-class='liucheng_css' :close-on-press-escape="false" :close-on-click-modal="false">
-                  <div style="padding:0px">
-                    <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 1">
-                      <div style="padding: 15px;">
-                        <el-form ref="form" label-width="140px">
-                          <el-form-item label="承租人名称">
-                            <el-input v-model="secondData.lesseeName" disabled></el-input>
-                          </el-form-item>
-                          <!-- <el-form-item label="联系电话">
-                            <el-input v-model="secondData.contactPhone" disabled></el-input>
-                          </el-form-item> -->
-                          <el-form-item label="证件类型">
-                            <el-input v-model="secondData.idCardType" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="身份证号码">
-                            <el-input v-model="secondData.idCardNumber" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="身份证有效期">
-                            <el-date-picker style="width: 100%;" v-model="idCardValidStart"
-                              value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
-                            </el-date-picker>
-                          </el-form-item>
-                          <el-form-item label="身份证照片(正面)">
-                            <img :src="secondData.idCardPhotoFront" alt="" style="width:150px;height:150px;">
-
-                          </el-form-item>
-                          <el-form-item label="身份证照片(反面)">
-                            <img :src="secondData.idCardPhotoBack" alt="" style="width:150px;height:150px;">
-
-                          </el-form-item>
-                          <el-form-item label="是否为法人">
-                            <el-select v-model="secondData.isLegalPerson"  disabled>
-                              <el-option label="是" value="1" />
-                              <el-option label="否" value="0" />
-                            </el-select>
-                          </el-form-item>
-                          <el-form-item label="企业授权书">
-                            <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px;">
-
-                          </el-form-item>
-                        </el-form>
-                      </div>
-                    </div>
-                    <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 2">
-                      <div style="padding: 15px;">
-                        <el-form ref="form" label-width="140px">
-                          <el-form-item label="主体名称">
-                            <el-input v-model="secondData.subjectName" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="统一社会信用代码">
-                            <el-input v-model="secondData.unifiedSocialCreditCode" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="类型">
-                            <el-select v-model="secondData.type" placeholder="请选择" disabled>
-                              <el-option label="个人" value="个人" />
-                              <el-option label="企业" value="企业" />
-                            </el-select>
-                          </el-form-item>
-                          <el-form-item label="法定代表人">
-                            <el-input v-model="secondData.legalRepresentative" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="经营范围">
-                            <el-input type="textarea" v-model="secondData.businessScope" :rows="4" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="注册资本">
-                            <el-input v-model="secondData.registeredCapital" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="成立日期">
-                            <el-input v-model="secondData.establishmentDate" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="住所">
-                            <el-input v-model="secondData.address" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="邮箱地址">
-                            <el-input v-model="secondData.emailAddress" disabled></el-input>
-                          </el-form-item>
-                          <el-form-item label="营业期限">
-                            <el-date-picker style="width: 100%;" v-model="businessStartDate"
-                              value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
-                            </el-date-picker>
-                          </el-form-item>
-                          <el-form-item label="营业执照">
-                            <img :src="secondData.businessLicense" alt="" style="width:150px;height:150px;">
-
-                          </el-form-item>
-                        </el-form>
-                      </div>
-                </div>
-                      <div style="border: 1px solid #E5E5E5;padding: 1px" v-if="index == 3">
-                        <div style="padding: 15px;">
-                          <el-form ref="form" label-width="140px">
-                            <el-form-item label="Banner图">
-                              <img :src="secondData.coverImage" alt="" style="width:150px;height:150px;">
-
-                            </el-form-item>
-                            <el-form-item label="投放内容">
-                              <el-input v-model="secondData.advertisementContent" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="跳转链接">
-                              <el-input v-model="secondData.redirectUrl" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="计划时间">
-                              <el-input v-model="secondData.scheduleTime" disabled></el-input>
-                            </el-form-item>
-                          </el-form>
-                        </div>
-                      </div>
-
-                    </div>
-                    <div style="display:flex;justify-content: flex-end;padding:20px;">
-                      <el-button @click="MsgSp=false" class="buttonHover"
-                        style="background-color: #3F9B6A;color: #fff;">返回</el-button>
-                    </div>
-                </el-dialog>
-                <el-dialog width="40%" :visible.sync="Liunie" :close-on-click-modal="false" title="流程审批"
-                  custom-class='liucheng_css' :close-on-press-escape="false" :show-close='false' append-to-body>
-                  <div style="padding:30px 20px 0 20px">
-                    <el-form ref="ruleFormInfo" :model="secondData" label-width="120px" style="position: relative">
-                      <el-form-item label="处理意见" class="grid-content bg-purple" prop="name">
-                        <el-input type="textarea" v-model="secondData.yijian" placeholder="请输入处理意见" />
-                      </el-form-item>
-
-                    </el-form>
-                  </div>
-                  <div style="display:flex;justify-content: flex-end;padding:20px;">
-                    <el-button @click="Liunie=false" style="background-color: #3F9B6A;color: #fff;">取消</el-button>
-                    <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-                  </div>
-                </el-dialog>
-              </el-tab-pane>
-              <el-tab-pane label="流转记录" name="2">
-                <div style="">
-                  <el-steps direction="vertical" :active="secondData.state!=5? secondData.state - 1: 1"
-                    class="shen_steps1">
-                    <el-step>
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;">部门领导审批</div>
-                      </template>
-                      <template slot="description">
-                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
-                          <div>
-                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-user"></i>
-                                  办理人
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  接收时间
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  处理时间
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  处理意见
-                                </template>
-
-                              </el-descriptions-item>
-                            </el-descriptions>
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step>
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;">公司领导审批</div>
-                      </template>
-                      <template slot="description">
-                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
-                          <div>
-                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-user"></i>
-                                  办理人
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  接收时间
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  处理时间
-                                </template>
-
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  处理意见
-                                </template>
+    </div>
 
-                              </el-descriptions-item>
-                            </el-descriptions>
-                          </div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step>
-                      <template slot="title">
-                        <div style="font-size: 14px;font-weight: 600;">其他审批</div>
-                      </template>
-                      <template slot="description">
-                        <div style="margin-bottom:10px;padding:10px;border:1px solid #EBEEF5;width:50%">
-                          <div>
-                            <el-descriptions class="margin-top" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-user"></i>
-                                  办理人
-                                </template>
 
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  <i class="el-icon-mobile-phone"></i>
-                                  接收时间
-                                </template>
 
-                              </el-descriptions-item>
-                            </el-descriptions>
-                          </div>
 
-                        </div>
-                      </template>
-                    </el-step>
-                  </el-steps>
-                </div>
-              </el-tab-pane>
-              <el-tab-pane label="流程图" name="3">
-                <div style="height:120px;width:70%;margin-left:18%;margin-top: 78px;">
-                  <el-steps :active="secondData.state!=5? secondData.state: 1" class="liu_steps">
-                    <el-step class="step_start">
-                      <template slot="icon">
-                        <!--  <div style="background:green;width:150px;height:100px;">
-                                                 </div> -->
-                      </template>
-                    </el-step>
-                    <el-step class="step_buen">
-                      <template slot="icon">
-                        <div>
-                          <div>部门领导审批</div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step class="step_buen">
-                      <template slot="icon">
-                        <div>
-                          <div>公司领导审批</div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step class="step_buen">
-                      <template slot="icon">
-                        <div>
-                          <div>其他审批</div>
-                        </div>
-                      </template>
-                    </el-step>
-                    <el-step class="step_start">
-                      <template slot="icon">
 
-                      </template>
-                    </el-step>
-                  </el-steps>
-                </div>
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-        </div>
-      </el-dialog>
-      <el-dialog title="合同录入" :visible.sync="hetong" custom-class='XDD_css' style="padding: 0;" width="70%" center :close-on-click-modal="false" :show-close="false">
-                        <div style="padding:20px; ">
-                              <div style="padding: 0px 20px 0 0;">
-                                <el-descriptions class="margin-top" :column="3" title="合同信息"  border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同编号
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.contractNumber"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
 
-                                        标段号
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.sectionNumber"
-                                          class="pass_input"
-                                          placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同名称
-                                      </template>
-                                    <el-input
-                                         v-model="heForm.contractName"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同金额
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.contractAmount"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        保证金
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.earnestMoney"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同签订日期
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.contractSigningDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同终止日期
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.contractTerminationDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        起止日期
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.leaseStartDate"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        出租人名称
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.lessorName"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        联系电话
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.telephone"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        银行账号
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.bankAccount"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        承担人名称
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.tenantName"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        承担人联系电话
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.tenantTelephone"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        承担人银行账号
-                                      </template>
-                                      <el-input
-                                        v-model="heForm.tenantBankAccount"
-                                        class="pass_input"
-                                        placeholder="请输入"/>
-                                    </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        资源编号
-                                      </template>
-                                      {{heForm.shopNumber}}
-                                      </el-descriptions-item>
-                                    <el-descriptions-item>
-                                      <template slot="label">
-                                        合同附件
-                                      </template>
-                                      <el-upload
-                                        class="upload-demo"
-                                        :on-remove="hetongRemove"
-                                        :action="uploadFileUrl"
-                                        :on-success="hetongUploadSuccess"
-                                        :file-list="hetongData"
-                                        :auto-upload="true"
-                                        >
-                                        <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
-                                      </el-upload>
-                                    </el-descriptions-item>
-                                  </el-descriptions>
-                              </div>
-                        </div>
+    <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>
 
-                <span slot="footer" class="dialog-footer">
-                  <el-button @click="heClose"  class="buttonHover"
-                    style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
-                  <el-button @click="heCheck"
-                    style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-                </span>
-              </el-dialog>
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="{}" @removeonaction="removeonaction" :leixing="leixing"></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>
+        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction" :leixing="leixing">
+        </resourceCommodity>
+      </div>
+    </div>
+    <div class="zhuti" v-if="onaction == '4'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>广告位基本信息管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">{{contractChangeReason}}</span></div>
+      </div>
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="detailsinfo" @removeonaction="removeonaction" :leixing="leixing"></add>
+      </div>
+    </div>
+    <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false">
+      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+    </el-dialog>
   </div>
-  </div>
-<!-- 合同录入 -->
 
-  </div>
+
 </template>
 
 <script>
   import {
-    async
-  } from 'q'
-  import axios from 'axios'
-  import {
     contractGetAll,
     contractDel,
     addList,
@@ -804,355 +159,275 @@
     AdvertiserInfoEdit,
     AdvertiserInfoDel
   } from '../../../api/advertisement.js'
+  import add from '../../../components/add/addmap'
+  import resourceCommodity from '../../../components/chakan/map'
   import {
-    uploadUrl
-  } from '@/utils/request'
+    cereResourceStrategy,
+    editStatus
+  } from '@/api/newly.js'
+   import cl from '@/components/change/cl.vue'
   export default {
     data() {
       return {
-        uploadFileUrl: uploadUrl, // 请求地址
-        fileList: [], //上传
-        detbox: false, //详情
-        leixing: 1, // 1是线上 2是实体
-        currentPage: 1,
-        total: 100,
-        flag: false,
-        pageSize: 10,
-        ggXin: false,
-        radio: '1',
-        formInl: {
-          leixing: '',
-          pageview: '',
-          highFrequencyTime: [],
-          averageClickThroughPrice: ''
-        },
-        tableData: [],
-        formSel: {
-          affiliation: '',
-          createUser: '',
-          createDate: '',
-          contacts: ''
-        },
-        pageindex: {
+        oncetype: '',
+        addcl: false,
+        oninfo: {},
+        multipleSelection: [],
+
+        xsNum: 0,
+        xxNum: 0,
+        leixing: true,
+        contractChangeReason: '',
+        detailsinfo: {},
+        pagequery: {
           pageNumber: 1,
           pageSize: 10,
-          advertisingSpaceType:'线上广告位'
-        },
-        chengeTatle: 1,
-        contractId: '',
-        card: 'first', // 切换
-        actSpye: false, //审核框
-        actCard: '1',
-        MsgSp: false,
-        index: 0,
-        MsgSp: false,
-        liuYe: 1, //通过or驳回
-        Liunie: false,
-        secondData: {},
-        detaiList: {},
-        formInline: {
-
+          advertisingSpaceType: '实体广告位'
         },
-        hetong: false,
-        fukuanBox: false,
-        idCardValidStart: [],
-        businessStartDate: [],
-        heForm: {
-            contractNumber: '', //合同对应的ID
-            sectionNumber: '',
-            contractName: '',
-            contractAmount: '',
-            earnestMoney: '',
-            contractSigningDate: '',
-            contractTerminationDate: '',
-            leaseStartDate: '',
-            lessorName: '',
-            telephone: '',
-            bankAccount: '',
-            tenantName: '',
-            tenantTelephone: '',
-            tenantBankAccount: '',
-            relatedMerchants:'',
-            shopNumber:'',
-            appendicesContract:'',//附件
-            contractStatus: '', //合同状态
-            dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
-        }, //合同字段
-        contentStyle:{
-          width:'20%',
-          height:'42px',
-        },
-        labelStyle:{
-          width:'150px',
-          height:'42px',
-          color:'#000',
-        },
-        hetongData:[],
-        xxNum:0,
-        stNum:0
+        tableData: [],
+        total: 0,
+        onaction: '1',
+        formInline: {},
       }
     },
-    created() {
-      this.getAll(1)
-
+    components: {
+      cl,
+      add,
+      resourceCommodity,
     },
-    computed: {
-
+    created() {
+      this.getAll()
     },
     methods: {
-      getTable(val) {
-
+      minSev(e) {
+        this.multipleSelection = e
+        console.error(this.multipleSelection)
+        let ids = []
+        for (let index = 0; index < this.multipleSelection.length; index++) {
+          ids.push(this.multipleSelection[index].id)
+        }
+        console.error(this.oninfo)
+        let c1 = {
+          resourcesId: this.oncetype + this.oninfo.id,
+          rentalPoliciesIds: ids,
+        }
+        console.error(c1)
+        cereResourceStrategy(c1).then(res => {
+          if (res.code == 200) {
+            this.addcl = false
+            this.$message({
+              message: '绑定成功',
+              type: 'success'
+            })
+            editStatus({
+              resourcesId: this.oncetype + this.oninfo.id,
+              publishStatus: '3'
+            }).then(res => {
+              this.onSubmit()
+            })
+          } else {
+            this.$message({
+              message: '绑定失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.addcl = false
+      },
+      async opencl(row, e) {
+        this.oncetype = e
+        this.oninfo = row
+        this.multipleSelection = []
+        this.addcl = true
       },
       chenge(val) {
-        this.formSel = {
-          affiliation: '',
-          createUser: '',
-          createDate: '',
-          contacts: ''
-        }
-        this.leixing = val
-        this.chengeTatle = val
         if (val == 1) {
-        this.pageindex.advertisingSpaceType ='线上广告位'
-
+          this.leixing = true
+          this.pagequery.advertisingType = '线上广告位'
+          this.getAll((this.pagequery))
         } else {
-this.pageindex.advertisingSpaceType ='实体广告位'
+          this.leixing = false
+          this.pagequery.advertisingType = '实体广告位'
+          this.getAll((this.pagequery))
         }
-        this.getAll(val)
       },
-      async getAll(val) {
-        if(val ==1){
-          let pageindex={
-                    pageNumber: 1,
-                    pageSize: 10,
-                    advertisingSpaceType:'实体广告位'
-                  }
-                  const res = await AdvertiserInfoGetAll(this.pageindex)
-                  this.tableData = res.data.content
-                  this.total = res.data.content.length
-          this.xxNum = res.data.content.length
+      gettime() {
+        // 获取当前时间
+        let currentTime = new Date();
 
-                  const stList = await AdvertiserInfoGetAll(pageindex)
-                  this.stNum = stList.data.content.length
+        // 获取年份
+        let year = currentTime.getFullYear();
 
-        }else{
-          let pageindex={
-                    pageNumber: 1,
-                    pageSize: 10,
-                    advertisingSpaceType:'线上广告位'
-                  }
-                  const res = await AdvertiserInfoGetAll(this.pageindex)
-                  this.tableData = res.data.content
-                  this.total = res.data.content.length
-          this.stNum = res.data.content.length
+        // 获取月份（注意月份是从0开始计数的，所以需要加1）
+        let month = currentTime.getMonth() + 1;
 
-                  const stList = await AdvertiserInfoGetAll(pageindex)
-                  this.xxNum = stList.data.content.length
-        }
+        // 获取日期
+        let day = currentTime.getDate();
+
+        // 获取小时
+        let hours = currentTime.getHours();
+
+        // 获取分钟
+        let minutes = currentTime.getMinutes();
+
+        // 获取秒数
+        let seconds = currentTime.getSeconds();
+
+        // 获取毫秒数
+        let milliseconds = currentTime.getMilliseconds();
+
+        // 格式化时间为 YYYY-MM-DD
+        let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 HH:MM:SS
+        let formattedTime =
+          `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 YYYY-MM-DD HH:MM:SS
+        let formattedDateTime = `${formattedDate} ${formattedTime}`;
+        return formattedDateTime
 
       },
+      removeinfozz(row, e, tit) {
+        let that = this
+        this.$confirm('确定要' + tit + '吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editList({
+            ...row,
+            publishStatus: e
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message: tit + '成功',
+                type: 'success'
+              })
+              this.removeonaction('1')
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
 
-      //删除记录按钮
-      async handleDelete(val) {
-        const res = await contractDel({
-          id: val.id
+          })
         })
-        this.getTable(this.chengeTatle)
-        this.getAll()
       },
-      //详情
-      details(val) {
-        this.idCardValidStart = []
-        this.businessStartDate = []
-        this.secondData = val
-        this.$set(this.idCardValidStart, 0, val.idCardValidStart)
-            this.$set(this.idCardValidStart, 1, val.idCardValidEnd)
-            this.$set(this.businessStartDate, 0, val.businessStartDate)
-            this.$set(this.businessStartDate, 1, val.businessEndDate)
-        this.detbox = true
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
       },
-      handleSizeChange(val) {
-        this.pageSize = val
+      removeinfo(row, e) {
+        this.contractChangeReason = e
+        let dimensions_parts = row.dimensions.split(" ")
+        let dimensions = row.equipmentSize.split(" ")
+
+        dimensions_parts.forEach(part => {
+          if (part.startsWith("长")) {
+            row.dimensionsH = part.split("：")[1];
+          } else if (part.startsWith("宽")) {
+            row.dimensionsK = part.split("：")[1];
+          }
+        })
+        dimensions.forEach(part => {
+          if (part.startsWith("长")) {
+            row.equipmentSizeH = part.split("：")[1];
+          } else if (part.startsWith("宽")) {
+            row.equipmentSizeK = part.split("：")[1];
+          } else if (part.startsWith("高")) {
+            row.equipmentSizeG = part.split("：")[1];
+          }
+        })
+        this.detailsinfo = row
+        this.onaction = '4'
+      },
+      async getAll() {
+        const res = await AdvertiserInfoGetAll(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
+        let obj1 = {
+          pageNumber: 1,
+          pageSize: 10,
+          advertisingSpaceType: '线上广告位'
+        }
+        AdvertiserInfoGetAll(obj1).then(res1 => {
+          this.xsNum = res1.data.totalElements
+        })
+        let obj2 = {
+          pageNumber: 1,
+          pageSize: 10,
+          advertisingSpaceType: '实体广告位'
+        }
+        AdvertiserInfoGetAll(obj2).then(res2 => {
+          this.xxNum = res2.data.totalElements
+        })
+      },
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
       handleCurrentChange(val) {
-        this.currentPage = val
+        this.pagequery.pageNumber = val - 1
+        this.getAll()
       },
-      closeFn(val) {
-        if (val == 1) {
-          this.ggXin = false
-        } else if (val == 2) {
-          this.detbox = false
-
-        } else {
-          this.hetongBox = false
-          this.editHetong = false
-        }
+      handleSizeChange(val) {
+        this.pagequery.pageSize = val
       },
       // 查询按钮
       async onSubmit() {
-        let cha = {
-          rotationOrder: this.formSel.contacts,
-          id: this.formSel.contacts,
-          rotationOrder: this.formSel.contacts,
-          scopeDeployment: this.formSel.contacts,
-          advertisingSpaceStrategy: this.formSel.contacts,
-          contactInformation: this.formSel.contacts,
-          applicationTime: this.formSel.contacts,
-          marketTime: this.formSel.contacts,
-          advertisingContent: this.formSel.contacts,
-          launchStatus: this.formSel.contacts
-        }
-
-        let res = await queryById(cha)
-        this.tableData = res.data
-
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
       //重置按钮
       resetting() {
-        this.formSel = {
-          affiliation: '',
-          createUser: '',
-          createDate: '',
-          contacts: ''
-        }
-        this.getTable(this.chengeTatle)
-      },
-      MsgShen(val) {
-        this.index = val
-        this.MsgSp = true
-      },
-      LiuYes(val) {
-        this.liuYe = val
-        this.Liunie = true
-      },
-      OAshen() {
-
-        if (this.liuYe == 1) {
-          AdvertiserInfoEdit({
-            id: this.secondData.id,
-            auditStatus: '2'
-          }).then(res => {
-            this.getAll()
-          })
-        } else {
-          AdvertiserInfoEdit({
-            id: this.secondData.id,
-            auditStatus: '3'
-          }).then(res => {
-            this.getAll()
-          })
-        }
-        this.Liunie = false
-        this.actSpye = false
-
-      },
-      zhongzhi(item){
-        AdvertiserInfoEdit({
-          id: item.id,
-          auditStatus: '5'
-        }).then(res => {
+        this.pagequery = {
+            pageNumber: 0,
+            pageSize: 10,
+            advertisingName:''
+          },
           this.getAll()
-        })
-      },
-      shenhe(item) {
-        this.idCardValidStart = []
-        this.businessStartDate = []
-        this.secondData = item
-        this.$set(this.idCardValidStart, 0, item.idCardValidStart)
-            this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
-            this.$set(this.businessStartDate, 0, item.businessStartDate)
-            this.$set(this.businessStartDate, 1, item.businessEndDate)
-        this.actSpye = true
       },
-      lookHetong(item) {
-        this.secondData = item
-
-        this.heForm ={
-            contractNumber: '', //合同对应的ID
-            sectionNumber: '',
-            contractName: '',
-            contractAmount: '',
-            earnestMoney: '',
-            contractSigningDate: '',
-            contractTerminationDate: '',
-            leaseStartDate: '',
-            lessorName: '',
-            telephone: '',
-            bankAccount: '',
-            tenantName: '',
-            tenantTelephone: '',
-            tenantBankAccount: '',
-            relatedMerchants:'',
-            shopNumber:'',
-            contractStatus: '', //合同状态
-            appendicesContract:'',//附件
-            dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
-        }
-          this.heForm.relatedMerchants =  item.applicant
-           this.heForm.shopNumber = item.rentalResourcesId
-        this.hetong = true
-      },
-      fukuan() {
-        this.secondData = item
-        this.fukuanBox = true
+      //删除
+      closemsg(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') {
+              delList({
+                id: item.id
+              }).then(res => {
+                this.$message({
+                  message: '删除成功',
+                  type: 'success'
+                })
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
       },
-heClose(){
-  this.heForm = {
-            contractNumber: '', //合同对应的ID
-            sectionNumber: '',
-            contractName: '',
-            contractAmount: '',
-            earnestMoney: '',
-            contractSigningDate: '',
-            contractTerminationDate: '',
-            leaseStartDate: '',
-            lessorName: '',
-            telephone: '',
-            bankAccount: '',
-            tenantName: '',
-            tenantTelephone: '',
-            tenantBankAccount: '',
-            relatedMerchants:'',
-            shopNumber:'',
-            contractStatus: '', //合同状态
-            appendicesContract:'',//附件
-            dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
-        } //合同字段
-        this.hetong = false
-},
-heCheck(){
-    if(this.hetongData.length !=0){
-       this.heForm.appendicesContract = JSON.stringify(this.hetongData[0])
     }
-  hetongadd(this.heForm).then(res=>{
-    AdvertiserInfoEdit({
-      id: this.secondData.id,
-      contractId:res.data.id,
-      auditStatus:'4',
-    }).then(item => {
-      this.getAll()
-    })
-  })
-  this.hetong = false
-},
-   hetongRemove(){
-        this.hetongData = []
-      },
-      hetongUploadSuccess(response, file, num){
-        const fileMsg = {
-          name:file.name,
-           url: file.response.data.url,
-        }
-        // 将文件地址存储在 uploadedFiles 数组中
-        this.hetongData.push(fileMsg);
-      },
 
-     async delXiang(){
-        await AdvertiserInfoDel({id:this.secondData.id})
-        this.detbox = false
-        this.getAll()
-      },
-    }
   }
 </script>
 
@@ -1161,61 +436,20 @@ heCheck(){
     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;
-    cursor: pointer;
-  }
 
   .formSearch {
-    margin-top: 20px;
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-
-  }
-
-  .greens {
-    color: #3F9B6A;
-  }
-
-
-
-  .fenye {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-    position: relative;
-  }
-
-  /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 {
@@ -1229,440 +463,21 @@ heCheck(){
   .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;
-  }
-
-
-  /deep/.el-form-item__content label:nth-child(1) .is-checked+.el-radio__label {
-    color: #757575 !important;
-  }
-
-  /deep/.el-form-item__content label:nth-child(1) .is-checked .el-radio__inner {
-    border-color: #757575 !important;
-    background: #757575 !important;
-  }
-
-
-
-  ::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-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;
-  }
-
-  .hetong {
-    color: #3F9B6A;
-    text-decoration: underline;
-    cursor: pointer;
-  }
-
-  .tfneirong {
-    padding: 5px;
-  }
-
-  /deep/ .first-column-bg {
-    background-color: #FAFAFA !important;
-  }
-
-  .el-table tr {
-    height: 56px;
-  }
-
-
-
-  ::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: ''
-    }
-
-  }
-
-  ::v-deep .table3 {
-    .el-table__empty-block {
-      display: none;
-    }
-  }
-
-  .radio-right-side {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  /deep/ .radio-right-side .el-radio__label {
-    display: flex;
-    align-items: center;
-  }
-
-  /deep/ .radio-right-side .el-radio__inner {
-    order: 1;
-  }
-
-  /deep/ .radio-right-side .el-radio__input {
-    display: flex;
-    order: 2;
-  }
-
-  /deep/ .radio-right-side {
-    &:hover {
-      color: #000;
-
-    }
-
-    .el-radio__input.is-checked {
-
-      border-color: none;
-
-    }
-
-    .el-radio__input.is-checked .el-radio__inner {
-      background: #3F9B6A;
-      border-color: #3F9B6A;
-    }
-
-    .el-radio__input.is-checked .el-radio__inner {
-      color: #000;
-
-    }
-
-    .el-radio__inner::after {
-      border: 1px solid #3F9B6A !important;
-    }
-  }
-
-  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-    background: none;
-  }
-
-  /* /deep/ .el-input--mini .el-input__inner{
-  color: #000;
-  font-weight: 600;
-} */
 </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: 10px;
-  }
-
-  ::v-deep .shen_steps1 {
-    .is-process {
-      /* 待执行步骤颜色 */
-      color: #3F9B6A;
-      border: none;
-
-      .el-step__icon {
-        background-color: #3F9B6A;
-      }
-
-      .el-step__icon-inner {
-        color: #fff;
-      }
-
-      .el-step__line {
-        background-color: #3F9B6A;
-      }
-
-    }
-
-    .is-finish {
-      color: #3F9B6A;
-      border: none;
-
-      .el-step__icon {
-        background-color: #3F9B6A;
-      }
-
-      .el-step__icon-inner {
-        color: #fff;
-      }
-
-      .el-step__line {
-        background-color: #3F9B6A;
-      }
-    }
-
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
   }
 
-  ::v-deep .liu_steps {
-    .step_start {
-      flex-basis: 15% !important;
-
-      .is-finish {
-        border: none;
-        color: #3F9B6A;
-
-        .el-step__icon {
-          background-color: #D3E6CC;
-        }
-
-        .el-step__icon .is-text {
-          border: 2px solid #3F9B6A;
-        }
-
-        .el-step__icon-inner {
-          display: none;
-        }
-
-        .el-step__line {
-          border-color: #3F9B6A;
-        }
-      }
-
-      .is-wait {
-
-        border: none;
-        color: #000;
-
-        .el-step__icon {
-          background-color: #fff;
-        }
-
-        .el-step__icon .is-text {
-          border: 2px solid #000;
-        }
-
-        .el-step__icon-inner {
-          display: none;
-        }
-
-        .el-step__line {
-          background-color: #000;
-        }
-
-      }
-
-      .is-process {
-        border: none;
-        color: #000;
-
-        .el-step__icon {
-          background-color: #fff;
-        }
-
-        .el-step__icon .is-text {
-          border: 2px solid #000;
-        }
-
-        .el-step__icon-inner {
-          display: none;
-        }
-
-        .el-step__line {
-          background-color: #000;
-        }
-      }
-    }
 
-    .step_buen {
-      flex-basis: 25% !important;
-
-      .is-process {
-        .el-step__icon {
-          padding: 10px;
-          border-radius: 10px;
-          width: 120px;
-          height: 70px;
-          margin-top: -24px;
-          position: relative;
-          border: 2px solid #FABB41;
-          font-size: 12px;
-        }
-
-        .el-step__icon .is-text {
-          padding: 10px;
-          border-radius: 10px;
-          border: 2px solid #FABB41;
-          font-size: 12px;
-        }
-      }
-
-      .is-wait {
-        .el-step__icon {
-          padding: 10px;
-          border-radius: 10px;
-          width: 120px;
-          height: 70px;
-          margin-top: -24px;
-          position: relative;
-          border: 2px solid #C0C4CC;
-          font-size: 12px;
-        }
-
-        .el-step__icon .is-text {
-          padding: 10px;
-          border-radius: 10px;
-          border: 2px solid #C0C4CC;
-          font-size: 12px;
-        }
-      }
-
-      .is-finish {
-        .el-step__icon {
-          padding: 10px;
-          border-radius: 10px;
-          width: 120px;
-          height: 70px;
-          margin-top: -24px;
-          position: relative;
-          border: 2px solid #3F9B6A;
-          background-color: #D3E6CC;
-          font-size: 12px;
-          color: #3F9B6A;
-        }
-
-        .el-step__icon .is-text {
-          padding: 10px;
-          border-radius: 10px;
-          border: 2px solid #3F9B6A;
-          font-size: 12px;
-        }
-
-        .el-step__line {
-          background-color: #3F9B6A;
-        }
-      }
-    }
-
-    ::v-deep .xiang_steps {
-      .is-process {
-        /* 待执行步骤颜色 */
-        color: #3F9B6A;
-        border: none;
-
-        .el-step__icon {
-          background-color: #3F9B6A;
-        }
-
-        .el-step__icon-inner {
-          color: #fff;
-        }
-
-        .el-step__line {
-          background-color: #3F9B6A;
-        }
-
-      }
-
-      .is-finish {
-        color: #3F9B6A;
-        border: none;
-
-        .el-step__icon {
-          background-color: #3F9B6A;
-        }
-
-        .el-step__icon-inner {
-          color: #fff;
-        }
-
-        .el-step__line {
-          border-color: #3F9B6A;
-        }
-      }
-
-
-    }
-  }
-
-  ::v-deep .el-tabs__nav-wrap::after {
-    background-color: #fff;
-  }
-  ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell{
-    padding:0 0 0 10px;
-  }
-  ::v-deep  .el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
-    padding-bottom: 0px;
-  }
-  ::v-deep .el-descriptions__title{
-    font-weight:100;
-    font-size:14px;
+  .el-dialog__header{
+    padding: 0;
+    display: none;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/views/advertisement/index.vue b/admin-web-master/src/views/advertisement/index.vue
index f3aa714..3742a22 100644
--- a/admin-web-master/src/views/advertisement/index.vue
+++ b/admin-web-master/src/views/advertisement/index.vue
@@ -8,7 +8,8 @@
       <div style="display: flex;font-size: 14px">
         <div style="margin-right: 4px" @click="chenge(1)" :class="leixing == 1?'chengeXia':''">线上</div>
         ({{xsNum}}个广告位)
-        <div style="margin-left: 20px;margin-right: 4px" @click="chenge(2)" :class="leixing == 1?'':'chengeXia'">实体</div>({{stNum}}个广告位)
+        <div style="margin-left: 20px;margin-right: 4px" @click="chenge(2)" :class="leixing == 1?'':'chengeXia'">实体
+        </div>({{stNum}}个广告位)
       </div>
       <!-- 主体 -->
       <div>
@@ -16,17 +17,15 @@
         <div class="formSearch">
           <el-form :inline="true" :model="formSel">
             <el-form-item label="承租人" prop="tenant">
-              <el-input v-model="formSel.tenant" placeholder="请输入"
-                style="width: 168px;margin-right: 15px"/>
+              <el-input v-model="formSel.tenant" placeholder="请输入" style="width: 168px;margin-right: 15px" />
             </el-form-item>
-            <el-form-item label="投放时间" prop="createDate" >
+            <el-form-item label="投放时间" prop="createDate">
               <el-date-picker style="width:168px;margin-right:5px" v-model="formSel.marketTime"
-                value-format="yyyy-MM-dd"  type="date"  prefix-icon="none">
+                value-format="yyyy-MM-dd" type="date" prefix-icon="none">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="状态" prop="auditStatus"  >
-              <el-select v-model="formSel.auditStatus" placeholder="请选择"
-                style="width: 168px;margin-right: 15px">
+            <el-form-item label="状态" prop="auditStatus">
+              <el-select v-model="formSel.auditStatus" placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="待审核" value="1" />
                 <el-option label="待投放" value="2" />
                 <el-option label="已驳回" value="3" />
@@ -36,7 +35,7 @@
             </el-form-item>
           </el-form>
           <div>
-            <el-button @click="onSubmit"  style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">查询
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">查询
             </el-button>
             <el-button @click="resetting" class="buttonHover"
               style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
@@ -44,14 +43,14 @@
           </div>
         </div>
         <div style="margin-bottom:20px;">
-          <el-button plain @click="addbuss(1)" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline">新增
+          <el-button plain @click="addbuss(1)" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+            icon="el-icon-circle-plus-outline">新增
           </el-button>
         </div>
         <!-- 表格 -->
 
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-         >
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="编号" min-width="150" prop="id" v-if="leixing == 1">
           </el-table-column>
           <el-table-column label="广告位编号" min-width="150" prop="advertisingId" v-if="leixing == 2">
@@ -61,7 +60,7 @@
           </el-table-column>
           <el-table-column label="轮播顺序" prop="rotationOrder" min-width="80" v-if="leixing == 1">
             <template slot-scope="scope">
-           {{scope.row.cereAdvertisingInformation.rotationOrder}}
+              {{scope.row.cereAdvertisingInformation.rotationOrder}}
             </template>
           </el-table-column>
           <el-table-column label="投放范围" prop="scopeDeployment" min-width="120" v-if="leixing == 1">
@@ -69,25 +68,25 @@
           </el-table-column>
           <el-table-column label="承租人" prop="tenant" min-width="200">
             <template slot-scope="scope">
-            {{scope.row.cereContractInformation.tenantName}}
-             </template>
+              {{scope.row.cereContractInformation.tenantName}}
+            </template>
           </el-table-column>
           <el-table-column prop="contactInformation" label="联系方式" min-width="150">
             <template slot-scope="scope">
-            {{scope.row.cereContractInformation.tenantTelephone}}
-             </template>
+              {{scope.row.cereContractInformation.tenantTelephone}}
+            </template>
           </el-table-column>
           <el-table-column prop="applicationTime" label="申请时间" min-width="250">
           </el-table-column>
           <el-table-column label="投放时间" min-width="250">
-              <template slot-scope="scope">
+            <template slot-scope="scope">
               {{scope.row.marketTime||'2024-11-1'}}
-               </template>
+            </template>
           </el-table-column>
 
           <el-table-column label="状态" prop="auditStatus" min-width="120">
             <template slot-scope="scope">
-             {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待投放':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已投放':'已终止'}}
+              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'待投放':scope.row.auditStatus =='3'?'已驳回':scope.row.auditStatus =='4'?'已投放':'已终止'}}
             </template>
           </el-table-column>
 
@@ -95,106 +94,96 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="lookHetong(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus !='5'">合同编辑</div>
-            <!--  <div @click="toufang(scope.row)" class="tableBtn greens" v-if="leixing == 1 && scope.row.auditStatus =='2'">投放</div>
+              <!--  <div @click="toufang(scope.row)" class="tableBtn greens" v-if="leixing == 1 && scope.row.auditStatus =='2'">投放</div>
               <div @click="xiajia(scope.row)" class="tableBtn greens" v-if="leixing ==1 && scope.row.auditStatus =='4'">下架</div> -->
-              <div @click="toufang(scope.row)" class="tableBtn greens" v-if="leixing == 1 && scope.row.auditStatus =='2'">投放</div>
-              <div @click="xiajia(scope.row)" class="tableBtn greens" v-if="leixing ==1 && scope.row.auditStatus =='4'">下架</div>
-              <div @click="gengGai(scope.row)" class="tableBtn greens" v-if="leixing == 1&& scope.row.auditStatus !='5'">更改状态</div>
+              <div @click="toufang(scope.row)" class="tableBtn greens"
+                v-if="leixing == 1 && scope.row.auditStatus =='2'">投放</div>
+              <div @click="xiajia(scope.row)" class="tableBtn greens" v-if="leixing ==1 && scope.row.auditStatus =='4'">
+                下架</div>
+              <div @click="gengGai(scope.row)" class="tableBtn greens"
+                v-if="leixing == 1&& scope.row.auditStatus !='5'">更改状态</div>
               <div @click="handleDelete(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='1'">删除</div>
               <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens" >删除</div> -->
             </template>
           </el-table-column>
         </el-table>
         <div class="fenye">
-          <el-pagination :hide-on-single-page='flag' background small  :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]"  layout="prev, pager, next,total"
-            :total="total " @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination :hide-on-single-page='flag' background small :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
 
         <!-- 新建-->
-        <el-dialog title="新增" :visible.sync="ggXin" custom-class='XDD_css' style="padding: 0;" width="70%"
-                    center :close-on-click-modal="false" :show-close="false">
-
-                    <div style="margin:20px;border:1px solid #EAEAEA">
-                          <div style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 5px 10px;background-color: #FAFAFA;align-items: center;">
-                            <div style="line-height: 28px;">广告位选择</div>
-                            <div  class="greens"  @click="addziyuan = true">
-                             添加
-                            </div>
-                          </div>
-                          <div style="padding: 20px 10px 10px 20px;">
-                            <el-table :data="AddziyuanData"
-                              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                             >
-                              <el-table-column label="序号" min-width="80">
-                              <template slot-scope="scope">
-                                  {{scope.$index + 1}}
-                              </template>
-                              </el-table-column>
-                              <el-table-column label="广告位编号" prop="id" min-width="120">
-                              </el-table-column>
-                              <el-table-column label="广告位名称" prop="advertisingName" min-width="150">
-
-                              </el-table-column>
-                              <el-table-column label="广告位类型" prop="advertisingType" min-width="200">
-                              </el-table-column>
-                              <el-table-column prop="affiliation" label="所属端" min-width="150">
-                              </el-table-column>
-                              <el-table-column prop="dimensions" label="广告尺寸" min-width="250">
-                              </el-table-column>
-
-                            </el-table>
-                          </div>
-                    </div>
-                  <div style="padding: 0 20px;">
-                        <div style="padding: 0px 20px 0 0;">
-                          <el-descriptions class="margin-top" :column="3" title="投放信息"  border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  投放范围
-                                </template>
-                                <el-select v-model="formInl.scopeDeployment" placeholder="请选择"  class="pass_select"
-                                 >
-                                  <el-option label="线上广告位" value="线上广告位"  v-if="leixing == 1"/>
-                                  <el-option label="实体广告位" value="实体广告位"  v-else/>
-                                </el-select>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-
-                                  投放内容
-                                </template>
-                                <el-upload
-                                  class="upload-demo"
-                                  :on-remove="handleRemove"
-                                  :action="uploadFileUrl"
-                                  :on-success="handleUploadSuccess"
-                                  :file-list="fileData"
-                                  :auto-upload="true"
-                                  :listData="1"
-                                  >
-                                  <div class="greens" v-if="fileData.length==0"> + 点击上传</div>
-                                </el-upload>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  跳转链接
-                                </template>
-                                <el-input
-                                    v-model="formInl.jumpLink"
-                                    class="pass_input"
-                                    placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item v-if="leixing == 2">
-                                <template slot="label">
-                                  投放位置
-                                </template>
-                                <el-input
-                                    v-model="formInl.placementLocation"
-                                    class="pass_input"
-                                    placeholder="请输入" />
-                              </el-descriptions-item>
-                              <!-- <el-descriptions-item >
+        <el-dialog title="新增" :visible.sync="ggXin" custom-class='XDD_css' style="padding: 0;" width="70%" center
+          :close-on-click-modal="false" :show-close="false">
+
+          <div style="margin:20px;border:1px solid #EAEAEA">
+            <div
+              style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 5px 10px;background-color: #FAFAFA;align-items: center;">
+              <div style="line-height: 28px;">广告位选择</div>
+              <div class="greens" @click="addziyuan = true">
+                添加
+              </div>
+            </div>
+            <div style="padding: 20px 10px 10px 20px;">
+              <el-table :data="AddziyuanData"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                <el-table-column label="序号" min-width="80">
+                  <template slot-scope="scope">
+                    {{scope.$index + 1}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="广告位编号" prop="id" min-width="120">
+                </el-table-column>
+                <el-table-column label="广告位名称" prop="advertisingName" min-width="150">
+
+                </el-table-column>
+                <el-table-column label="广告位类型" prop="advertisingType" min-width="200">
+                </el-table-column>
+                <el-table-column prop="affiliation" label="所属端" min-width="150">
+                </el-table-column>
+                <el-table-column prop="dimensions" label="广告尺寸" min-width="250">
+                </el-table-column>
+
+              </el-table>
+            </div>
+          </div>
+          <div style="padding: 0 20px;">
+            <div style="padding: 0px 20px 0 0;">
+              <el-descriptions class="margin-top" :column="3" title="投放信息" border :labelStyle="labelStyle"
+                :contentStyle="contentStyle">
+                <el-descriptions-item>
+                  <template slot="label">
+                    投放范围
+                  </template>
+                  <el-select v-model="formInl.scopeDeployment" placeholder="请选择" class="pass_select">
+                    <el-option label="线上广告位" value="线上广告位" v-if="leixing == 1" />
+                    <el-option label="实体广告位" value="实体广告位" v-else />
+                  </el-select>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+
+                    投放内容
+                  </template>
+                  <el-upload class="upload-demo" :on-remove="handleRemove" :action="uploadFileUrl"
+                    :on-success="handleUploadSuccess" :file-list="fileData" :auto-upload="true" :listData="1">
+                    <div class="greens" v-if="fileData.length==0"> + 点击上传</div>
+                  </el-upload>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    跳转链接
+                  </template>
+                  <el-input v-model="formInl.jumpLink" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item v-if="leixing == 2">
+                  <template slot="label">
+                    投放位置
+                  </template>
+                  <el-input v-model="formInl.placementLocation" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <!-- <el-descriptions-item >
                                 <template slot="label">
                                   投放时间
                                 </template>
@@ -203,185 +192,137 @@
                                   end-placeholder="" prefix-icon="none">
                                 </el-date-picker>
                               </el-descriptions-item> -->
-                            </el-descriptions>
-                        </div>
-                  </div>
-
-                  <div style="padding:20px; ">
-                        <div style="padding: 0px 20px 0 0;">
-                          <el-descriptions class="margin-top" :column="3" title="合同信息"  border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同编号
-                                </template>
-                                <el-input
-                                  v-model="heForm.contractNumber"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
+              </el-descriptions>
+            </div>
+          </div>
 
-                                  标段号
-                                </template>
-                                <el-input
-                                  v-model="heForm.sectionNumber"
-                                    class="pass_input"
-                                    placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同名称
-                                </template>
-                              <el-input
-                                   v-model="heForm.contractName"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同金额
-                                </template>
-                                <el-input
-                                  v-model="heForm.contractAmount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  保证金
-                                </template>
-                                <el-input
-                                  v-model="heForm.earnestMoney"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同签订日期
-                                </template>
-                                <el-input
-                                  v-model="heForm.contractSigningDate"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同终止日期
-                                </template>
-                                <el-input
-                                  v-model="heForm.contractTerminationDate"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  起止日期
-                                </template>
-                                <el-input
-                                  v-model="heForm.leaseStartDate"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  出租人名称
-                                </template>
-                                <el-input
-                                  v-model="heForm.lessorName"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  联系电话
-                                </template>
-                                <el-input
-                                  v-model="heForm.telephone"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  银行账号
-                                </template>
-                                <el-input
-                                  v-model="heForm.bankAccount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  承担人名称
-                                </template>
-                                <el-input
-                                  v-model="heForm.tenantName"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  承担人联系电话
-                                </template>
-                                <el-input
-                                  v-model="heForm.tenantTelephone"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  承担人银行账号
-                                </template>
-                                <el-input
-                                  v-model="heForm.tenantBankAccount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同附件
-                                </template>
-                                <el-upload
-                                  class="upload-demo"
-                                  :on-remove="hetongRemove"
-                                  :action="uploadFileUrl"
-                                  :on-success="hetongUploadSuccess"
-                                  :file-list="hetongData"
-                                  :auto-upload="true"
-                                  >
-                                  <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
-                                </el-upload>
-                              </el-descriptions-item>
-                            </el-descriptions>
-                        </div>
-                  </div>
+          <div style="padding:20px; ">
+            <div style="padding: 0px 20px 0 0;">
+              <el-descriptions class="margin-top" :column="3" title="合同信息" border :labelStyle="labelStyle"
+                :contentStyle="contentStyle">
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同编号
+                  </template>
+                  <el-input v-model="heForm.contractNumber" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+
+                    标段号
+                  </template>
+                  <el-input v-model="heForm.sectionNumber" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同名称
+                  </template>
+                  <el-input v-model="heForm.contractName" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同金额
+                  </template>
+                  <el-input v-model="heForm.contractAmount" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    保证金
+                  </template>
+                  <el-input v-model="heForm.earnestMoney" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同签订日期
+                  </template>
+                  <el-input v-model="heForm.contractSigningDate" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同终止日期
+                  </template>
+                  <el-input v-model="heForm.contractTerminationDate" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    起止日期
+                  </template>
+                  <el-input v-model="heForm.leaseStartDate" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    出租人名称
+                  </template>
+                  <el-input v-model="heForm.lessorName" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    联系电话
+                  </template>
+                  <el-input v-model="heForm.telephone" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    银行账号
+                  </template>
+                  <el-input v-model="heForm.bankAccount" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    承担人名称
+                  </template>
+                  <el-input v-model="heForm.tenantName" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    承担人联系电话
+                  </template>
+                  <el-input v-model="heForm.tenantTelephone" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    承担人银行账号
+                  </template>
+                  <el-input v-model="heForm.tenantBankAccount" class="pass_input" placeholder="请输入" />
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    合同附件
+                  </template>
+                  <el-upload class="upload-demo" :on-remove="hetongRemove" :action="uploadFileUrl"
+                    :on-success="hetongUploadSuccess" :file-list="hetongData" :auto-upload="true">
+                    <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
+                  </el-upload>
+                </el-descriptions-item>
+              </el-descriptions>
+            </div>
+          </div>
 
           <span slot="footer" class="dialog-footer">
-            <el-button @click="closeFn(1)"  class="buttonHover"
+            <el-button @click="closeFn(1)" class="buttonHover"
               style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
-            <el-button @click="addCheck('formInline')"
-              style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+            <el-button @click="addCheck('formInline')" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
           </span>
 
           <!-- 资源选择 -->
-          <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;">
+          <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
+                  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"
-                    @current-change="handleSelectionChange" highlight-current-row
-                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                      >
+                    <el-table :data="ziyuanData" @current-change="handleSelectionChange" highlight-current-row
+                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
 
-                      <el-table-column label="序号"  min-width="8%" >
+                      <el-table-column label="序号" min-width="8%">
                         <template slot-scope="scope">
                           {{scope.$index + 1}}
                         </template>
@@ -389,10 +330,10 @@
                       <el-table-column label="编号" prop="id" min-width="22%">
 
                       </el-table-column>
-                      <el-table-column label="资源名称"  min-width="15%">
-                      <template slot-scope="scope">
-                        {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
-                      </template>
+                      <el-table-column label="资源名称" min-width="15%">
+                        <template slot-scope="scope">
+                          {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
+                        </template>
                       </el-table-column>
                       <el-table-column label="资源类型" min-width="15%">
                         <template slot-scope="scope">
@@ -407,10 +348,10 @@
               </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 @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 @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
               </el-button>
 
             </div>
@@ -418,346 +359,301 @@
         </el-dialog>
       </div>
 
-        <!-- 详情框 -->
-            <el-dialog :visible.sync="detbox" custom-class='bian_css' style="padding: 0;" width="70%"
-                    center :close-on-click-modal="false" :show-close="false">
-                    <div style="padding:15px;">详情</div>
-                    <div style="padding: 0 20px;">
-                      <el-tabs v-model="card" >
-                        <el-tab-pane label="租赁人信息" name="first">
-                          <el-form ref="form" label-width="140px">
-                            <el-form-item label="承租人名称">
-                              <el-input v-model="secondData.tenantName" disabled ></el-input>
-                            </el-form-item>
-                            <el-form-item label="联系电话">
-                              <el-input v-model="secondData.contactPhone" disabled ></el-input>
-                            </el-form-item>
-                            <el-form-item label="主体类型">
-                              <el-select v-model="hetongList.createUser"  disabled>
-                                <el-option label="企业" value="企业" />
-                                <el-option label="个人" value="个人" />
-                              </el-select>
-                            </el-form-item>
-                            <el-form-item label="证件类型">
-                              <el-input v-model="secondData.idCardType" disabled placeholder="身份证"></el-input>
-                            </el-form-item>
-                            <el-form-item label="身份证号码">
-                              <el-input v-model="secondData.idCardNumber" disabled placeholder="511191561"></el-input>
-                            </el-form-item>
-                            <el-form-item label="身份证有效期">
-                              <el-input v-model="secondData.idCardNumber" disabled placeholder="2001-3-4至2021-3-4"></el-input>
-                              <!-- <el-date-picker style="width: 100%;" v-model="hetongList.plan_Time"
+      <!-- 详情框 -->
+      <el-dialog :visible.sync="detbox" custom-class='bian_css' style="padding: 0;" width="70%" center
+        :close-on-click-modal="false" :show-close="false">
+        <div style="padding:15px;">详情</div>
+        <div style="padding: 0 20px;">
+          <el-tabs v-model="card">
+            <el-tab-pane label="租赁人信息" name="first">
+              <el-form ref="form" label-width="140px">
+                <el-form-item label="承租人名称">
+                  <el-input v-model="secondData.tenantName" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                  <el-input v-model="secondData.contactPhone" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="主体类型">
+                  <el-select v-model="hetongList.createUser" disabled>
+                    <el-option label="企业" value="企业" />
+                    <el-option label="个人" value="个人" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="证件类型">
+                  <el-input v-model="secondData.idCardType" disabled placeholder="身份证"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证号码">
+                  <el-input v-model="secondData.idCardNumber" disabled placeholder="511191561"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证有效期">
+                  <el-input v-model="secondData.idCardNumber" disabled placeholder="2001-3-4至2021-3-4"></el-input>
+                  <!-- <el-date-picker style="width: 100%;" v-model="hetongList.plan_Time"
                                 value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
                                 start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
                               </el-date-picker> -->
-                            </el-form-item>
-                            <el-form-item label="身份证照片(正面)">
-                              <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-                            </el-form-item>
-                            <el-form-item label="身份证照片(反面)">
-                              <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-                            </el-form-item>
-                            <el-form-item label="是否为法人">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="企业授权书">
-                              <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-                            </el-form-item>
-                          </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="主体信息" name="three">
-                          <el-form ref="form" label-width="140px">
-                            <el-form-item label="主体名称">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="统一社会信用代码">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="类型">
-                              <el-select v-model="secondData.createUser" placeholder="请选择" disabled>
-                                <el-option label="有限责任公司" value="有限责任公司" />
-                              </el-select>
-                            </el-form-item>
-                            <el-form-item label="法定代表人">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="经营范围">
-                              <el-input type="textarea" v-model="secondData.founder" :rows="4" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="注册资本">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="成立日期">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="住所">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="邮箱地址">
-                              <el-input v-model="secondData.founder" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="营业期限">
-                              <el-date-picker style="width: 100%;" v-model="secondData.plan_Time"
-                                value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
-                                start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
-                              </el-date-picker>
-                            </el-form-item>
-                            <el-form-item label="营业执照">
-                              <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-                            </el-form-item>
-                          </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="投放内容" name="second">
-                          <el-form ref="form" label-width="140px">
-                            <el-form-item label="Banner图">
-                              <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
-                            </el-form-item>
-                            <el-form-item label="投放内容">
-                              <el-input v-model="secondData.advertisingContent" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="跳转链接">
-                              <el-input v-model="secondData.jumpLink" disabled></el-input>
-                            </el-form-item>
-                            <el-form-item label="计划时间">
-                              <el-date-picker style="width: 100%;" v-model="secondData.plan_Time"
-                                value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
-                                start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
-                              </el-date-picker>
-                            </el-form-item>
-
-                          </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="投放效果" name="four">
-                          <el-descriptions class="margin-top" :column="3" title="投放信息"  border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  点击量
-                                </template>
-                                  {{secondData.pageview}}
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-
-                                  高频时段
-                                </template>
-                                {{secondData.highFrequencyTime}}
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  评价点击价格
-                                </template>
-{{secondData.averageClickThroughPrice}}
-                              </el-descriptions-item>
-                            </el-descriptions>
+                </el-form-item>
+                <el-form-item label="身份证照片(正面)">
+                  <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                </el-form-item>
+                <el-form-item label="身份证照片(反面)">
+                  <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                </el-form-item>
+                <el-form-item label="是否为法人">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="企业授权书">
+                  <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="主体信息" name="three">
+              <el-form ref="form" label-width="140px">
+                <el-form-item label="主体名称">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="统一社会信用代码">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="类型">
+                  <el-select v-model="secondData.createUser" placeholder="请选择" disabled>
+                    <el-option label="有限责任公司" value="有限责任公司" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="法定代表人">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="经营范围">
+                  <el-input type="textarea" v-model="secondData.founder" :rows="4" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="注册资本">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="成立日期">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="住所">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="邮箱地址">
+                  <el-input v-model="secondData.founder" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="营业期限">
+                  <el-date-picker style="width: 100%;" v-model="secondData.plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                    align="right" disabled>
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="营业执照">
+                  <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="投放内容" name="second">
+              <el-form ref="form" label-width="140px">
+                <el-form-item label="Banner图">
+                  <upimg v-model="secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                </el-form-item>
+                <el-form-item label="投放内容">
+                  <el-input v-model="secondData.advertisingContent" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="跳转链接">
+                  <el-input v-model="secondData.jumpLink" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="计划时间">
+                  <el-date-picker style="width: 100%;" v-model="secondData.plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                    align="right" disabled>
+                  </el-date-picker>
+                </el-form-item>
+
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="投放效果" name="four">
+              <el-descriptions class="margin-top" :column="3" title="投放信息" border :labelStyle="labelStyle"
+                :contentStyle="contentStyle">
+                <el-descriptions-item>
+                  <template slot="label">
+                    点击量
+                  </template>
+                  {{secondData.pageview}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+
+                    高频时段
+                  </template>
+                  {{secondData.highFrequencyTime}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label">
+                    评价点击价格
+                  </template>
+                  {{secondData.averageClickThroughPrice}}
+                </el-descriptions-item>
+              </el-descriptions>
+
+              <!-- <div>点击量统计表</div> -->
+            </el-tab-pane>
+          </el-tabs>
+          <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
+            <el-button class="buttonHover" style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;"
+              @click="closeFn(2)">返回</el-button>
+            <!-- <el-button   style="background-color: #3F9B6A;color: #fff;">确定</el-button> -->
 
-                            <!-- <div>点击量统计表</div> -->
-                        </el-tab-pane>
-                      </el-tabs>
-                      <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
- <el-button   class="buttonHover"
-              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;" @click="closeFn(2)">返回</el-button>
-                             <!-- <el-button   style="background-color: #3F9B6A;color: #fff;">确定</el-button> -->
-
-                      </div>
-                    </div>
+          </div>
+        </div>
 
 
-        </el-dialog>
-
-        <!-- 合同 -->
-                <el-dialog  :visible.sync="hetongBox" custom-class='bian_css' style="padding: 0;" width="70%"
-                            center :close-on-click-modal="false" :show-close="false">
+      </el-dialog>
+
+      <!-- 合同 -->
+      <el-dialog :visible.sync="hetongBox" custom-class='bian_css' style="padding: 0;" width="70%" center
+        :close-on-click-modal="false" :show-close="false">
+
+        <div style="padding:20px">
+          <el-descriptions class="margin-top" :column="3" title="合同信息" border :labelStyle="labelStyle"
+            :contentStyle="contentStyle">
+            <el-descriptions-item>
+              <template slot="label">
+                合同编号
+              </template>
+              <el-input v-model="hetong.contractNumber" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                标段号
+              </template>
+              <el-input v-model="hetong.sectionNumber" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                合同名称
+              </template>
+              <el-input v-model="hetong.contractName" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                合同金额
+              </template>
+              <el-input v-model="hetong.contractAmount" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                保证金
+              </template>
+              <el-input v-model="hetong.earnestMoney" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                合同终止日期
+              </template>
+              <el-input v-model="hetong.contractTerminationDate" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                起止日期
+              </template>
+              <el-input v-model="hetong.leaseStartDate" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                出租人名称
+              </template>
+              <el-input v-model="hetong.lessorName" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                联系电话
+              </template>
+              <el-input v-model="hetong.telephone" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                银行账号
+              </template>
+              <el-input v-model="hetong.bankAccount" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template slot="label">
+                承租人联系电话
+              </template>
+              <el-input v-model="hetong.tenantTelephone" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                承租人银行账号
+              </template>
+              <el-input v-model="hetong.tenantBankAccount" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                广告位编号
+              </template>
+              <el-input v-model="secondData.advertisingId" class="pass_input" placeholder="请输入" />
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+              <template slot="label">
+                合同附件
+              </template>
+              <el-upload class="upload-demo" :on-remove="hetongRemove" :action="uploadFileUrl"
+                :on-success="hetongUploadSuccess" :file-list="hetongData" :auto-upload="true">
+                <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
+              </el-upload>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+        <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;"
+            @click="closeFn(3)">返回</el-button>
+          <el-button @click="EditHetong()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+          <!-- <el-button    style="background-color: #3F9B6A;color: #fff;">下载</el-button> -->
 
-                  <div style="padding:20px">
-<el-descriptions class="margin-top" :column="3" title="合同信息"  border :labelStyle="labelStyle" :contentStyle="contentStyle">
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同编号
-                                </template>
-                                <el-input
-                                  v-model="hetong.contractNumber"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  标段号
-                                </template>
-                                <el-input
-                                  v-model="hetong.sectionNumber"
-                                    class="pass_input"
-                                    placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同名称
-                                </template>
-                              <el-input
-                                   v-model="hetong.contractName"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同金额
-                                </template>
-                                <el-input
-                                  v-model="hetong.contractAmount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  保证金
-                                </template>
-                                <el-input
-                                  v-model="hetong.earnestMoney"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同终止日期
-                                </template>
-                                <el-input
-                                  v-model="hetong.contractTerminationDate"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  起止日期
-                                </template>
-                                <el-input
-                                  v-model="hetong.leaseStartDate"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  出租人名称
-                                </template>
-                                <el-input
-                                  v-model="hetong.lessorName"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  联系电话
-                                </template>
-                                <el-input
-                                  v-model="hetong.telephone"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  银行账号
-                                </template>
-                                <el-input
-                                  v-model="hetong.bankAccount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
 
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  承租人联系电话
-                                </template>
-                                <el-input
-                                  v-model="hetong.tenantTelephone"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-               </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  承租人银行账号
-                                </template>
-                                <el-input
-                                  v-model="hetong.tenantBankAccount"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  广告位编号
-                                </template>
-                                <el-input
-                                  v-model="secondData.advertisingId"
-                                  class="pass_input"
-                                  placeholder="请输入"/>
-                              </el-descriptions-item>
+        </div>
+      </el-dialog>
+      <el-dialog :visible.sync="steatShow" custom-class='bian_css' style="padding: 0;" width="55%" center
+        :close-on-click-modal="false" :show-close="false">
+        <div style="padding:15px;">更改状态</div>
+        <div style="padding: 0 20px 20px 20px;">
+          <el-form ref="form" label-width="140px">
+            <el-form-item label="广告位名称">
+              <el-input v-model="secondData.founder" disabled placeholder="绿道广告位"></el-input>
+            </el-form-item>
+            <el-form-item label="编号">
+              <el-input v-model="secondData.id" disabled placeholder="ggw1105"></el-input>
+            </el-form-item>
+            <el-form-item label="投放时间">
 
-                              <el-descriptions-item>
-                                <template slot="label">
-                                  合同附件
-                                </template>
-                            <el-upload
-                              class="upload-demo"
-                              :on-remove="hetongRemove"
-                              :action="uploadFileUrl"
-                              :on-success="hetongUploadSuccess"
-                              :file-list="hetongData"
-                              :auto-upload="true"
-                              >
-                              <div class="greens" v-if="hetongData.length==0"> + 点击上传</div>
-                            </el-upload>
-                              </el-descriptions-item>
-                            </el-descriptions>
-                            </div>
-                            <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
-                            <el-button   class="buttonHover"
-              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;"  @click="closeFn(3)">返回</el-button>
-                                   <el-button @click="EditHetong()"   style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-                                    <!-- <el-button    style="background-color: #3F9B6A;color: #fff;">下载</el-button> -->
-
-
-                            </div>
-                </el-dialog>
-                <el-dialog  :visible.sync="steatShow" custom-class='bian_css' style="padding: 0;" width="55%"
-                                            center :close-on-click-modal="false" :show-close="false">
-                                            <div style="padding:15px;">更改状态</div>
-                                            <div style="padding: 0 20px 20px 20px;">
-                                              <el-form ref="form" label-width="140px">
-                                                <el-form-item label="广告位名称">
-                                                  <el-input v-model="secondData.founder" disabled placeholder="绿道广告位"></el-input>
-                                                </el-form-item>
-                                                <el-form-item label="编号">
-                                                  <el-input v-model="secondData.id" disabled placeholder="ggw1105"></el-input>
-                                                </el-form-item>
-                                                <el-form-item label="投放时间">
-
-                                                  <el-input v-model="secondData.founder" disabled placeholder="2001-3-4至2021-3-4"></el-input>
-                                                 <!-- <el-date-picker style="width: 100%;" v-model="secondData.plan_Time"
+              <el-input v-model="secondData.founder" disabled placeholder="2001-3-4至2021-3-4"></el-input>
+              <!-- <el-date-picker style="width: 100%;" v-model="secondData.plan_Time"
                                                     value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至"
                                                     start-placeholder="开始日期" end-placeholder="结束日期" align="right" disabled>
                                                   </el-date-picker> -->
-                                                </el-form-item>
-                                                <el-form-item label="状态">
-                                                  <el-input v-model="secondData.founder" disabled placeholder="待投放"></el-input>
-                                                </el-form-item>
-                                                <el-form-item label="状态更改">
-                                                  <el-select v-model="auditStatusNum" placeholder="请选择" >
-                                                    <el-option label="终止" value="2" />
-
-                                                  </el-select>
-                                                </el-form-item>
-                                              </el-form>
-                                            </div>
-                                            <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
-                                            <el-button   class="buttonHover"
-                              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;"  @click="steatShow=false">返回</el-button>
-                                                   <el-button @click="status"   style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-
-                                            </div>
-                                </el-dialog>
-      </div>
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-input v-model="secondData.founder" disabled placeholder="待投放"></el-input>
+            </el-form-item>
+            <el-form-item label="状态更改">
+              <el-select v-model="auditStatusNum" placeholder="请选择">
+                <el-option label="终止" value="2" />
 
-      </div>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div style="margin-top: 50px;width: 99%;padding:10px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;"
+            @click="steatShow=false">返回</el-button>
+          <el-button @click="status" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+
+        </div>
+      </el-dialog>
     </div>
 
   </div>
+
 </template>
 
 <script>
@@ -765,72 +661,72 @@
     async
   } from 'q'
   import axios from 'axios'
- import {
-   contractGetAll,
-   contractDel,
-   addList,
-   updateList,
-   queryById,
-   hetongById,
-   hetongadd,
-   hetongEdit,
-   hetongDel,
-   hetongBy
- } from '../../api/advertisement.js'
- import {
-   getAlls as map1
- } from '../../api/map1'
- import {
-   uploadUrl
- } from '@/utils/request'
+  import {
+    contractGetAll,
+    contractDel,
+    addList,
+    updateList,
+    queryById,
+    hetongById,
+    hetongadd,
+    hetongEdit,
+    hetongDel,
+    hetongBy
+  } from '../../api/advertisement.js'
+  import {
+    getAlls as map1
+  } from '../../api/map1'
+  import {
+    uploadUrl
+  } from '@/utils/request'
 
   export default {
 
     data() {
       return {
         uploadFileUrl: uploadUrl, // 请求地址
-        fileData:[],//上传附件
-        hetongBox:false,//合同
-        detbox:false,//详情
-        leixing:1,// 1是线上 2是实体
+        fileData: [], //上传附件
+        hetongBox: false, //合同
+        detbox: false, //详情
+        leixing: 1, // 1是线上 2是实体
         currentPage: 1,
         total: 100,
         flag: false,
         pageSize: 10,
         ggXin: false,
         radio: '1',
-        ggwSel:[],
+        ggwSel: [],
         formInl: {
-         scopeDeployment:'',
-         jumpLink:'',
-         auditStatus:'2',
-         placementLocation:'',
-         marketTime:'',
+          scopeDeployment: '',
+          jumpLink: '',
+          auditStatus: '2',
+          placementLocation: '',
+          marketTime: '',
         },
         tableData: [],
         formSel: {
-        tenant:'',
-        marketTime:'',
-        auditStatus:'',
-         pageNumber: 1,
-         pageSize: 10,
+          tenant: '',
+          marketTime: '',
+          auditStatus: '',
+          pageNumber: 1,
+          pageSize: 10,
         },
         pageindex: {
           pageNumber: 1,
           pageSize: 10,
-          scopeDeployment:'线上广告位'
+          scopeDeployment: '线上广告位'
         },
-        chengeTatle:1,
-        contractId:'',
-        secondData:{},
-        hetong:{},
-         card: 'first', // 切换
-         steatShow:false,
-        addziyuan:false,//资源列表选择
-        AddziyuanData:[],
-        multipleSelection:[],
-        ziyuanData:[],
-        hetongData:[],
+        chengeTatle: 1,
+        contractId: '',
+        secondData: {},
+        hetong: {},
+        card: 'first', // 切换
+        steatShow: false,
+        addziyuan: false, //资源列表选择
+        AddziyuanData: [],
+        multipleSelection: [],
+        ziyuanData: [],
+        hetongData: [],
         heForm: {
           contractNumber: '', //合同对应的ID
           sectionNumber: '',
@@ -849,108 +745,108 @@
           contractStatus: '', //合同状态
           dataStatus: '1', //数据状态（1.使用中  2.往期合同 3.已终止）
         }, //合同字段
-        contentStyle:{
-          width:'20%',
-          height:'42px',
+        contentStyle: {
+          width: '20%',
+          height: '42px',
         },
-        labelStyle:{
-          width:'150px',
-          height:'42px',
-          color:'#000',
+        labelStyle: {
+          width: '150px',
+          height: '42px',
+          color: '#000',
         },
 
-        xsNum:0,
-        stNum:0,
-        hetongList:{},
-        auditStatusNum:''
+        xsNum: 0,
+        stNum: 0,
+        hetongList: {},
+        auditStatusNum: ''
       }
     },
     created() {
       this.getAll()
-        let obj={
-          pageNumber: 1,
-          pageSize: 10,
-          scopeDeployment:'实体广告位'
-        }
-        contractGetAll(obj).then(res=>{
-              this.stNum = res.data.content.length
-          })
+      let obj = {
+        pageNumber: 1,
+        pageSize: 10,
+        scopeDeployment: '实体广告位'
+      }
+      contractGetAll(obj).then(res => {
+        this.stNum = res.data.content.length
+      })
     },
     computed: {
 
     },
     methods: {
-       getTable(val){
-
-       },
-      chenge(val){
-        this.formSel={
-        tenant:'',
-        marketTime:'',
-        auditStatus:'',
-         pageNumber: 1,
-         pageSize: 10,
+      getTable(val) {
+
+      },
+      chenge(val) {
+        this.formSel = {
+          tenant: '',
+          marketTime: '',
+          auditStatus: '',
+          pageNumber: 1,
+          pageSize: 10,
         }
         console.log(val)
-        this.leixing  = val
-         this.chengeTatle = val
-         if(val == 1){
-             this.ggwSel.map(res=>{
-               res.ggwLei = '线上广告位'
-             })
-             this.pageindex.scopeDeployment ='线上广告位'
-            this.getAll((this.pageindex))
-         }else{
-           this.ggwSel.map(res=>{
-             res.ggwLei = '实体广告位'
-           })
-          this.pageindex.scopeDeployment ='实体广告位'
-           this.getAll(this.pageindex)
-         }
+        this.leixing = val
+        this.chengeTatle = val
+        if (val == 1) {
+          this.ggwSel.map(res => {
+            res.ggwLei = '线上广告位'
+          })
+          this.pageindex.scopeDeployment = '线上广告位'
+          this.getAll((this.pageindex))
+        } else {
+          this.ggwSel.map(res => {
+            res.ggwLei = '实体广告位'
+          })
+          this.pageindex.scopeDeployment = '实体广告位'
+          this.getAll(this.pageindex)
+        }
       },
       async getAll(val) {
         const res = await contractGetAll(this.pageindex)
-        if(this.pageindex.scopeDeployment == '线上广告位'){
+        if (this.pageindex.scopeDeployment == '线上广告位') {
           this.xsNum = res.data.content.length
-        }else{
+        } else {
           this.stNum = res.data.content.length
         }
         this.tableData = res.data.content
         this.total = res.data.content.length
       },
-  // 获取时间
+      // 获取时间
       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;
-
-          // 拼接日期和时间字符串
-          let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-          return strDate;
+        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;
+
+        // 拼接日期和时间字符串
+        let strDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        return strDate;
       },
       // 新增确定按钮
-       addCheck(formInline) {
+      addCheck(formInline) {
         // this.ggwSel[this.radio]
-         if(this.AddziyuanData.length != 0){
-            this.formInl.advertisingId  = this.AddziyuanData[0].id
-         }
-         if(this.fileData.length !=0){
-             this.formInl.advertisingContent  =  JSON.stringify(this.fileData)
-         }
-         if(this.hetongData.length !=0){
-             this.heForm.appendicesContract  =  JSON.stringify(this.hetongData)
-         }
+        if (this.AddziyuanData.length != 0) {
+          this.formInl.advertisingId = this.AddziyuanData[0].id
+        }
+        if (this.fileData.length != 0) {
+          this.formInl.advertisingContent = JSON.stringify(this.fileData)
+        }
+        if (this.hetongData.length != 0) {
+          this.heForm.appendicesContract = JSON.stringify(this.hetongData)
+        }
         this.heForm.createDate = this.currentTime()
         hetongadd(this.heForm).then(res => {
           this.formInl.contractId = res.data.id
@@ -964,36 +860,38 @@
       },
       //删除记录按钮
       handleDelete(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') {
-                           contractDel({id:val.id}).then(res=>{
-                             this.getTable(this.chengeTatle)
-                              this.getAll()
-                             done();
-                           })
-                         } else {
-                           done();
-                         }
-           }
-           })
+        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') {
+              contractDel({
+                id: val.id
+              }).then(res => {
+                this.getTable(this.chengeTatle)
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
+        })
 
       },
       //详情
-      details(val){
+      details(val) {
         this.secondData = val
         this.hetongList = val.cereContractInformation
-          this.detbox = true
+        this.detbox = true
 
       },
       handleSizeChange(val) {
@@ -1002,103 +900,103 @@
       handleCurrentChange(val) {
         this.currentPage = val
       },
-     async addbuss(val) {
-       const listGGW = {
-         pageNumber: 1,
-         pageSize: 10,
-       }
-       if(this.leixing == '1'){
-         listGGW.advertisingType = '线上广告位'
-       const res =  await map1(listGGW)
-       this.ziyuanData = res.data.content
-       }else{
-         listGGW.advertisingType = '实体广告位'
-         const res =  await map1(listGGW)
-         this.ziyuanData = res.data.content
-       }
-      this.hetongData =[]
+      async addbuss(val) {
+        const listGGW = {
+          pageNumber: 1,
+          pageSize: 10,
+        }
+        if (this.leixing == '1') {
+          listGGW.advertisingType = '线上广告位'
+          const res = await map1(listGGW)
+          this.ziyuanData = res.data.content
+        } else {
+          listGGW.advertisingType = '实体广告位'
+          const res = await map1(listGGW)
+          this.ziyuanData = res.data.content
+        }
+        this.hetongData = []
         this.ggXin = true
       },
       closeFn(val) {
-       if(val == 1){
+        if (val == 1) {
           this.ggXin = false
-       }else if(val ==2){
-         this.detbox = false
+        } else if (val == 2) {
+          this.detbox = false
 
-       }else{
-         this.hetongBox = false
-       }
+        } else {
+          this.hetongBox = false
+        }
       },
       //查看合同
-     async lookHetong(val){
-       this.hetongData =[]
-         let obj ={
-           contractNumber:val.contractNumber,
-           pageNumber: 1,
-           pageSize: 10,
-         }
-     const res =  await hetongById(obj)
-     this.secondData  = val
-     const contentLength = res.data.content.length
-     // 检查数组是否为空
-     if (contentLength > 0) {
-       // 获取最后一个元素并赋值给 this.hetong
-       this.hetong = res.data.content[contentLength - 1]
-     }
-       this.hetongBox = true
+      async lookHetong(val) {
+        this.hetongData = []
+        let obj = {
+          contractNumber: val.contractNumber,
+          pageNumber: 1,
+          pageSize: 10,
+        }
+        const res = await hetongById(obj)
+        this.secondData = val
+        const contentLength = res.data.content.length
+        // 检查数组是否为空
+        if (contentLength > 0) {
+          // 获取最后一个元素并赋值给 this.hetong
+          this.hetong = res.data.content[contentLength - 1]
+        }
+        this.hetongBox = true
       },
       //编辑合同
-     async EditHetong(val){
-       this.hetong.updateDate  = ''
-       await hetongEdit(this.hetong)
-       this.hetongBox = false
-      this.getTable(this.chengeTatle)
+      async EditHetong(val) {
+        this.hetong.updateDate = ''
+        await hetongEdit(this.hetong)
+        this.hetongBox = false
+        this.getTable(this.chengeTatle)
       },
       // 查询按钮
       onSubmit() {
 
-          if(this.leixing == 1){
-            this.formSel.online = '线上广告位'
-            this.pageindex.scopeDeployment= '线上广告位'
-          }else{
-             this.formSel.online = '实体广告位'
-             this.pageindex.scopeDeployment= '实体广告位'
+        if (this.leixing == 1) {
+          this.formSel.online = '线上广告位'
+          this.pageindex.scopeDeployment = '线上广告位'
+        } else {
+          this.formSel.online = '实体广告位'
+          this.pageindex.scopeDeployment = '实体广告位'
+        }
+        contractGetAll(this.formSel).then(res => {
+          if (this.pageindex.scopeDeployment == '线上广告位') {
+            this.xsNum = res.data.content.length
+          } else {
+            this.stNum = res.data.content.length
           }
-          contractGetAll(this.formSel).then(res=>{
-            if(this.pageindex.scopeDeployment == '线上广告位'){
-              this.xsNum = res.data.content.length
-            }else{
-              this.stNum = res.data.content.length
-            }
-            this.tableData = res.data.content
-            this.total = res.data.content.length
-          })
-          // const res = await contractGetAll(this.pageindex)
+          this.tableData = res.data.content
+          this.total = res.data.content.length
+        })
+        // const res = await contractGetAll(this.pageindex)
 
         // let res  =  await queryById(cha)
         // this.tableData = res.data
 
       },
       //重置按钮
-      resetting(){
-        this.formSel={
-        tenant:'',
-        marketTime:'',
-        auditStatus:'',
-         pageNumber: 1,
-         pageSize: 10,
+      resetting() {
+        this.formSel = {
+          tenant: '',
+          marketTime: '',
+          auditStatus: '',
+          pageNumber: 1,
+          pageSize: 10,
         }
-       if(this.leixing == 1){
+        if (this.leixing == 1) {
 
-         this.pageindex.scopeDeployment= '线上广告位'
-       }else{
+          this.pageindex.scopeDeployment = '线上广告位'
+        } else {
 
-          this.pageindex.scopeDeployment= '实体广告位'
-       }
+          this.pageindex.scopeDeployment = '实体广告位'
+        }
         this.getAll(this.pageindex)
         // this.getTable(this.chengeTatle)
       },
-      gengGai(item){
+      gengGai(item) {
         this.secondData = item
         this.steatShow = true
       },
@@ -1106,17 +1004,17 @@
         this.AddziyuanData = []
         this.AddziyuanData.push(this.multipleSelection)
         this.addziyuan = false
-        this.multipleSelection =[]
+        this.multipleSelection = []
         console.log(this.AddziyuanData)
 
       },
-      mingClose(){
-        this.multipleSelection =[]
+      mingClose() {
+        this.multipleSelection = []
         this.AddziyuanData = []
         this.addziyuan = false
 
       },
-    handleSelectionChange(val) {
+      handleSelectionChange(val) {
         this.multipleSelection = val;
       },
       handleRemove(file, fileList) {
@@ -1125,36 +1023,45 @@
       handleUploadSuccess(response, file, num) {
         console.log(response, file, num)
         const fileMsg = {
-          name:file.name,
-           url: file.response.data.url,
+          name: file.name,
+          url: file.response.data.url,
         }
         // 将文件地址存储在 uploadedFiles 数组中
         this.fileData.push(fileMsg);
       },
-      hetongRemove(){
+      hetongRemove() {
         this.hetongData = []
       },
-      hetongUploadSuccess(response, file, num){
+      hetongUploadSuccess(response, file, num) {
         const fileMsg = {
-          name:file.name,
-           url: file.response.data.url,
+          name: file.name,
+          url: file.response.data.url,
         }
         // 将文件地址存储在 uploadedFiles 数组中
         this.hetongData.push(fileMsg);
       },
-      childFujian(msg){
-          this.fileData = msg
+      childFujian(msg) {
+        this.fileData = msg
       },
-     async toufang(item){
-         await updateList({id:item.id,auditStatus:'4'})
-         this.getAll()
+      async toufang(item) {
+        await updateList({
+          id: item.id,
+          auditStatus: '4'
+        })
+        this.getAll()
       },
-     async xiajia(item){
-        await updateList({id:item.id,auditStatus:'2'})
+      async xiajia(item) {
+        await updateList({
+          id: item.id,
+          auditStatus: '2'
+        })
         this.getAll()
       },
-     async status(){
-        await updateList({id:this.secondData.id,auditStatus:'5'})
+      async status() {
+        await updateList({
+          id: this.secondData.id,
+          auditStatus: '5'
+        })
         this.steatShow = false
         this.getAll()
       }
@@ -1165,27 +1072,30 @@
 <style scoped>
   .zhuti {
     padding: 0 20px 20px 20px;
-      min-height: calc(100vh - 50px - 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;
   }
 
-  
+
 
   .formSearch {
-    margin-top:20px;
-      display: flex;
-      width: 100%;
-      font-size: 14px;
-      justify-content: space-between;
+    margin-top: 20px;
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
 
-}
+  }
 
   .greens {
     color: #3F9B6A;
@@ -1194,11 +1104,11 @@
 
 
   .fenye {
-  margin-top: 20px;
-  display: flex;
-  justify-content: flex-end;
-  position: relative;
-}
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
 
   /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
     background-color: #3F9B6A;
@@ -1242,15 +1152,17 @@
     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;
   }
@@ -1266,116 +1178,135 @@
   }
 
 
- ::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
+  }
+
+  .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;
-}
-
- .hetong{
-   color:#7DBB9A;
-   text-decoration: underline;
-   cursor:pointer;
-}
-.tfneirong {
-  padding: 5px;
-}
-/deep/ .first-column-bg {
+  }
+
+  .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+  .tfneirong {
+    padding: 5px;
+  }
+
+  /deep/ .first-column-bg {
     background-color: #FAFAFA !important;
   }
-.el-table tr{
-  height:56px;
-}
 
-::v-deep .pass_input{
+  .el-table tr {
+    height: 56px;
+  }
+
+  ::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;
+
+  ::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:''
+
   }
 
-}
-::v-deep .table3{
-  .el-table__empty-block{
-    display:none;
+  ::v-deep .table3 {
+    .el-table__empty-block {
+      display: none;
+    }
   }
-}
- .radio-right-side{
+
+  .radio-right-side {
     display: flex;
     justify-content: space-between;
-}
-/deep/ .radio-right-side .el-radio__label {
-  display: flex;
-  align-items: center;
-}
-
-/deep/ .radio-right-side .el-radio__inner {
-  order: 1;
-}
-
-/deep/ .radio-right-side .el-radio__input {
-  display: flex;
-  order: 2;
-}
-/deep/ .radio-right-side{
-   &:hover {
-   color:#000;
+  }
+
+  /deep/ .radio-right-side .el-radio__label {
+    display: flex;
+    align-items: center;
+  }
+
+  /deep/ .radio-right-side .el-radio__inner {
+    order: 1;
+  }
+
+  /deep/ .radio-right-side .el-radio__input {
+    display: flex;
+    order: 2;
+  }
+
+  /deep/ .radio-right-side {
+    &:hover {
+      color: #000;
 
     }
 
     .el-radio__input.is-checked {
 
-     border-color:none;
+      border-color: none;
 
-      }
-.el-radio__input.is-checked .el-radio__inner{
-     background:#3F9B6A;
-     border-color:#3F9B6A;
-}
-      .el-radio__input.is-checked .el-radio__inner {
-       color:#000;
+    }
 
-      }
+    .el-radio__input.is-checked .el-radio__inner {
+      background: #3F9B6A;
+      border-color: #3F9B6A;
+    }
 
-      .el-radio__inner::after {
-          border: 1px solid #3F9B6A !important;
-      }
-}
-/deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background: none;
-}
-/* /deep/ .el-input--mini .el-input__inner{
+    .el-radio__input.is-checked .el-radio__inner {
+      color: #000;
+
+    }
+
+    .el-radio__inner::after {
+      border: 1px solid #3F9B6A !important;
+    }
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background: none;
+  }
+
+  /* /deep/ .el-input--mini .el-input__inner{
   color: #000;
 
 } */
@@ -1398,14 +1329,17 @@
     position: absolute;
     left: 10px;
   }
-::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell{
-  padding:0 0 0 10px;
-}
-::v-deep  .el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
-  padding-bottom: 0px;
-}
-::v-deep .el-descriptions__title{
-  font-weight:100;
-  font-size:14px;
-}
+
+  ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+    padding: 0 0 0 10px;
+  }
+
+  ::v-deep .el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
+    padding-bottom: 0px;
+  }
+
+  ::v-deep .el-descriptions__title {
+    font-weight: 100;
+    font-size: 14px;
+  }
 </style>
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 3567b3f..67c74a6 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -232,7 +232,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
       :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 8a23d17..a7cdbfb 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -141,7 +141,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
       :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
@@ -160,7 +160,8 @@
     import cl from '@/components/change/cl.vue'
     import {
     cereResourceStrategy,
-    editStatus
+    editStatus,
+    cereBusinessOperationadd,
   } from '@/api/newly.js'
   export default {
     data() {
@@ -210,7 +211,7 @@
         for (let index = 0; index < this.multipleSelection.length; index++) {
           ids.push(this.multipleSelection[index].id)
         }
-        console.error(this.oninfo)
+        console.error(ids)
         let c1 = {
           resourcesId: this.oncetype+this.oninfo.id,
           rentalPoliciesIds: ids,
@@ -301,6 +302,15 @@
                 message: tit + '成功',
                 type: 'success'
               })
+              cereBusinessOperationadd({
+                type:tit,
+                resourceId: 'sp'+row.id,
+                operator: localStorage.getItem('roleName'),
+                operationTime: that.gettime()
+              }).then(res => {
+                console.error(res)
+              })
+            
               this.removeonaction('1')
             } else {
               this.$message({
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index e314328..dfc0e9b 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -135,7 +135,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
       :close-on-press-escape="false" :show-close="false">
-      <cl v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index d683c02..82ae863 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -117,11 +117,6 @@
       <div>
         <zl :info="detailsinfo" @removeonaction="removeonaction"></zl>
       </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>
     <div class="zhuti" v-if="onaction == '4'">
       <div style="height:58px;line-height:58px;">
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index 6282b08..6a6d7eb 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -266,7 +266,7 @@ import samXin from "./samXin"
         ggXin: false,
         tableData: [],
         pageindex: {
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10,
            isTemplate: '1'
         },
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index 45dd843..a83757c 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -148,10 +148,6 @@
     QRcode,
     Registration
   } from '../../../api/MarkActivity.js'
-  import {
-    cereReminderSet,
-    cereReminderSetedit
-  } from '../../../api/commodityLease.js'
   import merchantInformation from '../../../components/merchantInformation/index.vue'
   import wangEditor from "@/components/editor/index"
   export default {
diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js
index 2675378..f6d648f 100644
--- a/lvdao-miniapp/main.js
+++ b/lvdao-miniapp/main.js
@@ -12,8 +12,10 @@ Vue.prototype.$http = http
 Vue.prototype.$imgUrl = (url) => {
   return ("https://jy.scjysm.asia:18086/mefile/file/static" + url);
 }
-Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
-Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall"
+// Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
+// Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall"
+Vue.prototype.$upload = 'http://172.16.61.125/miniio/upload'
+Vue.prototype.$img = 'http://172.16.61.125/cdwlMall'
 // Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
 
 // 全局组件
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index b917a52..94194f4 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -443,6 +443,7 @@
 					})
 					
 				} else if (type == 2) {
+					pagesize.pageNumber = 0
 					pagesize.advertisingType = '线上广告位'
 					this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize,1).then(res => {
 						//成功回调
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/main.js b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/main.js
index 9d48be3..e7e4dcd 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/main.js
@@ -31,8 +31,10 @@ _vue.default.prototype.$http = _request.default;
 _vue.default.prototype.$imgUrl = function (url) {
   return "https://jy.scjysm.asia:18086/mefile/file/static" + url;
 };
-_vue.default.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload";
-_vue.default.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall";
+// Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
+// Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall"
+_vue.default.prototype.$upload = 'http://172.16.61.125/miniio/upload';
+_vue.default.prototype.$img = 'http://172.16.61.125/cdwlMall';
 // Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
 
 // 全局组件
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
index 66b64c7..155f829 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -14961,14 +14961,14 @@ var sendRequest = function sendRequest(url) {
   var bases = '';
   if (baseUrl == 1) {
     // bases = 'http://8.130.38.56:8027/admin-server' + url;
-    // bases = 'http://8.130.38.56:9003' + url;
-    bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
+    bases = 'http://172.16.61.125:9003' + url;
+    // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
     // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
   } else {
     // bases = 'http://8.130.38.56:8027/business-server' + url;
     // bases = 'http://172.16.61.48/business-server' + url;
-    // bases = 'http://8.130.38.56:9004' + url;
-    bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
+    bases = 'http://172.16.61.125:9004' + url;
+    // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
     // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
   }
 
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/DialogBox/DialogBox.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/DialogBox/DialogBox.json
index e8cfaaf..4575d1b 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/DialogBox/DialogBox.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/DialogBox/DialogBox.json
@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
\ No newline at end of file
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-body.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-body.json
index 11e6401..19e47d2 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-body.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-body.json
@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "mescroll-empty": "/components/mescroll-uni/components/mescroll-empty",
     "mescroll-top": "/components/mescroll-uni/components/mescroll-top"
-  }
+  },
+  "component": true
 }
\ No newline at end of file
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-uni.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-uni.json
index 11e6401..19e47d2 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-uni.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/components/mescroll-uni/mescroll-uni.json
@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "mescroll-empty": "/components/mescroll-uni/components/mescroll-empty",
     "mescroll-top": "/components/mescroll-uni/components/mescroll-top"
-  }
+  },
+  "component": true
 }
\ No newline at end of file
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.json
index e8cfaaf..4575d1b 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-mask/u-mask.json
@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
\ No newline at end of file
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/pages/home/home.js b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/pages/home/home.js
index f8c3a7e..e42113c 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/pages/home/home.js
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/pages/home/home.js
@@ -343,6 +343,7 @@ var _default = {
           //请求失败
         });
       } else if (type == 2) {
+        pagesize.pageNumber = 0;
         pagesize.advertisingType = '线上广告位';
         this.$http.sendRequest('/cereAdvertisingInformation/likeGet', 'POST', pagesize, 1).then(function (res) {
           //成功回调
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 06bb795..e89b4dc 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -15,16 +15,16 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	var bases = ''
 	if(baseUrl == 1){
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'http://8.130.38.56:9003' + url;
-		bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
+		bases = 'http://172.16.61.125:9003' + url;
+		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
 		
 		
 	}else{
 		// bases = 'http://8.130.38.56:8027/business-server' + url;
 		// bases = 'http://172.16.61.48/business-server' + url;
-		// bases = 'http://8.130.38.56:9004' + url;
-		bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
+		bases = 'http://172.16.61.125:9004' + url;
+		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
 		
 	}
diff --git a/wenjuan/.env.development b/wenjuan/.env.development
index a27297b..ab5a3f3 100644
--- a/wenjuan/.env.development
+++ b/wenjuan/.env.development
@@ -3,6 +3,7 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = '/dev-api'
+<<<<<<< HEAD
 # VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.193:9003'
 # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.193:9007'
 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.48:18086/cdwlMall/admin-server/'
@@ -11,6 +12,14 @@ VUE_APP_BASE_API = '/dev-api'
 # VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/api'
  VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server/'
  VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api'
+=======
+#  VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.120:9003'
+#  VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.120:9007'
+VUE_APP_DOMAIN_PREFIX_1='https://h5.028wlkj.com/cdwlMall/admin-server/'
+VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/api'
+# VUE_APP_DOMAIN_PREFIX_1='http://jy.scjysm.asia:18086/meserver/admin-server/'
+# VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api'
+>>>>>>> b456a5920f2519c1aadcae36245f28ee12eaee4a
 # 开发环境
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = '/api'
diff --git a/yslvdao-miniapp/pages/details/details.vue b/yslvdao-miniapp/pages/details/details.vue
index a05c0f7..e6b7345 100644
--- a/yslvdao-miniapp/pages/details/details.vue
+++ b/yslvdao-miniapp/pages/details/details.vue
@@ -10,8 +10,8 @@
 
 			</view>
 			<view class="info-text">{{tableData.shopDescription}}</view>
-			<view class="info-racord">
-				<view class="info-price" v-for="(item,index) in celueList"><span>{{item.rentalPrice}}</span>元/{{item.leaseTerm}}</view>
+			<view class="info-racord" v-if="celueList.length>0">
+				<view class="info-price" v-for="(item,index) in 1"><span>{{celueList[index].rentalPrice}}</span>元/{{celueList[index].leaseTerm}}</view>
 				<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
 			</view>
 		</view>
@@ -126,7 +126,7 @@ export default {
   onLoad(option){
 	  
 	let data = JSON.parse(option.item)
-	
+	console.error(option)
 	if(option.celue != ''){
 		let celue = JSON.parse(option.celue)
 		this.celueList = celue
diff --git a/yslvdao-miniapp/pages/home/home.scss b/yslvdao-miniapp/pages/home/home.scss
index 8fa03df..2832254 100644
--- a/yslvdao-miniapp/pages/home/home.scss
+++ b/yslvdao-miniapp/pages/home/home.scss
@@ -182,7 +182,7 @@
 	padding: 30rpx 0;
 	margin-top: 20rpx;
 	flex-wrap: wrap;
-	justify-content: center;
+	// justify-content: center;
 	.list{
 		display: flex;
 		flex-direction: column;
diff --git a/yslvdao-miniapp/pages/home/home.vue b/yslvdao-miniapp/pages/home/home.vue
index 7b1a2b4..daeeb6c 100644
--- a/yslvdao-miniapp/pages/home/home.vue
+++ b/yslvdao-miniapp/pages/home/home.vue
@@ -64,7 +64,7 @@
 							<text>租广告</text>
 						</view>
 					</view>
-					<view class="list" @click="wuye">
+<!-- 					<view class="list" @click="wuye">
 						<view class="icon">
 							<image  :src="$imgUrl('/home4.png')"></image>
 						</view>
@@ -79,7 +79,7 @@
 						<view class="title">
 							<text>票务预定</text>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 
diff --git a/yslvdao-miniapp/pages/shops/shops.vue b/yslvdao-miniapp/pages/shops/shops.vue
index dbb8749..949aab1 100644
--- a/yslvdao-miniapp/pages/shops/shops.vue
+++ b/yslvdao-miniapp/pages/shops/shops.vue
@@ -19,7 +19,7 @@
 				<text>默认排序</text>
 				<image :src="$imgUrl('/down.png')"></image>
 			</view> -->
-			<view class="zidong" @click="zidong">
+			<view class="zidong" @click="zidong" v-if="false">
 				自动匹配
 			</view>
 			<u-select v-model="show1" :list="list" @confirm="confirm" mini borderless></u-select>
diff --git a/yslvdao-miniapp/utils/request.js b/yslvdao-miniapp/utils/request.js
index e7f7ea6..f0c717d 100644
--- a/yslvdao-miniapp/utils/request.js
+++ b/yslvdao-miniapp/utils/request.js
@@ -15,16 +15,16 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	var bases = ''
 	console.error(baseUrl)
 	if(baseUrl == 1){
-		bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
+		// bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'http://192.168.8.106:9003' + url;
+		bases = 'http://192.168.2.193:9003' + url;
 		
 		
 	}else{
 		
 		// bases = 'http://8.130.38.56:8027/business-server' + url;
-		// bases = 'http://192.168.8.106:9004' + url;
-		bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
+		bases = 'http://192.168.2.193:9004' + url;
+		// bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
 		
 	}
 	var token = uni.getStorageSync('token') || '';