diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
new file mode 100644
index 0000000..a7864d1
--- /dev/null
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index c96f16a..127345c 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,29 @@
 import request from '@/utils/request'
 import requestnew from '@/utils/request2'
+// 获取续租管理合同
+export function contractRenewalReminder(data) {
+  return request({
+    url: '/cereContractInformation/contractRenewalReminder',
+    method: 'post',
+    data
+  })
+}
+// 获取到期合同
+export function expwarning(data) {
+  return request({
+    url: '/cereContractInformation/expwarning',
+    method: 'post',
+    data
+  })
+}
+// 获取资源的租赁列表
+export function cereContractInformation(data) {
+  return request({
+    url: '/cereContractInformation/leaseRecords',
+    method: 'post',
+    data
+  })
+}
 
 // 上下架
 // 列表
diff --git a/admin-web-master/src/components/add/addmap copy.vue b/admin-web-master/src/components/add/addmap copy.vue
index 8b6ab78..8949278 100644
--- a/admin-web-master/src/components/add/addmap copy.vue
+++ b/admin-web-master/src/components/add/addmap copy.vue
@@ -5,14 +5,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="广告位名称" prop="advertisingName">
-            <el-input v-model="formInline.advertisingName" placeholder="请输入" style="margin-top:5px;"
+            <el-input v-model="formInline.advertisingName" placeholder="请输入" 
               maxlength="50"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
             <el-input v-model="formInline.advertisingSpaceNumber" disabled placeholder="将根据类型自动为资源编号"
-              style="margin-top:5px;"></el-input>
+              ></el-input>
           </el-form-item>
         </el-col>
 
@@ -20,7 +20,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="广告位类型" prop="advertisingType">
-            <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+            <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
               <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
               <!-- <el-option label="实体广告位" value="实体广告位" v-else></el-option> -->
             </el-select>
@@ -28,13 +28,13 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
-            <el-select v-model="formInline.affiliation" placeholder="请选择" style="margin-top:5px;width: 100%;">
+            <el-select v-model="formInline.affiliation" placeholder="请选择" style="width: 100%;">
               <el-option label="游客小程序" value="游客小程序"></el-option>
               <el-option label="商家客户端" value="商家客户端"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
-            <el-input v-model="formInline.detailedLocation" placeholder="请输入" style="margin-top:5px;"
+            <el-input v-model="formInline.detailedLocation" placeholder="请输入" 
               maxlength="200"></el-input>
             <!-- </el-select> -->
           </el-form-item>
@@ -53,7 +53,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
-            <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="margin-top:5px;width: 100%;">
+            <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
               <el-option label="1" value="1"></el-option>
               <el-option label="2" value="2"></el-option>
             </el-select>
@@ -62,7 +62,7 @@
         <el-col :span="12">
           <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
             <el-input v-model="formInline.dimensions" disabled placeholder="宽:300px 长:400px"
-              style="margin-top:5px;"></el-input>
+              ></el-input>
 
           </el-form-item>
         </el-col>
@@ -74,13 +74,13 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
-            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
+            <el-input v-model="formInline.size" disabled placeholder="100kb" ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
             <el-input v-model="formInline.uploadFormat" disabled placeholder="JPG、PNG、MP4"
-              style="margin-top:5px;"></el-input>
+              ></el-input>
           </el-form-item>
         </el-col>
 
@@ -88,11 +88,11 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="可上传大小" prop="size" v-if="ontype =='实体广告位'">
-            <el-input v-model="formInline.size" disabled placeholder="100kb" style="margin-top:5px;"></el-input>
+            <el-input v-model="formInline.size" disabled placeholder="100kb" ></el-input>
           </el-form-item>
           <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
             <div style="display: flex;justify-content: space-between;">
-              <el-select v-model="formInline.deviceType" placeholder="请选择" style="margin-top:5px;width: 92%;">
+              <el-select v-model="formInline.deviceType" placeholder="请选择" style="width: 92%;">
                 <el-option label="灯箱广告牌" value="灯箱广告牌"></el-option>
 
               </el-select>
@@ -105,7 +105,7 @@
               <div>
                 <span style="font-size: 14px;">长：</span>
                 <el-select v-model="formInline.equipmentSizeH" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  style="width: 90px;margin: 0 5px 0 0;">
                   <el-option label="10" value="10"></el-option>
                   <el-option label="20" value="20"></el-option>
                 </el-select>
@@ -114,7 +114,7 @@
               <div>
                 <span style="font-size: 14px;">宽：</span>
                 <el-select v-model="formInline.equipmentSizeK" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  style="width: 90px;margin: 0 5px 0 0;">
                   <el-option label="10" value="10"></el-option>
                   <el-option label="20" value="20"></el-option>
                 </el-select>
@@ -123,7 +123,7 @@
               <div>
                 <span style="font-size: 14px;">高：</span>
                 <el-select v-model="formInline.equipmentSizeG" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  style="width: 90px;margin: 0 5px 0 0;">
                   <el-option label="10" value="10"></el-option>
                   <el-option label="20" value="20"></el-option>
                 </el-select>
@@ -142,7 +142,7 @@
               <div>
                 <span style="font-size: 14px;">长：</span>
                 <el-select v-model="formInline.dimensionsH" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  style="width: 90px;margin: 0 5px 0 0;">
                   <el-option label="10" value="10"></el-option>
                   <el-option label="20" value="20"></el-option>
                 </el-select>
@@ -151,7 +151,7 @@
               <div>
                 <span style="font-size: 14px;">宽：</span>
                 <el-select v-model="formInline.dimensionsK" placeholder="请选择"
-                  style="margin-top:5px;width: 90px;margin: 0 5px 0 0;">
+                  style="width: 90px;margin: 0 5px 0 0;">
                   <el-option label="10" value="10"></el-option>
                   <el-option label="20" value="20"></el-option>
                 </el-select>
@@ -164,7 +164,7 @@
         <el-col :span="12">
           <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
             <div style="display: flex;justify-content: space-between;">
-              <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="margin-top:5px;width: 92%">
+              <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 92%">
                 <el-option label="亚克力" value="亚克力"></el-option>
                 <el-option label="玻璃" value="玻璃"></el-option>
               </el-select>
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 51252ab..56fed02 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -3,7 +3,7 @@
     <el-form v-if="ontype =='线上广告位'" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
-        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
           <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
         </el-select>
       </el-form-item>
@@ -58,7 +58,7 @@
     <el-form v-if="ontype =='实体广告位'" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
-        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="margin-top:5px;width: 100%;">
+        <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
           <el-option v-for="(item, index) in typelist" :key="index" :label="item.name" :value="item.vaule"></el-option>
         </el-select>
       </el-form-item>
@@ -90,12 +90,13 @@
         <el-input v-model="formInline.dimensions" placeholder="宽:300px 长:400px"  maxlength="20"></el-input>
       </el-form-item>
       <el-form-item label="广告材质" prop="advertisingMaterial">
-        <div style="display: flex;justify-content: space-between;">
+        <el-input v-model="formInline.advertisingMaterial" placeholder="请输入"  maxlength="50"></el-input>
+        <!-- <div style="display: flex;justify-content: space-between;">
           <el-select v-model="formInline.advertisingMaterial" placeholder="请选择" style="width: 100%">
             <el-option label="亚克力" value="亚克力"></el-option>
             <el-option label="玻璃" value="玻璃"></el-option>
           </el-select>
-        </div>
+        </div> -->
       </el-form-item>
       <el-form-item label="位置示意图" prop="locationDiagram">
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
@@ -242,7 +243,7 @@
           }],
           advertisingMaterial: [{
             required: true,
-            message: '请选择广告材质',
+            message: '请输入广告材质',
             trigger: ['change']
           }],
           locationDiagram: [{
@@ -307,7 +308,7 @@
       // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
         const regex = /^\d+(\.\d{1,2})?$/;
         if (!regex.test(value)) {
-          this.ruleForm[field] = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
+          this.formInline[field] = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
         }
       },
       updatecenter(e) {
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index 2371d1e..b4bb55c 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="type == '1'">
+    <div v-show="type == '1'">
       <el-tabs v-model="xiangTab">
         <el-tab-pane label="合同信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
@@ -213,148 +213,8 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-else-if="type == '2'">
-      <el-tabs v-model="xiangTab">
-        <el-tab-pane label="合同信息" name="first">
-          <div style="margin-top: 30px;" class="editcss">
-            <TitleWithCircle title="合同信息" />
-            <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="newinfo" ref="ruleForm" label-width="140px" class="demo-ruleForm">
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="合同类型" prop="contractType">
-                      <div class="duiqi">{{newinfo.contractType}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="合同编号" prop="contractNumber">
-                      <div class="duiqi">{{newinfo.contractNumber}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="标段号" prop="sectionNumber">
-                      <div class="duiqi">{{newinfo.sectionNumber}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="合同名称" prop="contractName">
-                      <div class="duiqi">{{newinfo.contractName}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="合同签订日期" prop="contractSigningDate">
-                      <div class="duiqi">{{newinfo.contractSigningDate}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="押金" prop="earnestMoney">
-                      <div class="duiqi">{{newinfo.earnestMoney}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="起租日期" prop="leaseStartDate">
-                      <div class="duiqi">{{newinfo.leaseStartDate}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="终止日期" prop="contractTerminationDate">
-                      <div class="duiqi">{{newinfo.contractTerminationDate}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="付款周期" prop="paymentCycle">
-                      <div class="duiqi">{{newinfo.paymentCycle}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="租金" prop="contractAmount">
-                      <div class="duiqi">{{newinfo.contractAmount}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="付款日" prop="paymentDay">
-                      <div class="duiqi">{{newinfo.paymentDay}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="承租人银行账号" prop="tenantBankAccount">
-                      <div class="duiqi">{{newinfo.tenantBankAccount}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="出租人名称" prop="tenantName">
-                      <div class="duiqi">{{newinfo.tenantName}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="联系电话" prop="tenantTelephone">
-                      <div class="duiqi">{{newinfo.tenantTelephone}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-form-item label="附件信息" prop="appendicesContract">
-                  <div class="duiqi greens" @click ="newinfo.appendicesContract?openfile(newinfo.appendicesContract):''">{{newinfo.appendicesContract?'查看详情':'暂无文件'}}</div>
-                </el-form-item>
-              </el-form>
-            </div>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="商家信息" name="second">
-          <div style="margin-top: 30px;" class="editcss">
-            <TitleWithCircle title="基础信息" />
-            <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="newshop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="姓名" prop="name">
-                      <div class="duiqi">{{newshop.name}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="手机号" prop="phone">
-                      <div class="duiqi">{{newshop.phone}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="9">
-                    <el-form-item label="证件类型" prop="idCardType">
-                      <div class="duiqi">{{newshop.idCardType}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="9">
-                    <el-form-item label="身份证号码" prop="idCardNumber">
-                      <div class="duiqi">{{newshop.idCardNumber}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+newshop.idCardFrontImage" fit="contain"></el-image>
-                  </div>
-                </el-form-item>
-                <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+newshop.idCardBackImage" fit="contain"></el-image>
-                  </div>
-                </el-form-item>
-              </el-form>
-            </div>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
+    <div v-show="type == '2'">
+      <oneht ref="onhet"></oneht>
     </div>
     <div>
       <el-button class="buttonHover"
@@ -365,6 +225,7 @@
 </template>
 
 <script>
+  import oneht from "@/components/chakan/oneht";
   import {
     queryByContractcontractNumber
   } from '../../api/commodityLease.js'
@@ -377,6 +238,7 @@
   } from '../../api/newly.js'
   export default {
     components: {
+      oneht,
       TitleWithCircle
     },
     props: {
@@ -427,7 +289,7 @@
     methods: {
       openfile(e) {
         if (e) {
-          const fullUrl = this.url + e;
+          const fullUrl = this.$baseURL + e;
           try {
             window.open(fullUrl, '_blank'); // 在新标签页中打开文件
           } catch (error) {
@@ -448,15 +310,7 @@
       open(row) {
         console.error(row)
         this.type = '2'
-        this.newinfo = row
-        // businessListGetById ({shopId:row.relatedMerchants}).then(res => {
-        //   console.log(res)
-        //   this.newshop = res.data
-        // })
-        cerePlatformMerchantinfo({id:row.relatedMerchants}).then(res => {
-          console.error(res)
-          this.newshop = res.data
-        })
+        this.$refs.onhet.open(row)
       },
       closeFn() {
         this.$emit('change', false);
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index ba20be5..e7d3ce4 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div v-show="type == '1'">
       <el-tabs v-model="xiangTab">
         <el-tab-pane label="资源信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
@@ -82,6 +82,26 @@
                 </el-form-item>
               </el-form>
             </div>
+            <TitleWithCircle title="历史发布/下架记录" />
+            <div style="padding: 20px;">
+              <el-table :data="datalistxsj"
+              :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+              tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="类型" prop="type" >
+                </el-table-column>
+                <el-table-column label="操作时间" prop="operationTime" >
+                </el-table-column>
+                <el-table-column label="操作人" prop="operator">
+                </el-table-column>
+              </el-table>
+              <div style="display: flex;justify-content: space-between;" class="bom">
+                <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
+                <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
+                  background small layout="prev, pager, next" :total="totalsxj" @size-change="handleCurrentChange"
+                  @current-change="handleCurrentChange">
+                </el-pagination>
+              </div>
+            </div>
           </div>
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
@@ -127,9 +147,92 @@
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="租赁记录" name="third" >
+          <div style="margin-top: 30px;" class="editcss">
+            <div class="titles">
+              租赁记录
+            </div>
+            <div style="padding: 20px;">
+              <el-table :data="datalistzl"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="承租商家"  prop="tenantName"  show-overflow-tooltip>
+
+                </el-table-column>
+                <el-table-column label="租赁期限" prop="houseNumber"  show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
+                </el-table-column> -->
+
+                <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if='scope.row.dataStatus == 1'>使用中</span>
+                    <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
+                    <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
+                    <span v-else>-</span>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="操作" fixed="right">
+                  <template slot-scope="scope">
+                    <div @click="open(scope.row)" class="tableBtn greens">查看</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div style="display: flex;justify-content: space-between;" class="bom">
+                <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
+                <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
+                  background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
+                  @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
+                </el-pagination>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
+    <div v-show="type == '2'">
+      <oneht ref="onhet"></oneht>
+    </div>
+    <div v-if="editbgid.publishStatus == '1' && issp == '2'">
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <el-radio v-model="radio" label="2">通过</el-radio>
+            <el-radio v-model="radio" label="3">不通过</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div v-if="editbgid.publishStatus == '2' || editbgid.publishStatus == '3'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
     <div>
+      <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
+      style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
         @click="changetype">返回</el-button>
@@ -142,9 +245,14 @@
   import TitleWithCircle from '@/components/top/index';
   import {
     cereResourceStrategylist,
-    cereBusinessPlan
+    cereBusinessPlan,
+    cereBusinessOperationqueryByPage,
+    cereContractInformation
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
+  import {
+    changedit
+  } from '@/api/information'
   export default {
     components: {
       TitleWithCircle,
@@ -162,9 +270,32 @@
           return {};
         },
       },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
     },
     data() {
       return {
+        type: '1',
+        totalzl:0,
+        pagequeryzl:{
+          pageNumber: 0,
+          pageSize: 10,
+          shopNumber: 'cd' + this.editbgid.id
+        },
+        datalistzl:[],
+        reviewComments:'',
+        radio: '2',
+        datalistxsj:[],
+        totalsxj:0,
+        pagequerysxj:{
+          pageNumber: 0,
+          pageSize: 10,
+          resourceId: 'cd' + this.editbgid.id
+        },
         xiangTab: 'first',
         list: [],
         parentMessage: {},
@@ -187,7 +318,8 @@
           console.error(res)
           this.datalist1 = res.data
         })
-
+        this.getAllxsj()
+        this.getAllzl()
       }
       
     },
@@ -195,6 +327,80 @@
 
     },
     methods: {
+      open(row) {
+        console.error(row)
+        this.xiangTab= 'first'
+        this.type = '2'
+        this.$refs.onhet.open(row)
+      },
+      minSev() {
+        console.error({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.reviewComments
+        })
+        // return
+        changedit({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.reviewComments?this.reviewComments:null
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.editbgid.publishStatus = this.radio
+            this.$emit('removeonaction', '1')
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      handleCurrentChange(val,type) {
+        this[type].pageNumber = val - 1
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllsxj()
+        }
+       
+      },
+      handleSizeChange(val,type) {
+        this[type].pageSize = val
+        this[type].pageNumber = 0
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllsxj()
+        }
+      },
+      getAllxsj() {
+        cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistxsj = [];
+            return;
+          }
+          this.datalistxsj = res.data.content
+          this.totalsxj = res.data.totalElements
+        })
+      },
+      getAllzl() {
+        cereContractInformation(this.pagequeryzl).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistzl = [];
+            return;
+          }
+          this.datalistzl = res.data.content
+          this.totalzl = res.data.totalElements
+        })
+      },
       openfile(e) {
         if (e) {
           const fullUrl = e;
@@ -208,8 +414,12 @@
         }
       },
       changetype() {
-        this.xiangTab = 'first'
-        this.$emit('removeonaction', '1')
+        this.xiangTab= 'first'
+        if(this.type == '1'){
+          this.$emit('removeonaction', '1')
+        }else{
+          this.type = '1'
+        }
       },
     }
   }
diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
new file mode 100644
index 0000000..66b4338
--- /dev/null
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -0,0 +1,384 @@
+<template>
+  <div>
+    <div>
+      <el-tabs v-model="xiangTab">
+        <el-tab-pane label="申请内容" name="first">
+          <div style="margin-top: 30px;" class="editcss">
+            <TitleWithCircle title="申请信息" />
+            <div style="padding: 20px;margin-top: 10px;">
+              <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                <el-form-item label="Banner图" prop="coverImage">
+                  <el-image  style="width: 200px;margin-right: 10px;"  v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image>
+                </el-form-item>
+                <el-form-item label="投放内容" prop="adTitle">
+                  <div class="duiqi">{{info.adTitle}}</div>
+                </el-form-item>
+              </el-form>
+            </div>
+            <TitleWithCircle title="营业执照信息" />
+            <div style="padding: 20px;margin-top: 10px;">
+              <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="主体名称" prop="entityName">
+                      <div class="duiqi">{{info.entityName}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
+                      <div class="duiqi">{{info.unifiedSocialCreditCode}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="类型" prop="entityType">
+                      <div class="duiqi">{{info.entityType}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="法定代表人" prop="legalRepresentative">
+                      <div class="duiqi">{{info.legalRepresentative}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="经营范围" prop="businessScope">
+                  <div class="duiqi">{{info.businessScope}}</div>
+                </el-form-item>
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="注册资本" prop="registeredCapital">
+                      <div class="duiqi">{{info.registeredCapital}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="成立日期" prop="establishmentDate">
+                      <div class="duiqi">{{info.establishmentDate}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="住所" prop="residence">
+                  <div class="duiqi">{{info.residence}}</div>
+                </el-form-item>
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="邮箱地址" prop="emailAddress">
+                      <div class="duiqi">{{info.emailAddress}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="营业期限" prop="businessStartDate">
+                      <div class="duiqi">{{info.businessStartDate}} - {{info.businessEndDate}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="营业执照" prop="businessLicense">
+                  <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
+                  <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image>
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="商家信息" name="second">
+          <div style="margin-top: 30px;" class="editcss">
+            <TitleWithCircle title="基础信息" />
+            <div style="padding: 20px;margin-top: 10px;">
+              <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="姓名" prop="operatorName">
+                      <div class="duiqi">{{info.operatorName}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="手机号" prop="phone">
+                      <div class="duiqi">{{info.phone}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col :span="9">
+                    <el-form-item label="证件类型" prop="idCardType">
+                      <div class="duiqi">{{info.idCardType}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="身份证号码" prop="idNumber">
+                      <div class="duiqi">{{info.idNumber}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="身份证照片（正）" prop="idPhotoFront">
+                  <div style="margin-top: 10px;">
+                    <el-image style="width: 200px;" :src="$baseURL+info.idPhotoFront" fit="contain"></el-image>
+                  </div>
+                </el-form-item>
+                <el-form-item label="身份证照片（反）" prop="idPhotoBack">
+                  <div style="margin-top: 10px;">
+                    <el-image style="width: 200px;" :src="$baseURL+info.idPhotoBack" fit="contain"></el-image>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="广告位信息" name="third">
+          <div style="margin-top: 30px;" class="editcss">
+            <TitleWithCircle title="基础信息" />
+            <div style="padding: 20px;" v-if="info.cereAdvertisingInformation.id">
+              <el-form :model="info.cereAdvertisingInformation" ref="ruleForm" label-width="140px"
+                class="demo-ruleForm">
+                <el-row :gutter="20">
+                  <el-col :span="8">
+                    <el-form-item label="广告位名称" prop="advertisingName">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingName || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingSpaceNumber || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告位类型" prop="advertisingType">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingType || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
+                  <el-col :span="8">
+                    <el-form-item label="所属端" prop="affiliation" >
+                      <div class="duiqi">{{info.cereAdvertisingInformation.affiliation || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告位数量" prop="advertisingNumber" >
+                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingNumber || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告尺寸" prop="dimensions">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.dimensions || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="可上传大小" prop="size">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.size || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="播放时长" prop="playDuration">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.playDuration || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="推送地址" prop="pushAddress">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.pushAddress || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
+                  <el-col :span="8">
+                    <el-form-item label="设备类型" prop="deviceType" >
+                      <div class="duiqi">{{info.cereAdvertisingInformation.deviceType || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="设备大小" prop="equipmentSize" >
+                      <div class="duiqi">{{info.cereAdvertisingInformation.equipmentSize || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告尺寸" prop="dimensions">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.dimensions || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="广告材质" prop="advertisingMaterial">
+                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingMaterial || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="详细位置" prop="detailedLocation" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
+                  <div class="duiqi">{{info.cereAdvertisingInformation.detailedLocation || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapPunctuation" v-if="info.cereAdvertisingInformation.advertisingType == '实体广告位'">
+                  <div style="width: 100%;height: 300px;">
+                    <newmap :isx="false" :message="info.cereAdvertisingInformation.mapPunctuation"></newmap>
+                  </div>
+                </el-form-item>
+                <el-form-item label="位置示意图" prop="locationDiagram">
+                  <img  v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                </el-form-item>
+                
+                <el-form-item label="备注信息" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
+                  <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div>
+                </el-form-item>
+              </el-form>
+            </div>
+
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div v-if="info.auditStatus == 1 && issp == '2'" style="border-top: 2px solid #eee;">
+      <div style="padding-left: 130px;margin: 25px 0;">
+        <el-radio v-model="radio" label="2">同意</el-radio>
+        <el-radio v-model="radio" label="3">拒绝</el-radio>
+      </div>
+      <el-form :model="info" label-width="130px" class="demo-ruleForm">
+        <el-form-item label="审核意见">
+          <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
+            type="textarea" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{info.auditComments || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div>
+      <el-button v-if="info.auditStatus == 1 && issp == '2'" @click="minSev"
+        style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+      <el-button class="buttonHover"
+        style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+        @click="changetype">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import newmap from "@/components/newmap/index";
+  import {
+    AdvertiserInfoEdit,
+  } from '@/api/advertisement.js'
+
+  import TitleWithCircle from '@/components/top/index';
+  import MapXian from "@/components/MapContainer/MapXian";
+  export default {
+    components: {
+      TitleWithCircle,
+      MapXian,
+      newmap
+    },
+    props: {
+      info: {
+        type: Object,
+        default: function() {
+          return {}; // 返回一个空数组作为默认值
+        },
+      },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
+    },
+    data() {
+      return {
+        auditComments:'',
+        radio: '2',
+        ontype: '线上广告位',
+        url: '',
+        type: '1',
+        tableData: [],
+        xiangTab: 'first',
+        siteIds: [],
+        list: [],
+        advIds: [],
+        shopIds: [],
+        shop: {},
+        newshop: {},
+        newinfo: {},
+        parentMessage: {}
+      }
+    },
+    created() {
+      console.log(this.info)
+     
+    },
+    computed: {
+
+    },
+    methods: {
+      minSev() {
+        console.error(this.info)
+        console.error(this.radio)
+
+        AdvertiserInfoEdit({
+          id: this.info.id,
+          'auditStatus': this.radio,
+          auditComments: this.auditComments
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.info.auditStatus = this.radio
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      openfile(e) {
+        if (e) {
+          const fullUrl = this.$baseURL + e;
+          try {
+            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+          } catch (error) {
+            console.error('打开文件失败:', error);
+          }
+        } else {
+          console.error('无文件可查看');
+        }
+      },
+      changetype() {
+        this.xiangTab = 'first'
+        if (this.type == '1') {
+          this.$emit('removeonaction', '1')
+        } else {
+          this.type = '1'
+        }
+      },
+      open(row) {
+        console.error(row)
+        this.type = '2'
+        this.newinfo = row
+        businessListGetById({
+          shopId: row.relatedMerchants
+        }).then(res => {
+          console.log(res)
+          this.newshop = res.data
+        })
+      },
+      closeFn() {
+        this.$emit('change', false);
+      },
+    }
+  }
+</script>
+<style>
+  .el-form-item__label {
+    color: #a2a2a2;
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+</style>
diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue
index 91d19cc..bae864e 100644
--- a/admin-web-master/src/components/chakan/map.vue
+++ b/admin-web-master/src/components/chakan/map.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div v-show="type == '1'">
       <el-tabs v-model="xiangTab">
         <el-tab-pane label="资源信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
@@ -109,8 +109,8 @@
                 <div style="display: flex;justify-content: space-between;" class="bom">
                   <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
                   <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
-                    background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"
-                    @current-change="handleCurrentChangesxj">
+                    background small layout="prev, pager, next" :total="totalsxj" @size-change="handleCurrentChange"
+                    @current-change="handleCurrentChange">
                   </el-pagination>
                 </div>
               </div>
@@ -160,9 +160,92 @@
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="租赁记录" name="third" >
+          <div style="margin-top: 30px;" class="editcss">
+            <div class="titles">
+              租赁记录
+            </div>
+            <div style="padding: 20px;">
+              <el-table :data="datalistzl"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="承租商家"  prop="tenantName"  show-overflow-tooltip>
+
+                </el-table-column>
+                <el-table-column label="租赁期限" prop="houseNumber"  show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
+                </el-table-column> -->
+
+                <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if='scope.row.dataStatus == 1'>使用中</span>
+                    <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
+                    <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
+                    <span v-else>-</span>
+                  </template>
+                </el-table-column>
+
+                <el-table-column label="操作" fixed="right">
+                  <template slot-scope="scope">
+                    <div @click="open(scope.row)" class="tableBtn greens">查看</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div style="display: flex;justify-content: space-between;" class="bom">
+                <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
+                <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
+                  background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
+                  @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
+                </el-pagination>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
+    <div v-show="type == '2'">
+      <oneht ref="onhet"></oneht>
+    </div>
+    <div v-if="editbgid.publishStatus == '1' && issp == '2'">
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <el-radio v-model="radio" label="2">通过</el-radio>
+            <el-radio v-model="radio" label="3">不通过</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
     <div>
+      <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
+      style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
         @click="changetype">返回</el-button>
@@ -171,19 +254,25 @@
 </template>
 
 <script>
+  import oneht from "@/components/chakan/oneht";
   import newmap from "@/components/newmap/index";
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
   import {
     cereBusinessOperationqueryByPage,
     cereResourceStrategylist,
-    cereBusinessPlan
+    cereBusinessPlan,
+    cereContractInformation,
   } from '@/api/newly';
+  import {
+    editList
+  } from '@/api/map1.js';
   export default {
     components: {
       TitleWithCircle,
       MapXian,
-      newmap
+      newmap,
+      oneht
     },
     props: {
       leixing: {
@@ -196,15 +285,31 @@
           return {};
         },
       },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
     },
     data() {
       return {
+        type: '1',
+        totalzl:0,
+        pagequeryzl:{
+          pageNumber: 0,
+          pageSize: 10,
+          shopNumber: 'gg' + this.editbgid.id
+        },
+        datalistzl:[],
+        reviewComments:'',
+        radio: '2',
         datalistxsj:[],
         totalsxj:0,
         pagequerysxj:{
           pageNumber: 0,
           pageSize: 10,
-          resourcesId: 'sp' + this.editbgid.id
+          resourceId: 'gg' + this.editbgid.id
         },
         xiangTab: 'first',
         list: [],
@@ -237,6 +342,7 @@
           this.datalist1 = res.data
         })
         this.getAllxsj()
+        this.getAllzl()
       }
 
 
@@ -245,14 +351,57 @@
 
     },
     methods: {
-      handleCurrentChangesxj(val) {
-        this.pagequerysxj.pageNumber = val - 1
-        this.getAllxsj()
+      open(row) {
+        console.error(row)
+        this.xiangTab= 'first'
+        this.type = '2'
+        this.$refs.onhet.open(row)
       },
-      handleSizeChangesxj(val) {
-        this.pagequerysxj.pageSize = val
-        this.pagequerysxj.pageNumber = 0
-        this.getAllxsj()
+      minSev() {
+        console.error({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.reviewComments
+        })
+        // return
+        editList({
+          ...this.editbgid,
+          'publishStatus': this.radio,
+          reviewComments: this.reviewComments?this.reviewComments:null
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.editbgid.publishStatus = this.radio
+            this.$emit('removeonaction', '1')
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      handleCurrentChange(val,type) {
+        this[type].pageNumber = val - 1
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllsxj()
+        }
+       
+      },
+      handleSizeChange(val,type) {
+        this[type].pageSize = val
+        this[type].pageNumber = 0
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllsxj()
+        }
       },
       getAllxsj() {
         cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
@@ -265,9 +414,36 @@
           this.totalsxj = res.data.totalElements
         })
       },
+      getAllzl() {
+        cereContractInformation(this.pagequeryzl).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistzl = [];
+            return;
+          }
+          this.datalistzl = res.data.content
+          this.totalzl = res.data.totalElements
+        })
+      },
+      openfile(e) {
+        if (e) {
+          const fullUrl = e;
+          try {
+            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+          } catch (error) {
+            console.error('打开文件失败:', error);
+          }
+        } else {
+          console.error('无文件可查看');
+        }
+      },
       changetype() {
-        this.xiangTab = 'first'
-        this.$emit('removeonaction', '1')
+        this.xiangTab= 'first'
+        if(this.type == '1'){
+          this.$emit('removeonaction', '1')
+        }else{
+          this.type = '1'
+        }
       },
     }
   }
diff --git a/admin-web-master/src/components/chakan/oneht.vue b/admin-web-master/src/components/chakan/oneht.vue
new file mode 100644
index 0000000..0cf2265
--- /dev/null
+++ b/admin-web-master/src/components/chakan/oneht.vue
@@ -0,0 +1,230 @@
+<template>
+    <div>
+        <el-tabs v-model="xiangTab">
+          <el-tab-pane label="合同信息" name="first">
+            <div style="margin-top: 30px;" class="editcss">
+              <TitleWithCircle title="合同信息" />
+              <div style="padding: 20px;margin-top: 10px;">
+                <el-form :model="newinfo" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="合同类型" prop="contractType">
+                        <div class="duiqi">{{newinfo.contractType}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="合同编号" prop="contractNumber">
+                        <div class="duiqi">{{newinfo.contractNumber}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="标段号" prop="sectionNumber">
+                        <div class="duiqi">{{newinfo.sectionNumber}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="合同名称" prop="contractName">
+                        <div class="duiqi">{{newinfo.contractName}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="合同签订日期" prop="contractSigningDate">
+                        <div class="duiqi">{{newinfo.contractSigningDate}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="押金" prop="earnestMoney">
+                        <div class="duiqi">{{newinfo.earnestMoney}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="起租日期" prop="leaseStartDate">
+                        <div class="duiqi">{{newinfo.leaseStartDate}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="终止日期" prop="contractTerminationDate">
+                        <div class="duiqi">{{newinfo.contractTerminationDate}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="付款周期" prop="paymentCycle">
+                        <div class="duiqi">{{newinfo.paymentCycle}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="租金" prop="contractAmount">
+                        <div class="duiqi">{{newinfo.contractAmount}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="付款日" prop="paymentDay">
+                        <div class="duiqi">{{newinfo.paymentDay}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="承租人银行账号" prop="tenantBankAccount">
+                        <div class="duiqi">{{newinfo.tenantBankAccount}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="出租人名称" prop="tenantName">
+                        <div class="duiqi">{{newinfo.tenantName}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="联系电话" prop="tenantTelephone">
+                        <div class="duiqi">{{newinfo.tenantTelephone}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-form-item label="附件信息" prop="appendicesContract">
+                    <div class="duiqi greens" @click ="newinfo.appendicesContract?openfile(newinfo.appendicesContract):''">{{newinfo.appendicesContract?'查看详情':'暂无文件'}}</div>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="商家信息" name="second">
+            <div style="margin-top: 30px;" class="editcss">
+              <TitleWithCircle title="基础信息" />
+              <div style="padding: 20px;margin-top: 10px;">
+                <el-form :model="newshop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="姓名" prop="name">
+                        <div class="duiqi">{{newshop.name}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="手机号" prop="phone">
+                        <div class="duiqi">{{newshop.phone}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="9">
+                      <el-form-item label="证件类型" prop="idCardType">
+                        <div class="duiqi">{{newshop.idCardType}}</div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9">
+                      <el-form-item label="身份证号码" prop="idCardNumber">
+                        <div class="duiqi">{{newshop.idCardNumber}}</div>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
+                    <div style="margin-top: 10px;">
+                      <el-image style="width: 200px;" :src="$baseURL+newshop.idCardFrontImage" fit="contain"></el-image>
+                    </div>
+                  </el-form-item>
+                  <el-form-item label="身份证照片（反）" prop="idCardBackImage">
+                    <div style="margin-top: 10px;">
+                      <el-image style="width: 200px;" :src="$baseURL+newshop.idCardBackImage" fit="contain"></el-image>
+                    </div>
+                  </el-form-item>
+                </el-form>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+    </div>
+  </template>
+  
+  <script>
+    import TitleWithCircle from '@/components/top/index';
+    import {
+      cerePlatformMerchantinfo
+    } from '@/api/newly.js'
+    export default {
+      components: {
+        TitleWithCircle
+      },
+      props: {
+        info: {
+          type: Object,
+          default: function() {
+            return {}; // 返回一个空数组作为默认值
+          },
+        },
+      },
+      data() {
+        return {
+          url:'',
+          type:'1',
+          tableData: [],
+          xiangTab: 'first',
+          siteIds: [],
+          list: [],
+          advIds: [],
+          shopIds: [],
+          shop: {},
+          newshop:{},
+          newinfo:{}
+        }
+      },
+      created() {
+  
+      },
+      computed: {
+  
+      },
+      methods: {
+        openfile(e) {
+          if (e) {
+            const fullUrl = this.$baseURL + e;
+            try {
+              window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+            } catch (error) {
+              console.error('打开文件失败:', error);
+            }
+          } else {
+            console.error('无文件可查看');
+          }
+        },
+        changetype(){
+          this.xiangTab= 'first'
+          if(this.type == '1'){
+            this.$emit('removeonaction', '1')
+          }else{
+            this.type = '1'
+          }
+        },
+        open(row) {
+          console.error(row)
+          this.type = '2'
+          this.newinfo = row
+          cerePlatformMerchantinfo({id:row.relatedMerchants}).then(res => {
+            console.error(res)
+            this.newshop = res.data
+          })
+        },
+        closeFn() {
+          this.$emit('change', false);
+        },
+      }
+    }
+  </script>
+  <style>
+    .el-form-item__label {
+      color: #a2a2a2;
+    }
+    
+    .greens {
+      color: #3F9B6A;
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index fd4e9e4..c851171 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -575,7 +575,7 @@
       },
       openfile(e) {
         if (e) {
-          const fullUrl = this.url + e;
+          const fullUrl = this.$baseURL + e;
           try {
             window.open(fullUrl, '_blank'); // 在新标签页中打开文件
           } catch (error) {
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 996282c..9acd4fb 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -62,6 +62,7 @@
       return {
         total: 0,
         pageindex: {
+          isTemplate: "1",
           pageNumber: 0,
           pageSize: 5,
           policyName: ''
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
index d25094e..f584265 100644
--- a/admin-web-master/src/components/newmap/map.vue
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -88,11 +88,20 @@ export default {
       // 设置信息窗口的内容
       const content = `
         <div>
-          <p><strong>资源名称:</strong> ${item.name}</p>
-          <p><strong>位置:</strong> ${item.detailedLocation}</p>
+          <p style="padding-top:5px;"><strong>资源名称:</strong> ${item.name}</p>
+          <p style="padding-top:5px;"><strong>位置:</strong> ${item.detailedLocation}</p>
         </div>
       `;
-
+      // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
+      //     <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm">
+      //       <el-form-item label="资源名称" prop="entityName">
+      //         <div class="duiqi">${item.name}</div>
+      //       </el-form-item>
+      //       <el-form-item label="位置" prop="entityName">
+      //         <div class="duiqi">${item.detailedLocation}</div>
+      //       </el-form-item>
+      //     </el-form>
+      //   </div>
       // 设置信息窗口的位置和内容
       this.infoWindow.setPosition(marker.getPosition());
       this.infoWindow.setContent(content);
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index 528f08c..217968b 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
-    <div>
+    <div v-show="type == '1'">
       <el-tabs v-model="xiangTab">
         <el-tab-pane label="资源信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;">
-              <el-form :model="editbgid" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+              <el-form :model="editbgid" ref="ruleForm" label-width="100px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="商铺名称" prop="shopName">
@@ -14,7 +14,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="场地编号" prop="venueNumber">
+                    <el-form-item label="编号" prop="venueNumber">
                       <div class="duiqi">{{editbgid.venueNumber}}</div>
                     </el-form-item>
                   </el-col>
@@ -116,8 +116,8 @@
               <div style="display: flex;justify-content: space-between;" class="bom">
                 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalsxj}}</span> 项数据</div>
                 <el-pagination :current-page="pagequerysxj.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequerysxj.pageSize"
-                  background small layout="prev, pager, next" :total="totalsxj" @size-change="handleSizeChangesxj"
-                  @current-change="handleCurrentChangesxj">
+                  background small layout="prev, pager, next" :total="totalsxj" @size-change="e => handleSizeChange(e,'pagequerysxj')"
+                  @current-change="e=> handleCurrentChange(e,'pagequerysxj')">
                 </el-pagination>
               </div>
             </div>
@@ -164,49 +164,60 @@
                   </template>
                 </el-table-column> -->
               </el-table>
+
             </div>
           </div>
         </el-tab-pane>
-        <!-- <el-tab-pane label="租赁记录" name="third" v-if="edit">
+        <el-tab-pane label="租赁记录" name="third" >
           <div style="margin-top: 30px;" class="editcss">
             <div class="titles">
               租赁记录
             </div>
             <div style="padding: 20px;">
-              <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+              <el-table :data="datalistzl"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                 tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="承租商家" min-width="80">
-
-                </el-table-column>
-                <el-table-column label="租赁期限" prop="houseNumber" min-width="80" show-overflow-tooltip>
+                <el-table-column label="承租商家"  prop="tenantName"  show-overflow-tooltip>
 
                 </el-table-column>
-                <el-table-column label="经营类型" prop="actualUsableArea" min-width="150" show-overflow-tooltip>
+                <el-table-column label="租赁期限" prop="houseNumber"  show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{scope.row.leaseStartDate}}至{{scope.row.contractTerminationDate}}
+                  </template>
                 </el-table-column>
+                <!-- <el-table-column label="经营类型" prop="actualUsableArea"show-overflow-tooltip>
+                </el-table-column> -->
 
-                <el-table-column label="租金/周期" prop="head" min-width="120" show-overflow-tooltip>
-                </el-table-column>
-                <el-table-column label="租赁状态" prop="rentalStatus" min-width="120" show-overflow-tooltip>
+                <el-table-column label="租金/周期" prop="head" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{scope.row.rentalStatus=='0'?'待租':'已租'}}
+                    ￥{{scope.row.contractAmount}}/{{scope.row.paymentCycle}}
                   </template>
                 </el-table-column>
-                <el-table-column label="当前状态" prop="publishStatus" min-width="150" show-overflow-tooltip>
+                <el-table-column label="当前状态" prop="publishStatus" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':'已审核'}}
+                    <span v-if='scope.row.dataStatus == 1'>使用中</span>
+                    <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
+                    <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
+                    <span v-else>-</span>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="操作" min-width="160" fixed="right">
+                <el-table-column label="操作" fixed="right">
                   <template slot-scope="scope">
-                    <div @click="handleEditForm(scope.row)" class="tableBtn greens">查看</div>
+                    <div @click="open(scope.row)" class="tableBtn greens">查看</div>
                   </template>
                 </el-table-column>
               </el-table>
+              <div style="display: flex;justify-content: space-between;" class="bom">
+                <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{totalzl}}</span> 项数据</div>
+                <el-pagination :current-page="pagequeryzl.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="pagequeryzl.pageSize"
+                  background small layout="prev, pager, next" :total="totalzl" @size-change="e => handleSizeChange(e,'pagequeryzl')"
+                  @current-change="e=> handleCurrentChange(e,'pagequeryzl')">
+                </el-pagination>
+              </div>
             </div>
           </div>
-        </el-tab-pane> -->
+        </el-tab-pane>
         <!--   <el-tab-pane label="人流情况" name="fourth" v-if="edit">
             <div style="margin-top: 30px;" class="editcss">
               <div class="titles">
@@ -223,20 +234,39 @@
           </el-tab-pane> -->
       </el-tabs>
     </div>
-    <div v-if="editbgid.publishStatus == '3' && issp == '2'" style="border-top: 2px solid #eee;padding-top: 25px;">
-      <el-form :model="editbgid" label-width="80px" class="demo-ruleForm">
-        <el-form-item label="状态">
-          <el-radio v-model="radio" label="1">同意</el-radio>
-        <el-radio v-model="radio" label="4">拒绝</el-radio>
-        </el-form-item>
-        <el-form-item label="审核意见">
-          <el-input maxlength="200" show-word-limit rows="4" v-model="editbgid.reviewComments" placeholder="请输入审核意见"
-            type="textarea" />
-        </el-form-item>
-      </el-form>
+    <div v-show="type == '2'">
+      <oneht ref="onhet"></oneht>
+    </div>
+    <div v-if="editbgid.publishStatus == '1' && issp == '2'">
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <el-radio v-model="radio" label="2">通过</el-radio>
+            <el-radio v-model="radio" label="3">不通过</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="reviewComments" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div v-if="(editbgid.publishStatus == '2' || editbgid.publishStatus == '3') && xiangTab == 'first'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <div class="duiqi">{{editbgid.publishStatus=='2'?'已发布':editbgid.publishStatus=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{editbgid.reviewComments || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
     </div>
     <div>
-      <el-button v-if="editbgid.publishStatus == '3' && issp == '2'" @click="minSev"
+      <el-button v-if="editbgid.publishStatus == '1' && issp == '2'" @click="minSev"
       style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -246,12 +276,14 @@
 </template>
 
 <script>
+  import oneht from "@/components/chakan/oneht";
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
   import {
     cereResourceStrategylist,
     cereBusinessPlan,
-    cereBusinessOperationqueryByPage
+    cereBusinessOperationqueryByPage,
+    cereContractInformation,
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
   import {
@@ -261,7 +293,8 @@
     components: {
       TitleWithCircle,
       MapXian,
-      newmap
+      newmap,
+      oneht
     },
     props: {
       editbgid: {
@@ -279,12 +312,21 @@
     },
     data() {
       return {
-        radio: '1',
+        type: '1',
+        totalzl:0,
+        pagequeryzl:{
+          pageNumber: 0,
+          pageSize: 10,
+          shopNumber: 'sp' + this.editbgid.id
+        },
+        datalistzl:[],
+        reviewComments:'',
+        radio: '2',
         totalsxj:0,
         pagequerysxj:{
           pageNumber: 0,
           pageSize: 10,
-          resourcesId: 'sp' + this.editbgid.id
+          resourceId: 'sp' + this.editbgid.id
         },
         xiangTab: 'first',
         list: [],
@@ -320,24 +362,30 @@
           this.datalist1 = res.data
         })
         this.getAllxsj()
-        
+        this.getAllzl()
       }
     },
     computed: {
 
     },
     methods: {
+      open(row) {
+        console.error(row)
+        this.xiangTab= 'first'
+        this.type = '2'
+        this.$refs.onhet.open(row)
+      },
       minSev() {
         console.error({
           ...this.editbgid,
           'publishStatus': this.radio,
-          reviewComments: this.editbgid.reviewComments
+          reviewComments: this.reviewComments
         })
         // return
         editList({
           ...this.editbgid,
           'publishStatus': this.radio,
-          reviewComments: this.editbgid.reviewComments
+          reviewComments: this.reviewComments?this.reviewComments:null
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
@@ -345,7 +393,8 @@
               message: '处理成功',
               type: 'success'
             })
-            this.info.publishStatus = this.radio
+            this.editbgid.publishStatus = this.radio
+            this.$emit('removeonaction', '1')
           } else {
             this.$message({
               message: '处理失败',
@@ -354,15 +403,23 @@
           }
         })
       },
-      
-      handleCurrentChangesxj(val) {
-        this.pagequerysxj.pageNumber = val - 1
-        this.getAllxsj()
+      handleCurrentChange(val,type) {
+        this[type].pageNumber = val - 1
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllxsj()
+        }
+       
       },
-      handleSizeChangesxj(val) {
-        this.pagequerysxj.pageSize = val
-        this.pagequerysxj.pageNumber = 0
-        this.getAllxsj()
+      handleSizeChange(val,type) {
+        this[type].pageSize = val
+        this[type].pageNumber = 0
+        if(type == 'pagequeryzl') {
+          this.getAllzl()
+        } else if(type == 'pagequerysxj') {
+          this.getAllxsj()
+        }
       },
       getAllxsj() {
         cereBusinessOperationqueryByPage(this.pagequerysxj).then(res => {
@@ -375,6 +432,17 @@
           this.totalsxj = res.data.totalElements
         })
       },
+      getAllzl() {
+        cereContractInformation(this.pagequeryzl).then(res => {
+          console.error(res)
+          if (!Array.isArray(res.data.content)) {
+            this.datalistzl = [];
+            return;
+          }
+          this.datalistzl = res.data.content
+          this.totalzl = res.data.totalElements
+        })
+      },
       openfile(e) {
         if (e) {
           const fullUrl = e;
@@ -388,8 +456,12 @@
         }
       },
       changetype() {
-        this.xiangTab = 'first'
-        this.$emit('removeonaction', '1')
+        this.xiangTab= 'first'
+        if(this.type == '1'){
+          this.$emit('removeonaction', '1')
+        }else{
+          this.type = '1'
+        }
       },
     }
   }
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 75e8128..11c1d81 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -255,12 +255,12 @@ export default {
       }
     }
     return {
-      // msg:['招商服务系统'],
-      msg:['招商服务系统','推广策划系统','在线商城系统','支付服务模块','票务'],
+      msg:['招商服务系统'],
+      // msg:['招商服务系统','推广策划系统','在线商城系统','支付服务模块','票务'],
       listMune:[],
       list:[
       // ['招商资源监测','招商租赁管理','系统设置']
-      // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'],
+      ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','轮播图设置'],
 
         ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
         ['品牌策划','活动策划','氛围策划','媒体推广'],
@@ -540,7 +540,8 @@ this.listMune[0] = All
     gzt(){
       // window.location.href = 'https://admin-uat.028wlkj.com:1020/'
       // window.location.href = 'https://admin.028wlkj.com:1020/application-manage'
-      window.location.href = 'https://admin-uat.028wlkj.com:1020'
+      // window.location.href = 'https://admin-uat.028wlkj.com:1020'
+      window.location.href = 'https://admin.028wlkj.com:1020'
     },
     findMatchingNames(List,msg){
        return List.filter((item) => msg.includes(item.name))
@@ -641,8 +642,8 @@ this.listMune[0] = All
             this.listMune = []
             this.list=[
             // ['招商资源监测','招商租赁管理','系统设置']
-            // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','商户意向管理'],
-          ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
+            ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','系统设置','广告服务','轮播图设置'],
+          // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
               ['品牌策划','活动策划','氛围策划','媒体推广'],
               ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'],
               ['联机交易','对账处理','日志管理','商户服务'],
diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js
index c2804f2..c8f70a3 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -39,7 +39,7 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
 
 let host = window.location.host;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) {
-  Vue.prototype.$baseURL ='https://zhld.028wlkj.com:49008/cdwlMall'
+  Vue.prototype.$baseURL ='http://172.16.61.125/cdwlMall'
 } else {
   Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
 }
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 4c83187..5894530 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -15,8 +15,8 @@ let hostall = window.location.href;
 // const baseURL = 'http://192.168.2.38:9003';
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'http://192.168.2.225:9003';
+  baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
+  // baseURL = 'http://192.168.2.225:9003';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 5dd84ec..8cf5245 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -15,14 +15,24 @@ let hostall = window.location.href;
 // const baseURL = 'http://192.168.2.38:9003';
 let baseURL =  ''
 // || host === 'localhost:9528'
-if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
-  // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
-  baseURL = 'http://172.16.61.125:9004';
+// if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
+//   // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
+//   baseURL = 'http://192.168.2.36:9003';
+// } else {
+//   console.error('---------------------')
+//   console.error(hostall)
+//   let c1 = hostall.split('cdwlMall')[0];
+//   baseURL = c1 + 'cdwlMall/business-server';
+//   console.error(baseURL)
+// }
+if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
+  baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
+  // baseURL = 'http://192.168.2.225:9003';
 } else {
   console.error('---------------------')
   console.error(hostall)
   let c1 = hostall.split('cdwlMall')[0];
-  baseURL = c1 + 'cdwlMall/business-server';
+  baseURL = c1 + 'cdwlMall/admin-server';
   console.error(baseURL)
 }
 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
diff --git a/admin-web-master/src/views/aaa/index copy.vue b/admin-web-master/src/views/aaa/index copy.vue
new file mode 100644
index 0000000..04eb032
--- /dev/null
+++ b/admin-web-master/src/views/aaa/index copy.vue
@@ -0,0 +1,294 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>轮播图设置</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">轮播图管理</span></div>
+      </div>
+      <div>
+        <div style="margin:0 0 20px 0px;">
+          <el-button
+            @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"
+           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+          style="width: 100%"
+        >
+          <el-table-column
+            label="序号"
+            width="auto"
+            min-width="4%"
+            prop="id"
+          >
+          <template slot-scope="scope">
+            {{scope.$index +1 }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="轮播图"
+            prop=""
+            width="auto"
+            min-width="20%"
+          >
+           <template slot-scope="scope">
+             <img :src="scope.row.imageUrl" style="width:100px;height: 42px;"></img>
+             </template>
+          </el-table-column>
+
+<el-table-column
+            label="跳转地址"
+            width="auto"
+            min-width="20%"
+            prop="jumpUrl"
+          />
+
+          <el-table-column
+            label="操作"
+            width="auto"
+            min-width="17%">
+            <template slot-scope="scope">
+              <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination
+            class="pagination"
+            :hide-on-single-page="flag"
+            background
+            small
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]"
+            layout="total,prev, pager,next"
+            :total="total "
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+
+        <!-- 新建商家弹框 -->
+        <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'"  :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="30%" class="dialog_css_Xq"  center :close-on-click-modal="false" :show-close="false"	>
+                    <div >
+                          <div style="margin-bottom: 20px;">
+                          <el-form ref="form" :model="formInline" label-width="80px">
+                      <el-form-item label="轮播图">
+                    <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg>
+                            </el-form-item>
+                            <el-form-item label="跳转地址">
+                                           <el-input v-model="formInline.jumpUrl" placeholder="请输入" size="mini" />
+                                    </el-form-item>
+                          </el-form>
+
+                          </div>
+                          <div style="display: flex;justify-content: flex-end;">
+                            <el-button  @click="closeFn(1)" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+                          <el-button  @click="addCheck(0)" v-if="index!= 2"  style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>
+                            </div>
+                    </div>
+        </el-dialog>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import upimg from "@/components/ImageUpload/index";
+  import {
+    bannerGet,
+    bannerAdd,
+    bannerDel
+  } from '../../api/banner';
+export default {
+  components: {upimg},
+  data () {
+    return {
+      rules: {},
+      currentPage: 1,
+      total: 100,
+      flag: false,
+      pageSize: 10,
+      ggXin: false,
+      index:1,
+      formInline: {
+        imageUrl:'',
+        jumpUrl:''
+      },
+      tableData: [],
+      formRul:{
+       pageNumber: 1,
+       pageSize: 10
+      }
+    }
+  },
+  computed: {},
+  mounted() {
+
+  this.getAll()
+    },
+
+  methods: {
+    addbuss (val,item) {
+      if(val == 1){
+        this.formInline= {
+        imageUrl:'',
+        jumpUrl:''
+      }
+    }
+      this.index = val
+      this.ggXin = true
+    },
+   async getAll(){
+     const  res =  await bannerGet(this.formRul)
+     this.tableData = res.data.content
+     this.total = res.data.content.length
+    },
+    onSubmit(){
+
+    },
+    handleSizeChange(){
+
+    },
+    handleCurrentChange(){
+
+    },
+   async addCheck(){
+      await bannerAdd(this.formInline)
+      this.ggXin = false
+      this.getAll()
+    },
+   async handleDelete(row){
+      await bannerDel({id:row.id})
+      this.getAll()
+    },
+    closeFn () {
+      this.ggXin = false
+      this.index = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.zhuti {
+  padding: 0  20px 20px 20px;
+  background-color: #Fff;
+  min-height: calc(100vh - 50px - 20px);
+}
+
+/deep/ .el-form-item__content {
+  line-height: 0;
+}
+
+
+
+.formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+.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/ .el-form--label-top .el-form-item__label {
+  padding: 0;
+}
+.demo-input-suffix{
+  display: flex;
+  margin-right: 20px;
+}
+.pagination{
+  text-align:right;
+  line-height: 20px;
+}
+/deep/ .el-pagination__total{
+  margin-top:4px;
+}
+
+
+     ::v-deep .el-select .el-input.is-focus .el-input__inner{
+         border-color:#3F9B6A
+     }
+     ::v-deep .dialog_css_Xq{
+       .el-dialog__header{
+         background-color:#fafafa;
+
+       }
+       .el-dialog__title{
+         color:#000
+       }
+     }
+</style>
+<style lang="scss" scoped>
+  ::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;
+  }
+
+</style>
diff --git a/admin-web-master/src/views/aaa/index.vue b/admin-web-master/src/views/aaa/index.vue
index 04eb032..670fb13 100644
--- a/admin-web-master/src/views/aaa/index.vue
+++ b/admin-web-master/src/views/aaa/index.vue
@@ -2,94 +2,72 @@
   <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 style="color:#0006"> <span>轮播图设置</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">轮播图管理</span></div>
       </div>
       <div>
         <div style="margin:0 0 20px 0px;">
-          <el-button
-            @click="addbuss(1)"
-            style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
-          > 新增
+          <el-button @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"
-           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          style="width: 100%"
-        >
-          <el-table-column
-            label="序号"
-            width="auto"
-            min-width="4%"
-            prop="id"
-          >
-          <template slot-scope="scope">
-            {{scope.$index +1 }}
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+          style="width: 100%">
+          <el-table-column label="序号" width="auto" min-width="4%" prop="id">
+            <template slot-scope="scope">
+              {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="轮播图"
-            prop=""
-            width="auto"
-            min-width="20%"
-          >
-           <template slot-scope="scope">
-             <img :src="scope.row.imageUrl" style="width:100px;height: 42px;"></img>
-             </template>
+          <el-table-column label="轮播图" prop="" width="auto" min-width="20%">
+            <template slot-scope="scope">
+              <el-image  style="height: 80px;" :src="$baseURL+scope.row.imageUrl" fit="contain"></el-image>
+            </template>
           </el-table-column>
 
-<el-table-column
-            label="跳转地址"
-            width="auto"
-            min-width="20%"
-            prop="jumpUrl"
-          />
-
-          <el-table-column
-            label="操作"
-            width="auto"
-            min-width="17%">
+          <el-table-column label="跳转地址" width="auto" min-width="20%" prop="jumpUrl" >
+            <template slot-scope="scope">
+              {{ scope.row.jumpUrl || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="auto" min-width="17%">
             <template slot-scope="scope">
               <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
             </template>
           </el-table-column>
         </el-table>
-        <div class="fenye">
-          <el-pagination
-            class="pagination"
-            :hide-on-single-page="flag"
-            background
-            small
-            :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]"
-            layout="total,prev, pager,next"
-            :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="currentPage" :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>
-
         <!-- 新建商家弹框 -->
-        <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'"  :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="30%" class="dialog_css_Xq"  center :close-on-click-modal="false" :show-close="false"	>
-                    <div >
-                          <div style="margin-bottom: 20px;">
-                          <el-form ref="form" :model="formInline" label-width="80px">
-                      <el-form-item label="轮播图">
-                    <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg>
-                            </el-form-item>
-                            <el-form-item label="跳转地址">
-                                           <el-input v-model="formInline.jumpUrl" placeholder="请输入" size="mini" />
-                                    </el-form-item>
-                          </el-form>
-
-                          </div>
-                          <div style="display: flex;justify-content: flex-end;">
-                            <el-button  @click="closeFn(1)" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-                          <el-button  @click="addCheck(0)" v-if="index!= 2"  style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>
-                            </div>
-                    </div>
+        <el-dialog :title="index == 1?'新增':index == 2?'详情':'编辑'" :visible.sync="ggXin" custom-class="diaslog_zhong"
+          style="padding: 0;" width="50%" class="dialog_css_Xq" center :close-on-click-modal="false"
+          :show-close="false">
+          <div style="padding: 30px;">
+            <div style="margin-bottom: 20px;">
+              <el-form ref="form" :model="formInline" label-width="80px">
+                <el-form-item label="轮播图">
+                  <upimg :limit="1" :cmpOption="{disabled:false,isSetCover:false}" filePath="lb" inputtype="imageUrl" :value="formInline.imageUrl" @changimg="e=>changimg(e,'imageUrl')"></upimg>
+                  <!-- <upimg v-model="formInline.imageUrl" :limit="1" :fileSize="1"></upimg> -->
+                </el-form-item>
+                <el-form-item label="跳转地址">
+                  <el-input v-model="formInline.jumpUrl" placeholder="请输入" />
+                </el-form-item>
+              </el-form>
+
+            </div>
+            <div style="display: flex;justify-content: flex-end;">
+              <el-button @click="closeFn(1)" class="buttonHover"
+                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+              <el-button @click="addCheck(0)" v-if="index!= 2"
+                style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">确定</el-button>
+            </div>
+          </div>
         </el-dialog>
       </div>
     </div>
@@ -98,197 +76,157 @@
 </template>
 
 <script>
-import upimg from "@/components/ImageUpload/index";
+  import upimg from "@/components/ImageUpload/index";
   import {
     bannerGet,
     bannerAdd,
     bannerDel
   } from '../../api/banner';
-export default {
-  components: {upimg},
-  data () {
-    return {
-      rules: {},
-      currentPage: 1,
-      total: 100,
-      flag: false,
-      pageSize: 10,
-      ggXin: false,
-      index:1,
-      formInline: {
-        imageUrl:'',
-        jumpUrl:''
-      },
-      tableData: [],
-      formRul:{
-       pageNumber: 1,
-       pageSize: 10
-      }
-    }
-  },
-  computed: {},
-  mounted() {
-
-  this.getAll()
+  export default {
+    components: {
+      upimg
     },
-
-  methods: {
-    addbuss (val,item) {
-      if(val == 1){
-        this.formInline= {
-        imageUrl:'',
-        jumpUrl:''
+    data() {
+      return {
+        rules: {},
+        currentPage: 1,
+        total: 100,
+        flag: false,
+        pageSize: 10,
+        ggXin: false,
+        index: 1,
+        formInline: {
+          imageUrl: '',
+          jumpUrl: ''
+        },
+        tableData: [],
+        formRul: {
+          pageNumber: 1,
+          pageSize: 10
+        }
       }
-    }
-      this.index = val
-      this.ggXin = true
-    },
-   async getAll(){
-     const  res =  await bannerGet(this.formRul)
-     this.tableData = res.data.content
-     this.total = res.data.content.length
     },
-    onSubmit(){
+    computed: {},
+    mounted() {
 
+      this.getAll()
     },
-    handleSizeChange(){
 
-    },
-    handleCurrentChange(){
+    methods: {
+      changimg(e, type) {
+        this.formInline[type] = e
+      },
+      addbuss(val, item) {
+        if (val == 1) {
+          this.formInline = {
+            imageUrl: '',
+            jumpUrl: ''
+          }
+        }
+        this.index = val
+        this.ggXin = true
+      },
+      async getAll() {
+        const res = await bannerGet(this.formRul)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+      },
+      onSubmit() {
 
-    },
-   async addCheck(){
-      await bannerAdd(this.formInline)
-      this.ggXin = false
-      this.getAll()
-    },
-   async handleDelete(row){
-      await bannerDel({id:row.id})
-      this.getAll()
-    },
-    closeFn () {
-      this.ggXin = false
-      this.index = 1
+      },
+      handleSizeChange() {
+
+      },
+      handleCurrentChange() {
+
+      },
+      async addCheck() {
+        await bannerAdd(this.formInline)
+        this.ggXin = false
+        this.getAll()
+      },
+      async handleDelete(row) {
+        let that = this
+        this.$confirm('确定要删除吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          bannerDel({
+            id: row.id
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message:'删除成功',
+                type: 'success'
+              })
+              this.getAll()
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
+      },
+      closeFn() {
+        this.ggXin = false
+        this.index = 1
+      }
     }
   }
-}
 </script>
 
 <style scoped>
-.zhuti {
-  padding: 0  20px 20px 20px;
-  background-color: #Fff;
-  min-height: calc(100vh - 50px - 20px);
-}
-
-/deep/ .el-form-item__content {
-  line-height: 0;
-}
+  .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;
+  }
 
 
-.formSearch {
+  .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-    align-items: center;
   }
 
-.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;
-}
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
 
-/deep/ .el-form--label-top .el-form-item__label {
-  padding: 0;
-}
-.demo-input-suffix{
-  display: flex;
-  margin-right: 20px;
-}
-.pagination{
-  text-align:right;
-  line-height: 20px;
-}
-/deep/ .el-pagination__total{
-  margin-top:4px;
-}
+  .bg-purple {
+    background: #d3dce6;
+  }
 
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
 
-     ::v-deep .el-select .el-input.is-focus .el-input__inner{
-         border-color:#3F9B6A
-     }
-     ::v-deep .dialog_css_Xq{
-       .el-dialog__header{
-         background-color:#fafafa;
 
-       }
-       .el-dialog__title{
-         color:#000
-       }
-     }
 </style>
 <style lang="scss" scoped>
-  ::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 .el-dialog__body {
+    padding: 0 0 !important;
   }
 
+
+  .el-dialog__header{
+    padding: 0;
+    display: none;
+  }
 </style>
diff --git a/admin-web-master/src/views/ads/fangAudit/bianform.vue b/admin-web-master/src/views/ads/fangAudit/bianform.vue
index 0f1f93c..d7cc751 100644
--- a/admin-web-master/src/views/ads/fangAudit/bianform.vue
+++ b/admin-web-master/src/views/ads/fangAudit/bianform.vue
@@ -152,7 +152,7 @@
                               <el-row :gutter="20">
                                 <el-col :span="24">
                                   <el-form-item label="招商资源管理"  class="grid-content bg-purple">
-                                    <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+                                    <div style="border: 1px solid #E5E5E5;" id="huodong">
 
                                               <div style="padding: 15px;">
                                                 <div style="padding: 0px 20px 0px 0px">
@@ -194,21 +194,21 @@
 
                               </el-row>
 
-            <el-row :gutter="20">
+            <!-- <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
                                 <div class="duiqi" style="padding:10px 0;line-height:20px;color:#3F9B6A">{{ruleForm.attachmentInfo.name}}<a style="margin-left:20px;color:#3F9B6A" :href="ruleForm.attachmentInfo.url" target="_blank" v-if="ruleForm.attachmentInfo.name">下载</a></div>
                           </el-form-item>
               </el-col>
 
-            </el-row>
+            </el-row> -->
 
                             </el-form>
                           </div>
                         </div>
     <el-row :gutter="20">
                         <el-col :span="12">
-                            <div style="padding-left:160px;margin-top: 30px;">
+                            <div style="padding-left:160px;margin-top: 70px;">
                           <el-button  @click="close" class="buttonHover"
                               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
                           </el-button>
diff --git a/admin-web-master/src/views/ads/fangli/bianform.vue b/admin-web-master/src/views/ads/fangli/bianform.vue
index cd62f1b..37a31d3 100644
--- a/admin-web-master/src/views/ads/fangli/bianform.vue
+++ b/admin-web-master/src/views/ads/fangli/bianform.vue
@@ -161,9 +161,9 @@
             </el-col>
 
           </el-row>
-          <el-form-item v-if="steat" label="附件信息" prop="attachmentInfo">
+          <!-- <el-form-item v-if="steat" label="附件信息" prop="attachmentInfo">
             <upfile filePath="cd" :value="ruleForm.attachmentInfo" fileSize="50" :fileType="['doc','pdf']" @changimg="e=>changimg(e,'attachmentInfo')"></upfile>
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="附件信息" prop="mainPurpose" class="grid-content bg-purple">
diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index e29d177..8e850aa 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -14,19 +14,17 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery" style="margin-top: 15px;">
-            <el-form-item label="广告位名称" prop="advertisingName">
-              <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input>
+            <el-form-item label="编号" prop="id">
+              <el-input v-model="pagequery.id" placeholder="请输入" style="width: 168px;margin-right: 15px" />
             </el-form-item>
-            <el-form-item label="所属端" prop="affiliation" v-if="leixing">
+            <el-form-item label="所属端" prop="affiliation" v-if="leixing == 1">
               <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="游客小程序" value="游客小程序" />
-                <el-option label="商家客户端" value="商家客户端" />
+                <el-option label="游客小程序" value="游客小程序"></el-option>
+                <el-option label="商家客户端" value="商家客户端"></el-option>
               </el-select>
             </el-form-item>
-            <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 label="申请人" prop="applicant">
+              <el-input v-model="pagequery.applicant" placeholder="请输入" style="width: 168px;margin-right: 15px" />
             </el-form-item>
           </el-form>
 
@@ -53,7 +51,7 @@
               {{scope.row.cereAdvertisingInformation.affiliation}}
             </template>
           </el-table-column>
-          <el-table-column label="轮播顺序"  v-if="leixing == 1">
+          <el-table-column label="轮播顺序"  v-if="leixing == 1" >
             <template slot-scope="scope">
               {{scope.row.cereAdvertisingInformation.rotationOrder}}
             </template>
@@ -63,25 +61,29 @@
           <el-table-column label="申请人" prop="applicant" ></el-table-column>
           <el-table-column label="投放定价" prop="tenant">
             <template slot-scope="scope">
-              {{scope.row.rotationOrde}}
+              {{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" >
+          <el-table-column label="状态" prop="auditStatus" width="80">
             <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'?'已签约':scope.row.auditStatus =='5'?'已终止':scope.row.auditStatus =='6'?'下架':scope.row.auditStatus =='7'?'已投放':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑</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>
+              <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
+              <div v-if="scope.row.auditStatus =='1' "  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
+              <div v-if="scope.row.auditStatus == '2'" @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
+              <div @click="removeinfozz(scope.row,'5','终止')" class="tableBtn greens"
+                v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && leixing">终止
+              </div>
+              <div @click="opencl(scope.row,'5','终止')" class="tableBtn greens"
+                v-if="(scope.row.auditStatus =='2' || scope.row.auditStatus =='4') && !leixing">更改状态
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -104,36 +106,67 @@
 
     <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
+        <div style="color:#0006"> <span>广告审核</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">新增</span></div>
       </div>
 
       <div style="padding: 20px 20px 20px 0;">
-        <add :info="{}" @removeonaction="removeonaction" :leixing="leixing"></add>
+        <add @removeonaction="removeonaction"></add>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>广告位基本信息管理</span> <span style="padding:0 5px;">></span> <span
+        <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 :issp="issp" :info="detailsinfo" @removeonaction="removeonaction">
         </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
+        <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"
+    <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-form :model="oninfo" v-if="oninfo.cereAdvertisingInformation" ref="detailsinfo" label-width="130px" class="demo-ruleForm" style="padding-right: 130px;margin-top: 20px">
+        <el-form-item label="广告位名称" prop="advertisingName">
+          <el-input disabled v-model="oninfo.cereAdvertisingInformation.advertisingName" placeholder="请输入"  maxlength="50"></el-input>
+        </el-form-item>
+        <el-form-item label="编号" prop="advertisingSpaceNumber">
+          <el-input disabled v-model="oninfo.cereAdvertisingInformation.advertisingSpaceNumber" placeholder="请输入"  maxlength="50"></el-input>
+        </el-form-item>
+        <el-form-item label="投放时间" prop="scheduleTime">
+          <el-input disabled v-model="oninfo.scheduleTime" placeholder="请输入"  maxlength="50"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="auditStatus">
+          <el-input disabled :placeholder="oninfo.auditStatus =='1'?'待审核':oninfo.auditStatus =='2'?'待签约':oninfo.auditStatus =='3'?'已驳回':oninfo.auditStatus =='4'?'已签约':oninfo.auditStatus =='5'?'已终止':oninfo.auditStatus =='6'?'下架':oninfo.auditStatus =='7'?'已投放':'-'"  maxlength="50"></el-input>
+        </el-form-item>
+        <el-form-item label="状态更改" prop="auditStatus">
+          <el-select v-model="auditStatus" placeholder="请选择" style="width: 100%;">
+            <el-option label="已投放" value="7"></el-option>
+            <el-option label="已终止" value="5"></el-option>
+            <el-option label="下架" value="6"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item>
+              <div style="margin-top: 20px">
+                <el-button @click="changeauditStatus()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                <el-button @click="addcl = false" class="buttonHover"
+                  style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-dialog>
   </div>
 
@@ -153,9 +186,9 @@
     AdvertiserInfoGetAll,
     AdvertiserInfoEdit,
     AdvertiserInfoDel
-  } from '../../../api/advertisement.js'
-  import add from '../../../components/add/addmap'
-  import resourceCommodity from '../../../components/chakan/map'
+  } from '@/api/advertisement.js'
+  import add from '@/components/add/addht.vue'
+  import resourceCommodity from '@/components/chakan/ggsh'
   import {
     cereResourceStrategy,
     editStatus
@@ -164,6 +197,8 @@
   export default {
     data() {
       return {
+        auditStatus:'',
+        issp:'1',
         oncetype: '',
         addcl: false,
         oninfo: {},
@@ -175,9 +210,12 @@
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10,
-          advertisingSpaceType: '实体广告位'
+          advertisingSpaceType: '线上广告位',
+          id:'',
+          affiliation:'',
+          applicant:'',
         },
         tableData: [],
         total: 0,
@@ -194,6 +232,55 @@
       this.getAll()
     },
     methods: {
+      changeauditStatus() {
+        AdvertiserInfoEdit({
+            id: this.oninfo.id,
+            auditStatus: this.auditStatus
+          }).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'
+              })
+            }
+
+          })
+      },
+      removeinfozz(row, e, tit) {
+        let that = this
+        this.$confirm('确定要' + tit + '吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          AdvertiserInfoEdit({
+            id: row.id,
+            auditStatus: 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'
+              })
+            }
+
+          })
+        })
+      },
       minSev(e) {
         this.multipleSelection = e
         console.error(this.multipleSelection)
@@ -241,12 +328,12 @@
       chenge(val) {
         if (val == 1) {
           this.leixing = true
-          this.pagequery.advertisingType = '线上广告位'
-          this.getAll((this.pagequery))
+          this.pagequery.advertisingSpaceType = '线上广告位'
+          this.getAll()
         } else {
           this.leixing = false
-          this.pagequery.advertisingType = '实体广告位'
-          this.getAll((this.pagequery))
+          this.pagequery.advertisingSpaceType = '实体广告位'
+          this.getAll()
         }
       },
       gettime() {
@@ -286,36 +373,10 @@
         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'
-              })
-            }
-
-          })
-        })
-      },
-      details(row) {
+      details(row,type) {
         this.detailsinfo = row
+        this.issp = type
+        // console.error(this.detailsinfo)
         this.onaction = '3'
       },
       removeinfo(row, e) {
@@ -343,11 +404,12 @@
         this.onaction = '4'
       },
       async getAll() {
+        // console.error({...this.pagequery})
         const res = await AdvertiserInfoGetAll(this.pagequery)
         this.tableData = res.data.content
         this.total = res.data.totalElements
         let obj1 = {
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10,
           advertisingSpaceType: '线上广告位'
         }
@@ -355,7 +417,7 @@
           this.xsNum = res1.data.totalElements
         })
         let obj2 = {
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10,
           advertisingSpaceType: '实体广告位'
         }
@@ -384,9 +446,12 @@
       //重置按钮
       resetting() {
         this.pagequery = {
-            pageNumber: 0,
-            pageSize: 10,
-            advertisingName:''
+              pageNumber: 0,
+              pageSize: 10,
+              advertisingSpaceType: this.pagequery.advertisingSpaceType,
+              id:'',
+              affiliation:'',
+              applicant:'',
           },
           this.getAll()
       },
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 67c74a6..23fcb47 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -44,7 +44,7 @@
           </div>
         </div>
         <!-- 表格 -->
-        <el-table v-if="ontype=='1'" :data="tableData" 
+        <el-table v-if="ontype=='1'" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="序号" width="50">
             <template slot-scope="scope">
@@ -59,11 +59,11 @@
           </el-table-column>
           <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="detailedLocation"  width="180" label="详细地址" show-overflow-tooltip>
+          <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
+          <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.actualUsableArea || '无'}}
+              {{scope.row.belongingDepartment || '无'}}
             </template>
           </el-table-column>
           <el-table-column label="负责人" prop="head" show-overflow-tooltip>
@@ -71,39 +71,41 @@
               {{scope.row.head || '无'}}
             </template>
           </el-table-column>
-          <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
-          </el-table-column>
+          <el-table-column label="发布时间" prop="createDate"> </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="removeinfo(scope.row,'编辑')">编辑
               </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-              @click="opencl(scope.row,'sp')">发布</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'2','下架')">下架</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="opencl(scope.row,'sp')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='2'" :data="tableData" 
+        <el-table v-if="ontype=='2'" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="序号" width="50">
             <template slot-scope="scope">
               {{scope.$index +1}}
             </template>
           </el-table-column>
-          <el-table-column label="广告位名称" prop="advertisingName">
+          <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="广告位类型" prop="advertisingType" >
+          <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="广告尺寸" prop="dimensions"  show-overflow-tooltip></el-table-column>
-          <el-table-column prop="publishStatus" label="发布状态" >
+          <el-table-column label="创建人" prop="createUser"> </el-table-column>
+          <el-table-column label="发布时间" prop="createDate"> </el-table-column>
+          <!-- <el-table-column prop="publishStatus" label="发布状态" >
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
@@ -121,9 +123,28 @@
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
                 @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
+          </el-table-column> -->
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="100" fixed="right">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="removeinfo(scope.row,'编辑')">编辑
+              </div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="opencl(scope.row,'gg')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+            </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='3'" :data="tableData" 
+        <el-table v-if="ontype=='3'" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="序号" width="50">
             <template slot-scope="scope">
@@ -140,7 +161,7 @@
           </el-table-column>
           <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column prop="publishStatus" label="发布状态">
+          <!-- <el-table-column prop="publishStatus" label="发布状态">
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
@@ -151,11 +172,29 @@
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="removeinfo(scope.row,'编辑')">编辑
               </div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'"
-              @click="opencl(scope.row,'cd')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0'" @click="opencl(scope.row,'cd')">发布</div>
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
                 @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
+          </el-table-column> -->
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="100" fixed="right">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="removeinfo(scope.row,'编辑')">编辑
+              </div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+                @click="opencl(scope.row,'cd')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+            </template>
           </el-table-column>
         </el-table>
         <div style="display: flex;justify-content: space-between;" class="bom">
@@ -177,8 +216,9 @@
 
     <div class="zhuti" v-if="onaction == '2'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">新增</span></div>
+        <div style="color:#0006">
+          <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">新增</span></div>
       </div>
       <div style="margin: 0 0;">
         <div style="display: flex;font-size: 14px">
@@ -202,8 +242,9 @@
     </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">查看</span></div>
+        <div style="color:#0006">
+          <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">查看</span></div>
       </div>
       <div v-if="ontype == '1'">
         <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
@@ -217,8 +258,9 @@
     </div>
     <div class="zhuti" v-if="onaction == '4'">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">{{contractChangeReason}}</span></div>
+        <div style="color:#0006">
+          <span>{{ontype == '1'?'商铺基本信息':ontype == '2'?'广告位基本信息管理':ontype == '3'?'场地基本信息管理':'-'  }}</span> <span
+            style="padding:0 5px;">></span> <span style="color:#000000e6">{{contractChangeReason}}</span></div>
       </div>
       <div v-if="ontype == '1'" style="padding: 20px 20px 20px 0;">
         <add :info="detailsinfo" @removeonaction="removeonaction"></add>
@@ -230,8 +272,8 @@
         <addcd :info="detailsinfo" @removeonaction="removeonaction"></addcd>
       </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">
+    <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 :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
@@ -241,7 +283,9 @@
 
 <script>
   import {
-    cereResourceStrategy,editStatus
+    cereResourceStrategy,
+    editStatus,
+    cereBusinessOperationadd
   } from '../../api/newly.js'
   import {
     ceGetAll
@@ -262,12 +306,12 @@
   import addcd from '../../components/add/addcd'
   import chakanmap from '../../components/chakan/map'
   import chakancd from '../../components/chakan/cd'
-    import cl from '@/components/change/cl.vue'
-     import mapchakannew from '@/components/newmap/map'
+  import cl from '@/components/change/cl.vue'
+  import mapchakannew from '@/components/newmap/map'
   export default {
     data() {
       return {
-        name:'',
+        name: '',
         oninfo: {},
         celueData: [],
         clData: [],
@@ -317,7 +361,7 @@
         }
         console.error(this.oninfo)
         let c1 = {
-          resourcesId: this.oncetype+this.oninfo.id,
+          resourcesId: this.oncetype + this.oninfo.id,
           rentalPoliciesIds: ids,
         }
         console.error(c1)
@@ -329,11 +373,19 @@
               type: 'success'
             })
             editStatus({
-              resourcesId: this.oncetype+this.oninfo.id,
-              publishStatus: '3'
+              resourcesId: this.oncetype + this.oninfo.id,
+              publishStatus: '1'
             }).then(res => {
               this.onSubmit()
             })
+            cereBusinessOperationadd({
+              type: '发布',
+              resourceId: this.oncetype + this.oninfo.id,
+              operator: localStorage.getItem('roleName'),
+              operationTime: this.gettime()
+            }).then(res => {
+              console.error(res)
+            })
           } else {
             this.$message({
               message: '绑定失败',
@@ -346,7 +398,7 @@
         this.multipleSelection = []
         this.addcl = false
       },
-      async opencl(row,e) {
+      async opencl(row, e) {
         this.oncetype = e
         this.oninfo = row
         this.multipleSelection = []
@@ -413,6 +465,14 @@
                   type: 'success'
                 })
                 this.removeonaction('1')
+                cereBusinessOperationadd({
+                  type: tit,
+                  resourceId: 'sp' + row.id,
+                  operator: localStorage.getItem('roleName'),
+                  operationTime: that.gettime()
+                }).then(res => {
+                  console.error(res)
+                })
               } else {
                 this.$message({
                   message: res.msg,
@@ -432,6 +492,14 @@
                   type: 'success'
                 })
                 this.removeonaction('1')
+                cereBusinessOperationadd({
+                  type: tit,
+                  resourceId: 'gg' + row.id,
+                  operator: localStorage.getItem('roleName'),
+                  operationTime: that.gettime()
+                }).then(res => {
+                  console.error(res)
+                })
               } else {
                 this.$message({
                   message: res.msg,
@@ -451,6 +519,14 @@
                   type: 'success'
                 })
                 this.removeonaction('1')
+                cereBusinessOperationadd({
+                  type: tit,
+                  resourceId: 'cd' + row.id,
+                  operator: localStorage.getItem('roleName'),
+                  operationTime: that.gettime()
+                }).then(res => {
+                  console.error(res)
+                })
               } else {
                 this.$message({
                   message: res.msg,
@@ -473,15 +549,24 @@
       },
       async getAll() {
         if (this.ontype == '1') {
-          const res = await getAlls({...this.pagequery,shopName:this.name})
+          const res = await getAlls({
+            ...this.pagequery,
+            shopName: this.name
+          })
           this.tableData = res.data.content
           this.total = res.data.totalElements
         } else if (this.ontype == '2') {
-          const res = await likeGet({...this.pagequery,advertisingName:this.name})
+          const res = await likeGet({
+            ...this.pagequery,
+            advertisingName: this.name
+          })
           this.tableData = res.data.content
           this.total = res.data.totalElements
         } else if (this.ontype == '3') {
-          const res = await changAlls({...this.pagequery,venueName:this.name})
+          const res = await changAlls({
+            ...this.pagequery,
+            venueName: this.name
+          })
           this.tableData = res.data.content
           this.total = res.data.totalElements
         }
@@ -515,7 +600,7 @@
             pageSize: 10,
           },
           this.name = ''
-          this.getAll()
+        this.getAll()
       },
       //删除
       closemsg(item) {
@@ -625,6 +710,7 @@
     font-size: 14px;
     justify-content: space-between;
   }
+
   .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
@@ -637,18 +723,19 @@
     padding-bottom: 4px;
     color: #3F9B6A;
   }
+
   .tableBtn {
     display: inline-block;
     margin-right: 10px;
     cursor: pointer;
   }
+
   ::v-deep .el-dialog__body {
     padding: 0 0 !important;
   }
-  .el-dialog__header{
+
+  .el-dialog__header {
     padding: 0;
     display: none;
   }
 </style>
-
-
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index 978e8bd..e323aea 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -8,7 +8,7 @@
       <!-- 线上 -->
       <div>
         <!-- 搜索 -->
-        <div class="formSearch">
+        <!-- <div class="formSearch">
           <el-form :inline="true">
             <el-form-item label="资源名称" prop="name">
               <el-input v-model="name" placeholder="请输入" maxlength="50"></el-input>
@@ -17,8 +17,7 @@
               <el-input v-model="clName" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
             <el-form-item label="审核状态" prop="publishStatus">
-              <el-select v-model="publishStatus" placeholder="请选择"
-                style="width: 168px;margin-right: 15px">
+              <el-select v-model="publishStatus" placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="待审核" value="3"></el-option>
               </el-select>
             </el-form-item>
@@ -31,7 +30,7 @@
               style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
             </el-button>
           </div>
-        </div>
+        </div> -->
         <div style="margin-bottom: 20px;">
           <div style="display: flex;font-size: 14px">
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
@@ -43,8 +42,7 @@
           </div>
         </div>
         <!-- 表格 -->
-        <!--  -->
-        <el-table  v-if="ontype=='1'"  :span-method="objectSpanMethod" :data="tableData"
+        <el-table v-if="ontype=='1'" :span-method="tableSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -56,9 +54,11 @@
               {{scope.row.cereBasicInformationShop.detailedLocation}}
             </template>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+          <el-table-column label="商铺类型" prop="shopType" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationShop.actualUsableArea}}
+              <div class="duiqi">
+                {{scope.row.cereBasicInformationShop.shopType=='1'?'移动铺位':scope.row.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
@@ -78,21 +78,18 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='2'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='3'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" fixed="right" prop="sh">
             <template slot-scope="scope">
               <div @click="details(scope.row.cereBasicInformationShop,'1')" class="tableBtn greens">查看</div>
-              <div @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>
-              <!-- <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens" 
-                @click="removeinfozz(scope.row.cereBasicInformationShop,'1','通过')">通过</div>
-              <div v-if="scope.row.cereBasicInformationShop.publishStatus=='3'" class="tableBtn greens"
-                @click="removeinfozz(scope.row.cereBasicInformationShop,'4','驳回')">驳回</div> -->
+              <div v-if="scope.row.cereBasicInformationShop.publishStatus=='1'"
+                @click="details(scope.row.cereBasicInformationShop,'2')" class="tableBtn greens">审核</div>
             </template>
           </el-table-column>
         </el-table>
-        <el-table v-if="ontype=='2'" :span-method="objectSpanMethod"   :data="tableData"
+        <el-table v-if="ontype=='2'" :span-method="tableSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="广告位名称" prop="advertisingName" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -126,22 +123,18 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'待发布':scope.row.cereAdvertisingInformation.publishStatus=='1'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='2'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='3'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
-        
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" fixed="right" prop="sh">
             <template slot-scope="scope">
-              <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">查看</div>
-              <div @click="details(scope.row.cereAdvertisingInformation)" class="tableBtn greens">审核</div>
-              <!-- <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens" 
-                @click="removeinfozz(scope.row.cereAdvertisingInformation,'1','通过')">通过</div>
-              <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='3'" class="tableBtn greens"
-                @click="removeinfozz(scope.row.cereAdvertisingInformation,'4','驳回')">驳回</div> -->
+              <div @click="details(scope.row.cereAdvertisingInformation,'1')" class="tableBtn greens">查看</div>
+              <div v-if="scope.row.cereAdvertisingInformation.publishStatus=='1'"
+                @click="details(scope.row.cereAdvertisingInformation,'2')" class="tableBtn greens">审核</div>
             </template>
           </el-table-column>
         </el-table>
-        <el-table  v-if="ontype=='3'" :span-method="objectSpanMethod" :data="tableData"
+        <el-table v-if="ontype=='3'" :span-method="tableSpanMethod" :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="场地名称" prop="venueName" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -175,25 +168,23 @@
           </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'待发布':scope.row.cereBasicInformationVenue.publishStatus=='1'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='2'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='3'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" fixed="right" prop="sh">
             <template slot-scope="scope">
-              <div @click="details(scope.row.cereBasicInformationVenue)" class="tableBtn greens">查看</div>
-              <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens" 
-                @click="removeinfozz(scope.row.cereBasicInformationVenue,'1','通过')">通过</div>
-              <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='3'" class="tableBtn greens"
-                @click="removeinfozz(scope.row.cereBasicInformationVenue,'4','驳回')">驳回</div>
+              <div @click="details(scope.row.cereBasicInformationVenue,'1')" class="tableBtn greens">查看</div>
+              <div v-if="scope.row.cereBasicInformationVenue.publishStatus=='1'"
+                @click="details(scope.row.cereBasicInformationVenue,'2')" class="tableBtn greens">审核</div>
             </template>
           </el-table-column>
         </el-table>
-        <div v-if="total>0" style="display: flex;justify-content: space-between;" class="bom">
+        <div v-if="false" 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"
+          <!-- <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>
+          </el-pagination> -->
         </div>
 
       </div>
@@ -306,10 +297,10 @@
   export default {
     data() {
       return {
-        issp:'1',
-        publishStatus:'',
-        clName:'',
-        name:'',
+        issp: '1',
+        publishStatus: '',
+        clName: '',
+        name: '',
         oninfo: {},
         celueData: [],
         clData: [],
@@ -322,7 +313,7 @@
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
-          publishStatus: '3',
+          publishStatus: '1',
           pageNumber: 0,
           pageSize: 10,
         },
@@ -350,44 +341,33 @@
       this.getAll()
     },
     methods: {
-      objectSpanMethod({
-        row,
-        column,
-        rowIndex,
-        columnIndex
-      }) {
-        
-        if (columnIndex != 3 && columnIndex != 4 && columnIndex != 5) {
-          if (row.num % 2 == 0) {
-            if (rowIndex % row.num === 0) {
-              return {
-                rowspan: row.num,
-                colspan: 1
-              };
-            } else {
-              return {
-                rowspan: 0,
-                colspan: 0
-              };
-            }
+            /**
+       * 表格行合并逻辑
+       */
+      tableSpanMethod({ row, column, rowIndex }) {
+        if (["shopName", "detailedLocation", "shopType", "publishStatus", "sh","advertisingName","advertisingType","affiliation","venueName","venueType","actualUsableArea"].includes(column.property)) {
+          // 判断 num 是否相同，合并行
+          const num = row.num;
+          const startRowIndex = this.findStartRowIndex(rowIndex, num);
+          
+          return startRowIndex === rowIndex 
+            ? { rowspan: num, colspan: 1 } 
+            : { rowspan: 0, colspan: 0 };
+        }
+      },
+      /**
+       * 查找当前行的 num 对应的起始行索引
+       */
+      findStartRowIndex(rowIndex, num) {
+        let startRowIndex = rowIndex;
+        for (let i = rowIndex - 1; i >= 0; i--) {
+          if (this.tableData[i].num === num) {
+            startRowIndex = i;
           } else {
-            
-            if ((rowIndex+1) % row.num === 0) {
-              return {
-                rowspan: row.num,
-                colspan: 1
-              };
-            } else {
-              console.error(rowIndex)
-              return {
-                rowspan: 0,
-                colspan: 0
-              };
-            }
+            break;
           }
-
         }
-
+        return startRowIndex;
       },
       minSev(e) {
         this.multipleSelection = e
@@ -543,7 +523,7 @@
 
         })
       },
-      details(row,e) {
+      details(row, e) {
         this.issp = e
         this.detailsinfo = row
         this.onaction = '3'
@@ -554,11 +534,14 @@
         this.onaction = '4'
       },
       async getAll() {
+        this.tableData = []
+        let list = []
         if (this.ontype == '1') {
           const res = await getResourceStrategy({
             ...this.pagequery,
             resourcesId: 'sp',
-            shopName:this.name
+            shopName: this.name,
+            publishStatus: '1'
           })
           let c1 = []
           for (let index = 0; index < res.data.length; index++) {
@@ -566,7 +549,7 @@
             if (element.cereBasicInformationShop.id) {
               for (let i = 0; i < element.cereRentalPolicies.length; i++) {
                 var element1 = element.cereRentalPolicies[i];
-                
+
                 var obj = {
                   cereBasicInformationShop: element.cereBasicInformationShop,
                   num: element.cereRentalPolicies.length,
@@ -576,14 +559,39 @@
               }
             }
           }
-          this.tableData = c1
-          console.error(this.tableData)
-          this.total = res.data.total
+          list = c1
+          // 已审核
+          const res1 = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'sp',
+            shopName: this.name,
+            publishStatus: '2',
+          })
+          let c2 = []
+          for (let index = 0; index < res1.data.length; index++) {
+            const element = res1.data[index];
+            if (element.cereBasicInformationShop.id) {
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                var element1 = element.cereRentalPolicies[i];
+
+                var obj = {
+                  cereBasicInformationShop: element.cereBasicInformationShop,
+                  num: element.cereRentalPolicies.length,
+                  shopinfo: element1
+                };
+                c2.push(obj);
+              }
+            }
+          }
+          list = [...list, ...c2]
+          this.tableData = list
+          console.log(this.tableData);
         } else if (this.ontype == '2') {
           const res = await getResourceStrategy({
             ...this.pagequery,
             resourcesId: 'gg',
-            advertisingName:this.name
+            advertisingName: this.name,
+            publishStatus: '1'
           })
           let c1 = []
           for (let index = 0; index < res.data.length; index++) {
@@ -591,7 +599,7 @@
             if (element.cereAdvertisingInformation.id) {
               for (let i = 0; i < element.cereRentalPolicies.length; i++) {
                 var element1 = element.cereRentalPolicies[i];
-                
+
                 var obj = {
                   cereAdvertisingInformation: element.cereAdvertisingInformation,
                   num: element.cereRentalPolicies.length,
@@ -601,14 +609,40 @@
               }
             }
           }
-          this.tableData = c1
-          console.error(this.tableData)
-          this.total = res.data.total
+
+          list = c1
+          // 已审核
+          const res1 = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'gg',
+            advertisingName: this.name,
+            publishStatus: '2',
+          })
+          let c2 = []
+          for (let index = 0; index < res1.data.length; index++) {
+            const element = res1.data[index];
+            if (element.cereAdvertisingInformation.id) {
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                var element1 = element.cereRentalPolicies[i];
+
+                var obj = {
+                  cereAdvertisingInformation: element.cereAdvertisingInformation,
+                  num: element.cereRentalPolicies.length,
+                  shopinfo: element1
+                };
+                c2.push(obj);
+              }
+            }
+          }
+          list = [...list, ...c2]
+          this.tableData = list
+          console.log(this.tableData);
         } else if (this.ontype == '3') {
           const res = await getResourceStrategy({
             ...this.pagequery,
             resourcesId: 'cd',
-            // venueName:this.name
+            venueName:this.name,
+            publishStatus: '1'
           })
           let c1 = []
           for (let index = 0; index < res.data.length; index++) {
@@ -616,7 +650,7 @@
             if (element.cereBasicInformationVenue.id) {
               for (let i = 0; i < element.cereRentalPolicies.length; i++) {
                 var element1 = element.cereRentalPolicies[i];
-                
+
                 var obj = {
                   cereBasicInformationVenue: element.cereBasicInformationVenue,
                   num: element.cereRentalPolicies.length,
@@ -626,9 +660,33 @@
               }
             }
           }
-          this.tableData = c1
-          console.error(this.tableData)
-          this.total = res.data.total
+          list = c1
+          // 已审核
+          const res1 = await getResourceStrategy({
+            ...this.pagequery,
+            resourcesId: 'cd',
+            venueName:this.name,
+            publishStatus: '2'
+          })
+          let c2 = []
+          for (let index = 0; index < res1.data.length; index++) {
+            const element = res1.data[index];
+            if (element.cereBasicInformationVenue.id) {
+              for (let i = 0; i < element.cereRentalPolicies.length; i++) {
+                var element1 = element.cereRentalPolicies[i];
+
+                var obj = {
+                  cereBasicInformationVenue: element.cereBasicInformationVenue,
+                  num: element.cereRentalPolicies.length,
+                  shopinfo: element1
+                };
+                c2.push(obj);
+              }
+            }
+          }
+          list = [...list, ...c2]
+          this.tableData = list
+          console.log(this.tableData);
         }
 
       },
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 675566e..ac430b6 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -19,12 +19,6 @@
                 :key="index" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-              <el-select v-model="pagequery.belongingGreenwaySection" placeholder="请选择">
-                <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
-                  :key="index"></el-option>
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="归属部门" prop="belongingDepartment">
               <el-input v-model="pagequery.belongingDepartment" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
@@ -51,9 +45,6 @@
               {{scope.$index +1 }}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="门牌号" prop="houseNumber" show-overflow-tooltip>
-
-          </el-table-column> -->
           <el-table-column label="商铺名称" prop="shopName" show-overflow-tooltip></el-table-column>
           <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -64,11 +55,6 @@
           </el-table-column>
           <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
           </el-table-column>
-          <!-- <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>  
-            <template slot-scope="scope">
-              {{scope.row.actualUsableArea || '无'}}
-            </template>
-          </el-table-column> -->
           <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>  
             <template slot-scope="scope">
               {{scope.row.belongingDepartment || '无'}}
@@ -79,23 +65,22 @@
               {{scope.row.head || '无'}}
             </template>
           </el-table-column>
-          <el-table-column label="租赁到期时间" prop="leaseExpirationDate" show-overflow-tooltip>
-          </el-table-column>
+          <el-table-column label="发布时间" prop="createDate" > </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2'" @click="removeinfo(scope.row,'编辑')">编辑
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"  @click="removeinfo(scope.row,'编辑')">编辑
               </div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2' || scope.row.publishStatus=='4'" @click="closemsg(scope.row)">删除</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='2' || scope.row.publishStatus=='4'"
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
               @click="opencl(scope.row,'sp')">发布</div>
-              <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
-                @click="removeinfozz(scope.row,'2','下架')">下架</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
             </template>
           </el-table-column>
         </el-table>
@@ -231,7 +216,7 @@
             })
             editStatus({
               resourcesId: this.oncetype+this.oninfo.id,
-              publishStatus: '3'
+              publishStatus: '1'
             }).then(res => {
               this.onSubmit()
             })
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index de7ba46..cc8488d 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -18,7 +18,7 @@
               <el-input v-model="pagequery.advertisingName" placeholder="请输入" maxlength="50"></el-input>
             </el-form-item>
             <el-form-item label="所属端" prop="affiliation" v-if="leixing">
-              <el-select v-model="pagequery.affiliation" placeholder="请选择" style="width: 168px;margin-right: 15px">
+              <el-select v-model="pagequery.affiliation" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
                 <el-option label="游客小程序" value="游客小程序" />
                 <el-option label="商家客户端" value="商家客户端" />
               </el-select>
@@ -57,18 +57,18 @@
           </el-table-column>
 
 
-          <el-table-column label="所属端" width="100" prop="affiliation" v-if="leixing" show-overflow-tooltip></el-table-column>
-          <el-table-column label="轮播顺序" width="100"  prop="rotationOrder" v-if="leixing"> </el-table-column>
-          <el-table-column label="广告尺寸" width="120" prop="dimensions"  v-if="leixing" show-overflow-tooltip></el-table-column>
-          <el-table-column label="上传大小" prop="size"  v-if="leixing"></el-table-column>
+          <el-table-column label="所属端" prop="affiliation" v-if="leixing" show-overflow-tooltip></el-table-column>
+          <el-table-column label="轮播顺序" prop="rotationOrder" v-if="leixing"> </el-table-column>
 
 
           <el-table-column label="详细位置" prop="detailedLocation"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
-          <el-table-column label="设备类型" width="100"  prop="deviceType"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
-          <el-table-column label="广告尺寸" width="120" prop="dimensions"  v-if="leixing == false" show-overflow-tooltip></el-table-column>
-          <el-table-column label="广告材质" width="100"  prop="advertisingMaterial"  v-if="leixing == false"></el-table-column>
+          <el-table-column label="设备类型" prop="deviceType"  v-if="leixing == false" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.deviceType || '-'}}
+            </template>
+          </el-table-column>
 
-          <el-table-column  label="状态" prop="publishStatus" show-overflow-tooltip>
+          <!-- <el-table-column  label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
@@ -85,6 +85,25 @@
               <div class="tableBtn greens" v-if="scope.row.publishStatus=='1'"
                 @click="removeinfozz(scope.row,'2','下架')">下架</div>
             </template>
+          </el-table-column> -->
+          <el-table-column label="创建人" prop="createUser" > </el-table-column>
+          <el-table-column label="发布时间" prop="createDate" > </el-table-column>
+          <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="100" fixed="right">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"  @click="removeinfo(scope.row,'编辑')">编辑
+              </div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'" @click="closemsg(scope.row)">删除</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='0' || scope.row.publishStatus=='3'"
+              @click="opencl(scope.row,'gg')">发布</div>
+              <div class="tableBtn greens" v-if="scope.row.publishStatus=='2'"
+                @click="removeinfozz(scope.row,'0','下架')">下架</div>
+            </template>
           </el-table-column>
         </el-table>
         <div style="display: flex;justify-content: space-between;" class="bom">
@@ -161,7 +180,7 @@
   export default {
     data() {
       return {
-        oncetype: '',
+        oncetype: 'gg',
         addcl: false,
         oninfo: {},
         multipleSelection: [],
@@ -214,7 +233,7 @@
             })
             editStatus({
               resourcesId: this.oncetype + this.oninfo.id,
-              publishStatus: '3'
+              publishStatus: '1'
             }).then(res => {
               this.onSubmit()
             })
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 82ae863..fa82dc4 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -10,9 +10,22 @@
         <!-- 搜索 -->
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
-            <el-form-item label="合同名称">
+            <el-form-item label="资源名称">
               <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
+            <el-form-item label="资源类型" prop="belongingRegion">
+              <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="广告位" value="广告位"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="联系电话">
+              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="状态" prop="belongingRegion">
+              <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="广告位" value="广告位"></el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
 
           <div>
@@ -75,9 +88,6 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div  @click="details(scope.row)" class="tableBtn greens">审核</div>
-              <!-- <div  @click="closemsg(scope.row)" class="tableBtn greens">删除</div> -->
-              <!-- <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'2')" class="tableBtn greens">同意</div>
-              <div v-if='scope.row.auditStatus == 1' @click="remove(scope.row,'3')" class="tableBtn greens">驳回</div> -->
               <div v-if='scope.row.auditStatus == 2' @click="removeonaction('2')" class="tableBtn greens">录入合同</div>
             </template>
           </el-table-column>
diff --git a/admin-web-master/src/views/shopRental/renewalMan/index.vue b/admin-web-master/src/views/shopRental/renewalMan/index.vue
index 0b023ab..3a3fb50 100644
--- a/admin-web-master/src/views/shopRental/renewalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/renewalMan/index.vue
@@ -68,7 +68,7 @@
 
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="150" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> -->
@@ -138,8 +138,8 @@
 
 <script>
   import {
-    contractGetAllnew,
-  } from '../../../api/manage.js'
+    contractRenewalReminder,
+  } from '@/api/newly.js'
   import {
     cereReminderSet,
     cereReminderSetedit
@@ -234,7 +234,7 @@
         alert(`合同终止 - 店铺ID: ${row.id}`);
       },
       async getAll() {
-        const res = await contractGetAllnew(this.pagequery)
+        const res = await contractRenewalReminder(this.pagequery)
         this.tableData = res.data.content
         this.total = res.data.totalElements
       },
diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue
index be78dfe..60d24de 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/index.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue
@@ -63,7 +63,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" min-width="150" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div>
diff --git a/admin-web-master/src/views/shopRental/rentalMan/index.vue b/admin-web-master/src/views/shopRental/rentalMan/index.vue
index 0a182b8..2d8ee4e 100644
--- a/admin-web-master/src/views/shopRental/rentalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/rentalMan/index.vue
@@ -71,7 +71,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" min-width="150" fixed="right">
+          <el-table-column label="操作"  fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="addgzd(scope.row)" class="tableBtn greens">生成入驻告知单</div>
diff --git a/admin-web-master/src/views/shopRental/warning/index.vue b/admin-web-master/src/views/shopRental/warning/index.vue
index 0f30d55..a62bd54 100644
--- a/admin-web-master/src/views/shopRental/warning/index.vue
+++ b/admin-web-master/src/views/shopRental/warning/index.vue
@@ -74,7 +74,7 @@
               {{ calculateDaysUntilExpiration(scope.row.contractTerminationDate)}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="150" fixed="right">
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> -->
@@ -144,8 +144,8 @@
 
 <script>
   import {
-    contractGetAllnew,
-  } from '../../../api/manage.js'
+    expwarning,
+  } from '@/api/newly.js'
   import {
     cereReminderSet,
     cereReminderSetedit
@@ -238,7 +238,7 @@
         alert(`合同终止 - 店铺ID: ${row.id}`);
       },
       async getAll() {
-        const res = await contractGetAllnew(this.pagequery)
+        const res = await expwarning(this.pagequery)
         this.tableData = res.data.content
         this.total = res.data.totalElements
       },
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index 94194f4..4bc38ad 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -421,7 +421,7 @@
 				let pagesize = {
 					pageNumber: 1,
 					pageSize: 10,
-					publishStatus:'1'
+					publishStatus:'2'
 				}
 				this.current = type
 				if (type == 0) {
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 c022b62..155f829 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -7176,7 +7176,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -14219,7 +14219,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -14240,14 +14240,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -14343,7 +14343,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -18651,7 +18651,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"绿道","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {
diff --git a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
index 4575d1b..e8cfaaf 100644
--- a/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
+++ b/lvdao-miniapp/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line-progress/u-line-progress.json
@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
\ 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 e42113c..3b05c2b 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
@@ -322,7 +322,7 @@ var _default = {
       var pagesize = {
         pageNumber: 1,
         pageSize: 10,
-        publishStatus: '1'
+        publishStatus: '2'
       };
       this.current = type;
       if (type == 0) {