diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 3b0fd73..89e2702 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,7 +1,21 @@
 import request from '@/utils/request'
 // import request from '@/utils/request2'
-
-
+// 退租决算管理oa
+export function generalBySurrenderTenancy(data) {
+  return request({
+    url: '/oaInterconnection/generalBySurrenderTenancy',
+    method: 'post',
+    data
+  })
+}
+// 退租决算管理修改
+export function changeContractInformationedit(data) {
+  return request({
+    url: '/changeContractInformation/edit',
+    method: 'post',
+    data
+  })
+}
 // 退租决算管理
 export function changeContractInformationqueryByPage(data) {
   return request({
diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue
index b07eb8e..fad36d3 100644
--- a/admin-web-master/src/components/add/addmb.vue
+++ b/admin-web-master/src/components/add/addmb.vue
@@ -205,7 +205,7 @@ import { Input } from "element-ui";
             value: '',
           },
           {
-            name: '押金',
+            name: '押金（元）',
             key: 'earnestMoney',
             type: '单行数字文本',
             isrequired: '是',
@@ -258,7 +258,7 @@ import { Input } from "element-ui";
             ]
           },
           {
-            name: '租金',
+            name: '租金（元）',
             key: 'contractAmount',
             type: '单行数字文本',
             isrequired: '是',
diff --git a/admin-web-master/src/components/buscha/busChanew.vue b/admin-web-master/src/components/buscha/busChanew.vue
new file mode 100644
index 0000000..d14f5ee
--- /dev/null
+++ b/admin-web-master/src/components/buscha/busChanew.vue
@@ -0,0 +1,387 @@
+<template>
+  <div>
+    <div v-show="type == '1'">
+      <el-tabs v-model="xiangTab">
+        <el-tab-pane label="申请信息" name="one">
+          <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-form-item label="类型" prop="contractType">
+                  <div class="duiqi">{{newinfo.contractType=='0'?'退租':newinfo.contractType=='1'?'续租':'-'}}</div>
+                </el-form-item>
+                <el-form-item label="申请理由" prop="contractType">
+                  <div class="duiqi">{{newinfo.reasonForApplication || '-'}}</div>
+                </el-form-item>
+                <el-form-item label="申请时间" prop="contractNumber">
+                  <div class="duiqi">{{newinfo.applicationTime || '-'}}</div>
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
+        <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-row :gutter="20">
+                  <el-col :span="item.width == '50%（半行）'?12:item.width == '100%（一行）'?24:12" v-for="(item,index) in list1" >
+                    <el-form-item :label="item.name" prop="appendicesContract" v-if="item.type == '附件'">
+                      <div class="duiqi greens" @click ="item.value?openfile(item.value):''">{{item.value?'查看详情':'暂无文件'}}</div>
+                    </el-form-item>
+                    <el-form-item :label="item.name" prop="paymentDay" v-else-if="item.type != '资源' && item.type != '商家'">
+                      <div class="duiqi">{{item.value}}<span v-if="item.key == 'earnestMoney' || item.key == 'contractAmount'"> 元</span></div>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="附件信息" prop="appendicesContract">
+                  <div class="duiqi greens" @click ="info.appendicesContract?openfile(info.appendicesContract):''">{{info.appendicesContract?'查看详情':'暂无文件'}}</div>
+                </el-form-item>
+              </el-form>
+            </div>
+            <TitleWithCircle title="合同修订历史" />
+            <div style="padding: 20px;margin-top: 10px;">
+              <el-table :data="list"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+
+                <el-table-column label="类型">
+                  <template slot-scope="scope">
+                    {{scope.row.contractChangeReason}}
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作时间">
+                  <template slot-scope="scope">
+                    {{scope.row.updateDate}}
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作人">
+                  <template slot-scope="scope">
+                    {{scope.row.updateUser}}
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作">
+                <template slot-scope="scope">
+                  <div @click="open(scope.row)" class="tableBtn greens">查看</div>
+                </template>
+              </el-table-column>
+              </el-table>
+
+            </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="name">
+                      <div class="duiqi">{{shop.name}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="手机号" prop="phone">
+                      <div class="duiqi">{{shop.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">{{shop.idCardType}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="9">
+                    <el-form-item label="身份证号码" prop="idCardNumber">
+                      <div class="duiqi">{{shop.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+shop.idCardFrontImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shop.idCardFrontImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                </el-form-item>
+                <el-form-item label="身份证照片（反）" prop="idCardBackImage">
+                  <!-- <div style="margin-top: 10px;">
+                    <el-image style="width: 200px;" :src="$baseURL+shop.idCardBackImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shop.idCardBackImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="商户租赁信息" name="third">
+          <div class="editcss">
+            <div>
+              <el-table :data="tableData"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                <el-table-column label="商铺名称">
+                  <template slot-scope="scope">
+                    {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="实际使用面积" >
+                  <template slot-scope="scope">
+                    {{scope.row.actualArea ? scope.row.actualArea :  scope.row.actualUsableArea?scope.row.actualUsableArea:'-'}}
+
+                  </template>
+                </el-table-column>
+                <el-table-column label="类型" >
+                  <template slot-scope="scope">
+                    {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column label="状态" min-width="150">
+                <template slot-scope="scope">
+                  {{scope.row.cereContractInformation.tenantName}}
+
+                </template>
+              </el-table-column> -->
+                <el-table-column label="操作" >
+                  <template slot-scope="scope">
+                    <div class="tableBtn greens" @click="details(scope.row)">查看</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+      <div v-if="newinfo.status == '1' && issp == '2'" style="margin-top: 20px;">
+        <TitleWithCircle title="审核情况"/>
+        <div style="padding: 20px;">
+          <el-form :model="info" 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="(newinfo.status == '2' || newinfo.status == '3')&& newinfo.isInterior == '1'" style="margin-top: 20px;">
+        <TitleWithCircle title="审核结果"/>
+        <div style="padding: 20px;">
+          <el-form :model="newinfo" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="状态">
+              <div class="duiqi">{{newinfo.status=='2'?'已同意':newinfo.status=='3'?'已拒绝':'无'}}</div>
+            </el-form-item>
+            <el-form-item label="审核意见">
+              <div class="duiqi">{{newinfo.reviewComments || '无'}}</div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div>
+        <el-button v-if="newinfo.status == '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>
+    <div v-show="type == '2'">
+      <oneht ref="onhet"></oneht>
+      <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="changetype">返回</el-button>
+      </div>
+    </div>
+    <div v-show="type == '3'">
+      <div v-if="detailstype == '商铺'">
+        <resourceCommodity :editbgid="detailsinfo" @removeonaction="removeonaction"></resourceCommodity>
+      </div>
+      <div v-if="detailstype == '广告位'">
+        <chakanmap :editbgid="detailsinfo" @removeonaction="removeonaction"></chakanmap>
+      </div>
+      <div v-if="detailstype == '场地'">
+        <chakancd :editbgid="detailsinfo" @removeonaction="removeonaction"></chakancd>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import oneht from "@/components/chakan/oneht";
+  import {
+    queryByContractcontractNumber
+  } from '../../api/commodityLease.js'
+  import {
+    businessListGetById
+  } from '../../api/business.js'
+  import TitleWithCircle from '@/components/top/index';
+  import {
+    cerePlatformMerchantinfo
+  } from '../../api/newly.js'
+  import resourceCommodity from '@/components/resourceCommodity/index'
+      import chakanmap from '@/components/chakan/map'
+      import allimg from '@/components/chakan/allimg.vue';
+  import chakancd from '@/components/chakan/cd'
+
+  import {
+    changeContractInformationedit
+  } from '@/api/newly.js'
+  export default {
+    components: {
+      oneht,
+      TitleWithCircle,
+      chakancd,
+      chakanmap,
+      resourceCommodity,
+      allimg
+    },
+    props: {
+      info: {
+        type: Object,
+        default: function() {
+          return {}; // 返回一个空数组作为默认值
+        },
+      },
+      newinfo: {
+        type: Object,
+        default: function() {
+          return {}; // 返回一个空数组作为默认值
+        },
+      },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
+    },
+    data() {
+      return {
+        reviewComments:'',
+        radio: '2',
+        url:'',
+        type:'1',
+        tableData: [],
+        xiangTab: 'one',
+        siteIds: [],
+        list: [],
+        advIds: [],
+        shopIds: [],
+        shop: {},
+        newshop:{},
+        newinfo:{},
+        detailsinfo:{},
+        detailstype:'',
+        list1:[]
+      }
+    },
+    created() {
+      console.log(this.info)
+      this.list1 = JSON.parse(this.info.templateInformation)
+      console.log(this.list1)
+      this.url = process.env.VUE_APP_DOMAIN_PREFIX_1
+      queryByContractcontractNumber({
+        contractNumber: this.info.contractNumber
+      }).then(res => {
+        console.error(res)
+        // this.shop = res.data.shop
+        this.siteIds = res.data.siteIds
+        this.shopIds = res.data.shopIds
+        this.advIds = res.data.advIds
+        this.list = res.data.list
+        this.tableData = [...res.data.siteIds, ...res.data.shopIds, ...res.data.advIds]
+      })
+      cerePlatformMerchantinfo({id:this.info.relatedMerchants}).then(res => {
+        console.error(res)
+        this.shop = res.data
+      })
+    },
+    computed: {
+
+    },
+    methods: {
+      minSev() {
+        changeContractInformationedit({
+          ...this.newinfo,
+          status: this.radio,
+          reviewComments: this.reviewComments?this.reviewComments:null
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.newinfo.status = this.radio
+            this.$emit('removeonaction', '1')
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
+      removeonaction() {
+        this.type = '1'
+      },
+      details(row) {
+        this.detailstype = row.shopName?'商铺':row.advertisingType?'广告位':'场地'
+        this.detailsinfo = row
+        this.type = '3'
+      },
+      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.$refs.onhet.open(row)
+      },
+      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/fa.vue b/admin-web-master/src/components/chakan/fa.vue
index 87eb2ee..b35c482 100644
--- a/admin-web-master/src/components/chakan/fa.vue
+++ b/admin-web-master/src/components/chakan/fa.vue
@@ -24,8 +24,8 @@
                   <div class="duiqi" v-if="editbgid.summary" v-html="editbgid.summary"></div>
                   <div class="duiqi" v-else>无</div>
                 </el-form-item>
-                <el-form-item label="附件信息" prop="mainPurpose"  >
-                  <div class="duiqi" :class="editbgid.mainPurpose?'greens':''" @click ="editbgid.mainPurpose?openfile($baseURL+editbgid.mainPurpose):''">{{editbgid.mainPurpose?'查看详情':'无'}}</div>
+                <el-form-item label="附件信息" prop="attachmentInfo"  >
+                  <div class="duiqi" :class="editbgid.attachmentInfo?'greens':''" @click ="editbgid.attachmentInfo?openfile($baseURL+editbgid.attachmentInfo):''">{{editbgid.attachmentInfo?'查看详情':'无'}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -61,7 +61,7 @@
                 </el-table-column> -->
                 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{scope.row.info.publishStatus=='0'?'空置中':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
+                    {{scope.row.info.publishStatus=='0'?'待发布':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" prop="sh">
diff --git a/admin-web-master/src/components/chakan/sam.vue b/admin-web-master/src/components/chakan/sam.vue
index 2ec8c1b..89c56be 100644
--- a/admin-web-master/src/components/chakan/sam.vue
+++ b/admin-web-master/src/components/chakan/sam.vue
@@ -32,7 +32,7 @@
                   </el-col> -->
                   <el-col :span="8">
                     <el-form-item label="租金" prop="rentalPrice">
-                      <div  class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} <span v-if="editbgid.applicableResources == '商铺'">/M²</span></div>
+                      <div  class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} <span v-if="editbgid.applicableResources == '商铺'">/m²</span></div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 33ba0eb..fa0cbd4 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -25,11 +25,12 @@
               </el-table-column>
               <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column>
               <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
-              <el-table-column label="租金价格(/M²)" prop="rentalPrice" show-overflow-tooltip>
-				  <template slot-scope="scope">
-				    {{scope.row.rentalPrice}}/M²
-				  </template>
-			  </el-table-column>
+              <el-table-column label="租金价格(元/m²)" prop="rentalPrice" show-overflow-tooltip>
+                <template slot-scope="scope" >
+                  <span v-if="scope.row.rentalPrice!=''">{{scope.row.rentalPrice}}元/m²</span>
+                  <span v-else>无</span>
+                </template>
+              </el-table-column>
               <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
               <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
             </el-table>
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 13e719a..6d581a7 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -96,6 +96,12 @@
         });
       },
       initMap() {
+        if (this.isx) {
+        
+        } else {
+          this.lat = this.message.split(',')[0]
+          this.lng = this.message.split(',')[1]
+        }
         // 将经纬度转换为腾讯地图的LatLng对象
         const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
 
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
index d5d3539..e4a86d6 100644
--- a/admin-web-master/src/components/newmap/indexall.vue
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -309,7 +309,7 @@ body {
     position: absolute;
     top: 10px;
     left: 10px;
-    z-index: 99;
+    z-index: 1000;
     background: #fff;
     padding: 10px;
     border-radius: 5px;
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
index 1fc6272..4f46688 100644
--- a/admin-web-master/src/components/newmap/map.vue
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -95,7 +95,7 @@ export default {
         <div style="padding:10px 0;border-radius: 18px;">
           <p style="padding-top:10px;">资源名称:${item.name}</p>
           <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
-          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
+          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
           </div>
       `;
       // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
diff --git a/admin-web-master/src/components/newmap/map2.vue b/admin-web-master/src/components/newmap/map2.vue
index 76d3464..88c1836 100644
--- a/admin-web-master/src/components/newmap/map2.vue
+++ b/admin-web-master/src/components/newmap/map2.vue
@@ -188,7 +188,7 @@ export default {
         <div style="padding:10px 0;border-radius: 18px;">
           <p style="padding-top:10px;">资源名称:${item.name}</p>
           <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
-          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
+          <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
           </div>
       `;
       // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index 5457779..bb1895b 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -169,9 +169,9 @@
                 <!-- <el-table-column label="经营类型" prop="businessType" min-width="100">
 
                 </el-table-column> -->
-                <el-table-column label="租金价格(/M²)" prop="rentalPrice">
+                <el-table-column label="租金价格(元/m²)" prop="rentalPrice">
 					<template slot-scope="scope">
-					  {{scope.row.rentalPrice}}/M²
+					  {{scope.row.rentalPrice}}元/m²
 					</template>
                 </el-table-column>
                 <el-table-column label="付款周期" prop="leaseTerm">
diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js
index 1778eae..a06cfd4 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -37,15 +37,15 @@ 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'|| host === 'localhost:9529'  ) {
-  Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
-  Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
-  Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
-  Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api`
+  // Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall'
+  // Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
+  // Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
+  // Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api`
 
-  // Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall'
-  // Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
-  // Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
-  // Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api`
+  Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall'
+  Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf`
+  Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf`
+  Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api`
 } else {
 	Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api`
   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 be2a4a0..777ebaa 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  baseURL = 'http://128.10.249.8:9003';
+  // baseURL = 'http://128.10.249.8:9003';
 
 
 } else {
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index c0e2920..2e4ccf6 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -74,7 +74,7 @@
           <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=='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">
@@ -107,7 +107,7 @@
           <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'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column prop="leaseExpirationDate" label="租赁到期时间" >
@@ -126,7 +126,7 @@
           </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=='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">
@@ -155,9 +155,9 @@
           </el-table-column>
           <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="实际使用面积(/M²)" prop="actualArea" show-overflow-tooltip>
+          <el-table-column label="实际使用面积(元/m²)" prop="actualArea" show-overflow-tooltip>
 			  <template slot-scope="scope">
-			    {{scope.row.actualArea}}/M²
+			    {{scope.row.actualArea}}元/m²
 			  </template>
           </el-table-column>
           <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
@@ -166,7 +166,7 @@
           </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'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right">
@@ -182,7 +182,7 @@
           </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=='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">
diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue
index 2201b17..547932f 100644
--- a/admin-web-master/src/views/detect/examine/index.vue
+++ b/admin-web-master/src/views/detect/examine/index.vue
@@ -68,7 +68,7 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-           <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+           <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
            <span v-else>无</span>
             </template>
           </el-table-column>
@@ -79,7 +79,7 @@
           </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.publishStatus=='4'?'已租赁':'-'}}
+              {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
@@ -114,7 +114,7 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-            <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+            <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
             <span v-else>无</span>
             </template>
           </el-table-column>
@@ -125,7 +125,7 @@
           </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.publishStatus=='4'?'已租赁':'-'}}
+              {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'待发布':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
@@ -160,7 +160,7 @@
           </el-table-column>
           <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span>
+              <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
 			  <span v-else>无</span>
             </template>
           </el-table-column>
@@ -171,7 +171,7 @@
           </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.publishStatus=='4'?'已租赁':'-'}}
+              {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'待发布':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" prop="sh">
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index 18ea714..f85f505 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -68,7 +68,7 @@
           <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'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 3ac7e14..2a82865 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -70,7 +70,7 @@
 
           <!-- <el-table-column  label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
+              {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
             </template>
           </el-table-column>
           <el-table-column prop="leaseExpirationDate" label="租赁到期时间"  show-overflow-tooltip>
@@ -90,7 +90,7 @@
           <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'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="100" fixed="right">
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index a6fa4d2..a5d53ff 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -61,9 +61,10 @@
           <el-table-column label="经营类型" prop="businessType" min-width="100">
 
           </el-table-column>
-          <el-table-column label="租金价格(/M²)" prop="rentalPrice" min-width="150">
+          <el-table-column label="租金价格(元/m²)" prop="rentalPrice" min-width="150">
 			  <template slot-scope="scope">
-			    {{scope.row.rentalPrice}}/M²
+			    <span v-if="scope.row.rentalPrice!=''">{{scope.row.rentalPrice}}元/m²</span>
+                  <span v-else>无</span>
 			  </template>
           </el-table-column>
           <el-table-column label="租期" prop="leaseTerm" min-width="100">
diff --git a/admin-web-master/src/views/shopRental/renewalMan/index copy.vue b/admin-web-master/src/views/shopRental/renewalMan/index copy.vue
new file mode 100644
index 0000000..3a3fb50
--- /dev/null
+++ b/admin-web-master/src/views/shopRental/renewalMan/index copy.vue
@@ -0,0 +1,513 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti" v-if="onaction == '1'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商铺租赁服务</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">续租管理</span></div>
+      </div>
+      <!-- 线上 -->
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <el-form :inline="true" :model="pagequery">
+            <el-form-item label="合同名称">
+              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+          </el-form>
+
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <div style="margin-bottom: 20px;">
+          <el-button @click="openyujingSet()" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+            icon="el-icon-circle-plus-outline">预警设置</el-button>
+          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
+        </div>
+        <!-- 表格 -->
+
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="承租人名称">
+            <template slot-scope="scope">
+              {{scope.row.tenantName}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="租赁类型">
+            <template slot-scope="scope">
+              {{scope.row.contractType}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="租金/周期">
+            <template slot-scope="scope">
+              {{scope.row.contractAmount}} / {{scope.row.paymentCycle}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="合同编号">
+            <template slot-scope="scope">
+              {{scope.row.contractNumber}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="租赁起止时间">
+            <template slot-scope="scope">
+              {{scope.row.contractSigningDate}}至{{scope.row.contractTerminationDate}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="到期天数">
+            <template slot-scope="scope">
+              {{ calculateDaysUntilExpiration(scope.row.contractTerminationDate)}}
+
+            </template>
+          </el-table-column>
+          <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> -->
+            </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;">{{total}}</span> 项数据</div>
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
+        </div>
+
+      </div>
+
+    </div>
+
+
+
+
+
+
+    <el-dialog title="预警设置" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
+      <div>
+        <div style="margin-bottom: 20px;">
+          <el-form ref="form" :model="zhong" label-width="120px">
+            <el-form-item label="合同剩余天数">
+              <el-input v-model="zhong.contractExpirationDays"></el-input>
+            </el-form-item>
+            <el-form-item label="提醒内容">
+              <wang-editor v-model="zhong.reminderContent" ref="editor" :height="200"></wang-editor>
+            </el-form-item>
+
+
+
+          </el-form>
+
+        </div>
+        <div style="display: flex;justify-content: flex-end;">
+          <el-button @click="yuclose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+          <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <div class="zhuti" v-if="onaction == '3'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>出租管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">查看</span></div>
+      </div>
+      <div>
+        <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha>
+      </div>
+      <!-- <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="removeonaction('1')">返回</el-button>
+      </div> -->
+    </div>
+
+  </div>
+  <!-- </div> -->
+
+</template>
+
+<script>
+  import {
+    contractRenewalReminder,
+  } from '@/api/newly.js'
+  import {
+    cereReminderSet,
+    cereReminderSetedit
+  } from '../../../api/commodityLease.js'
+  // import add from './add'
+  import busCha from '../../../components/buscha/busCha'
+  import wangEditor from "@/components/editor/index"
+  export default {
+    data() {
+      return {
+        zhong: {
+
+        },
+        yujingSet: false,
+        detailsinfo: {},
+        pagequery: {
+          pageNumber: 0,
+          pageSize: 10,
+          dataStatus:'1',
+          contractName: ''
+        },
+        tableData: [],
+        total: 0,
+        onaction: '1',
+        info: {}
+      }
+    },
+    components: {
+      busCha,
+      wangEditor
+    },
+    created() {
+      this.getAll()
+
+    },
+    methods: {
+      
+      calculateDaysUntilExpiration(endDateString) {
+            const endDate = new Date(endDateString);
+            const today = new Date();
+            const timeDifference = endDate - today;
+            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+            return daysDifference >= 0 ? daysDifference : '已过期';
+        },
+
+      yuclose() {
+        this.yujingSet = false
+      },
+      yuChenk() {
+        console.error(this.zhong)
+        cereReminderSetedit(this.zhong).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '预警设置成功',
+              type: 'success'
+            })
+            this.yujingSet = false
+          } else {
+            this.$message({
+              message: '预警设置失败',
+              type: 'error'
+            })
+          }
+        })
+        
+      },
+      openyujingSet() {
+        cereReminderSet({
+          reminderType: '2'
+        }).then(res => {
+          console.error(res)
+          this.zhong = res.data
+        })
+        this.yujingSet = true
+      },
+      addgzd(row) {
+        this.detailsinfo = row
+        this.onaction = '2'
+      },
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
+      },
+      biangeng(row) {
+        alert(`合同变更 - 店铺ID: ${row.id}`);
+      },
+      xuyue(row) {
+        alert(`合同续约 - 店铺ID: ${row.id}`);
+      },
+      zhongzhi(row) {
+        alert(`合同终止 - 店铺ID: ${row.id}`);
+      },
+      async getAll() {
+        const res = await contractRenewalReminder(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
+      },
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
+      },
+      handleCurrentChange(val) {
+        this.pagequery.pageNumber = val - 1
+        this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pagequery.pageSize = val
+      },
+      // 查询按钮
+      async onSubmit() {
+        this.pagequery.pageNumber = 0
+        this.getAll()
+      },
+      //重置按钮
+      resetting() {
+        this.pagequery = {
+            pageNumber: 0,
+            pageSize: 10,
+            dataStatus:'1',
+            contractName: ''
+          },
+          this.getAll()
+      },
+    }
+
+  }
+</script>
+
+<style scoped>
+  .zhuti {
+    padding: 0  20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+  .chengeXia{
+    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
+  }
+
+  /deep/ .el-form-item__content {
+    line-height: 0;
+  }
+
+ 
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+    padding-bottom: 10px;
+
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+  /deep/ .el-table__row {
+    font-size: 14px;
+    color:#000000e6;
+    height:42px;
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #d3dce6;
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+    /deep/ .bg-purple[data-v-3bebae82]{
+    background: #fff;
+    height: 50px;
+  }
+
+::v-deep .bg-purple{
+    background: #fff;
+    height: 50px;
+  }
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+::v-deep .el-form-item{
+  margin-bottom:16px;
+}
+  .device-form .el-form-item__label::after {
+    content: "*";
+    color: #1A1A1A;
+    margin-left: 5px;
+    font-size: 16px;
+  }
+
+
+  ::v-deep .el-dialog__wrapper {
+    .el-dialog__header {
+      background-color: #FAFAFA;
+    }
+  }
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    border-top: solid rgba(209, 209, 209, 0.2) 2px;
+    padding-top: 20px;
+  }
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
+   ::v-deep .el-input__inner:hover {
+        border: #3F9B6A 1px solid;
+     }
+     ::v-deep .el-select .el-input.is-focus .el-input__inner{
+         border-color:#3F9B6A
+     }
+::v-deep .btn .el-button:focus,
+.el-button:hover {
+  border: 1px solid #3F9B6A;
+}
+.el-select-dropdown__item.selected{
+    color: #3F9B6A;
+}
+
+.el-pagination__sizes .el-input .el-input__inner:hover{
+    border-color: #3F9B6A;
+}
+::v-deep .el-dialog__wrapper{
+
+  .dialog_css{
+      margin-right: 12px;
+      margin-top:61px !important;
+      .el-dialog__title {
+        font-size: 16px !important;
+        font-weight: 600;
+        color: #000;
+      }
+  }
+  .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+  }
+
+}
+ ::v-deep .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+     .el-dialog__header{
+       background-color:#fff;
+       border-bottom:1px solid #EFEFEF;
+       .el-dialog__title{
+         font-size: 14px;
+          color: #000000e6;
+       }
+     }
+     .el-dialog__body{
+       padding:10px 20px 30px 20px
+     }
+  }
+
+ /deep/ .el-table_1_column_8 .hetong{
+   color:#7DBB9A;
+   text-decoration: underline;
+}
+/deep/ .first-column-bg {
+    background-color: #FAFAFA !important;
+  }
+
+.el-table tr{
+  height:56px;
+}
+
+::v-deep .table3{
+  .el-table__empty-block{
+    display:none;
+  }
+}
+::v-deep .textarea{
+  width: 85%;
+   .el-textarea__inner{
+    width: 100%;
+  }
+}
+::v-deep .el-button--mini{
+  padding: 7px 10px;
+}
+::v-deep .pass_input{
+    width: 100%;
+    .el-input__inner {
+      border: none;
+       padding:0;
+       }
+  }
+::v-deep .pass_select{
+  width: 100%;
+ .el-input__inner {
+   border: none;
+   padding:0;
+    }
+  .el-icon-arrow-up:before{
+    content:''
+  }
+
+}
+ /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+  background-color: #fff;
+}
+
+
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css{
+    .el-dialog__header{
+      padding:0px;
+    }
+  }
+  ::v-deep .buttonHover:hover{
+    color:#3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+  ::v-deep .el-pagination__total{
+        position: absolute;
+        left: 33px;
+  }
+</style>
+
diff --git a/admin-web-master/src/views/shopRental/renewalMan/index.vue b/admin-web-master/src/views/shopRental/renewalMan/index.vue
index 3a3fb50..e24a54f 100644
--- a/admin-web-master/src/views/shopRental/renewalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/renewalMan/index.vue
@@ -3,18 +3,26 @@
     <div class="zhuti" v-if="onaction == '1'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>商铺租赁服务</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">续租管理</span></div>
+            style="color:#000000e6">退租决算管理</span></div>
       </div>
       <!-- 线上 -->
       <div>
         <!-- 搜索 -->
         <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="status">
+              <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="使用中" value="1"></el-option>
+                <el-option label="往期合同" value="2"></el-option>
+                <el-option label="已终止" value="3"></el-option>
+                
+              </el-select>
+            </el-form-item> -->
           </el-form>
-
+          
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -24,54 +32,55 @@
           </div>
         </div>
         <div style="margin-bottom: 20px;">
-          <el-button @click="openyujingSet()" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-            icon="el-icon-circle-plus-outline">预警设置</el-button>
-          <!-- <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button> -->
         </div>
         <!-- 表格 -->
-
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="承租人名称">
             <template slot-scope="scope">
-              {{scope.row.tenantName}}
-
+              {{scope.row.cereContractInformation.tenantName}}
             </template>
           </el-table-column>
           <el-table-column label="租赁类型">
             <template slot-scope="scope">
-              {{scope.row.contractType}}
-
+              {{scope.row.cereContractInformation.contractType}}
             </template>
           </el-table-column>
-          <el-table-column label="租金/周期">
+          <el-table-column label="手机号">
             <template slot-scope="scope">
-              {{scope.row.contractAmount}} / {{scope.row.paymentCycle}}
-
+              {{scope.row.cereContractInformation.tenantTelephone}}
             </template>
           </el-table-column>
-          <el-table-column label="合同编号">
+          <el-table-column label="资源名称">
             <template slot-scope="scope">
-              {{scope.row.contractNumber}}
-
+              {{scope.row.cereContractInformation.cereBasicInformationShop.shopName || scope.row.cereContractInformation.cereAdvertisingInformation.advertisingName || scope.row.cereContractInformation.cereBasicInformationVenue.venueName}}
             </template>
           </el-table-column>
           <el-table-column label="租赁起止时间">
             <template slot-scope="scope">
-              {{scope.row.contractSigningDate}}至{{scope.row.contractTerminationDate}}
-
+              {{scope.row.cereContractInformation.contractSigningDate}}至{{scope.row.cereContractInformation.contractTerminationDate}}
             </template>
           </el-table-column>
-          <el-table-column label="到期天数">
+          <el-table-column label="申请时间">
             <template slot-scope="scope">
-              {{ calculateDaysUntilExpiration(scope.row.contractTerminationDate)}}
-
+              {{scope.row.createTime}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right">
+          <el-table-column prop="status" label="状态">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <!-- <div @click="addgzd(scope.row)" class="tableBtn greens">发送提醒</div> -->
+              <span v-if='scope.row.status == 1'>待审核</span>
+              <span v-else-if='scope.row.status == 2'>已同意</span>
+              <span v-else-if='scope.row.status == 3'>已拒绝</span>
+              <span v-else>待发起</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="150" fixed="right">
+            <template slot-scope="scope">
+              <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
+              <!-- <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div> -->
+              <div v-if='scope.row.status == 1 && scope.row.isInterior == 1'  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
+              <div v-if="scope.row.status == null || scope.row.status == '0'"  @click="remove(scope.row)" class="tableBtn greens">内部审核</div>
+              <div v-if="scope.row.status == null || scope.row.status == '0'"  @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
             </template>
           </el-table-column>
         </el-table>
@@ -92,37 +101,23 @@
 
 
 
-    <el-dialog title="预警设置" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
-      <div>
-        <div style="margin-bottom: 20px;">
-          <el-form ref="form" :model="zhong" label-width="120px">
-            <el-form-item label="合同剩余天数">
-              <el-input v-model="zhong.contractExpirationDays"></el-input>
-            </el-form-item>
-            <el-form-item label="提醒内容">
-              <wang-editor v-model="zhong.reminderContent" ref="editor" :height="200"></wang-editor>
-            </el-form-item>
-
-
-
-          </el-form>
-
-        </div>
-        <div style="display: flex;justify-content: flex-end;">
-          <el-button @click="yuclose" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-          <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
-        </div>
+    <div class="zhuti" v-if="onaction == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">新增</span></div>
       </div>
-    </el-dialog>
 
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="detailsinfo" @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>
-        <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha>
+        <busCha :issp="issp" :info="detailsinfo.cereContractInformation" :newinfo="detailsinfo" @removeonaction="removeonaction"></busCha>
       </div>
       <!-- <div>
         <el-button class="buttonHover"
@@ -130,117 +125,316 @@
           @click="removeonaction('1')">返回</el-button>
       </div> -->
     </div>
+    <div class="zhuti" v-if="onaction == '4'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">{{contractChangeReason}}</span></div>
+      </div>
 
+      <div style="padding: 20px 20px 20px 0;">
+        <!-- <addremove :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction">
+        </addremove> -->
+        <!-- <add :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction"></add> -->
+      </div>
+    </div>
+    <el-dialog :visible.sync="openoa" title="OA" width="65%" append-to-body center :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false">
+      <el-form v-if="openoa"  style="padding-right: 50px;padding-top: 20px;" :model="ruleForm" :rules="rulesoa" ref="oaForm" label-width="130px" class="demo-ruleForm">
+        <el-form-item label="审核人" prop="reviewers">
+          <el-select v-model="ruleForm.reviewers" placeholder="请选择" style="width: 100%;">
+            <el-option label="陈阳" value="1858710592190291968"></el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div style="display: flex; justify-content: flex-end; align-items: center;padding: 20px 50px;">
+        <el-button @click="openoa =false" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+        <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
-  <!-- </div> -->
+
 
 </template>
 
 <script>
-  import {
-    contractRenewalReminder,
+ import {
+    changeContractInformationqueryByPage,changeContractInformationedit,generalBySurrenderTenancy
   } from '@/api/newly.js'
   import {
-    cereReminderSet,
-    cereReminderSetedit
-  } from '../../../api/commodityLease.js'
-  // import add from './add'
-  import busCha from '../../../components/buscha/busCha'
-  import wangEditor from "@/components/editor/index"
+    contractGetAllnew,
+    edit,
+    editById
+  } from '@/api/manage.js'
+//  import add from './add'
+  import addremove from '@/components/add/addremoveht.vue'
+  import busCha from '@/components/buscha/busChanew'
+  import {
+    cereContractInformation
+  } from '@/api/commodityLease.js'
+  import {
+    modifyResourceStatus,general
+  } from '@/api/newly.js'
+  import axios from 'axios'
   export default {
     data() {
       return {
-        zhong: {
-
+        issp:'1',
+        rulesoa: {
+          reviewers: [{
+            required: true,
+            message: '请选择审核人',
+            trigger: 'blur'
+          }, ],
         },
-        yujingSet: false,
+        ruleForm:{
+          reviewers:""
+        },
+        openoa:false,
+        contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
+          // status:'1',
           pageNumber: 0,
           pageSize: 10,
-          dataStatus:'1',
+          contractType:'1',
           contractName: ''
         },
         tableData: [],
         total: 0,
         onaction: '1',
-        info: {}
+        formInline: {},
+        oainfo:{}
       }
     },
     components: {
+      // add,
       busCha,
-      wangEditor
+      addremove
     },
     created() {
       this.getAll()
-
     },
     methods: {
-      
-      calculateDaysUntilExpiration(endDateString) {
-            const endDate = new Date(endDateString);
-            const today = new Date();
-            const timeDifference = endDate - today;
-            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
-            return daysDifference >= 0 ? daysDifference : '已过期';
-        },
-
-      yuclose() {
-        this.yujingSet = false
+      addgzd(row) {
+        this.detailsinfo = row
+        this.onaction = '2'
+      },
+      remove(row) {
+        let that = this
+        this.$confirm('是否确定内部审核吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          changeContractInformationedit({
+            ...row,
+            isInterior:'1',
+            status: '1',
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) { 
+              this.$message({
+                  message: '处理成功',
+                  type: 'success'
+                })
+                this.resetting()
+              
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
+      },
+      openOAitem(row){
+        this.oainfo = row
+        this.ruleForm.reviewers = ''
+        this.openoa = true
+      },
+       downloadBase64File(base64String, fileName, mimeType) {
+        try {
+          // 将 Base64 字符串解码为二进制数据
+          const byteCharacters = atob(base64String);
+          const byteNumbers = new Array(byteCharacters.length);
+          for (let i = 0; i < byteCharacters.length; i++) {
+            byteNumbers[i] = byteCharacters.charCodeAt(i);
+          }
+          const byteArray = new Uint8Array(byteNumbers);
+
+          // 创建 Blob 对象
+          const blob = new Blob([byteArray], { type: mimeType });
+
+          // 生成下载链接并触发下载
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          link.setAttribute('download', fileName); // 设置下载文件名
+          document.body.appendChild(link);
+          link.click();
+
+          // 清理生成的 URL 对象
+          window.URL.revokeObjectURL(url);
+          document.body.removeChild(link);
+
+          console.log('文件下载成功:', fileName);
+        } catch (error) {
+          console.error('文件下载失败:', error);
+        }
       },
-      yuChenk() {
-        console.error(this.zhong)
-        cereReminderSetedit(this.zhong).then(res => {
-          console.error(res)
-          if (res.code == 200) {
+      async OA(){
+        // console.error(row)
+        let row = this.oainfo
+        await this.$refs.oaForm.validate((valid) => {
+          
+        })
+        if(!this.ruleForm.reviewers) {
+          return
+        }
+        const loading = this.$loading({
+          fullscreen: true
+        })
+        this.openoa = false
+        const response = await axios({
+          method: 'get',
+          url: this.$baseURL + row.cereContractInformation.appendicesContract, // 文件 URL
+          responseType: 'arraybuffer' // 指定响应类型为二进制数据
+        });
+        const file = new File([response.data], 'filename.txt', { type: 'text/plain' });
+        let fd = new FormData();
+        fd.append('files', file); 
+        fd.append('reviewers', this.ruleForm.reviewers);
+        fd.append('fileNames', '合同.docx');
+        fd.append('title', `${row.cereContractInformation.contractName}退租审批`);
+        fd.append('changeContractInformationId', row.id);
+		    // fd.append('sponsor', userData.user.id);
+        fd.append('sponsor', 11);
+        console.log(fd);
+  
+        generalBySurrenderTenancy(fd).then(res => {
+          console.log(res);
+          let data = JSON.parse(res.data)
+          if(data.code == '0'){
             this.$message({
-              message: '预警设置成功',
-              type: 'success'
+              type: 'success',
+              message: '发起成功'
             })
-            this.yujingSet = false
+            loading.close();
+            this.resetting()
           } else {
             this.$message({
-              message: '预警设置失败',
-              type: 'error'
+              type: 'error',
+              message: data.message
             })
           }
         })
+
         
       },
-      openyujingSet() {
-        cereReminderSet({
-          reminderType: '2'
-        }).then(res => {
-          console.error(res)
-          this.zhong = res.data
-        })
-        this.yujingSet = true
+      gettime() {
+        // 获取当前时间
+        let currentTime = new Date();
+
+        // 获取年份
+        let year = currentTime.getFullYear();
+
+        // 获取月份（注意月份是从0开始计数的，所以需要加1）
+        let month = currentTime.getMonth() + 1;
+
+        // 获取日期
+        let day = currentTime.getDate();
+
+        // 获取小时
+        let hours = currentTime.getHours();
+
+        // 获取分钟
+        let minutes = currentTime.getMinutes();
+
+        // 获取秒数
+        let seconds = currentTime.getSeconds();
+
+        // 获取毫秒数
+        let milliseconds = currentTime.getMilliseconds();
+
+        // 格式化时间为 YYYY-MM-DD
+        let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 HH:MM:SS
+        let formattedTime =
+          `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 YYYY-MM-DD HH:MM:SS
+        let formattedDateTime = `${formattedDate} ${formattedTime}`;
+        return formattedDateTime
+
       },
-      addgzd(row) {
-        this.detailsinfo = row
-        this.onaction = '2'
+      removeinfozz(row, e) {
+        let that = this
+        this.$confirm('确定要终止合同吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cereContractInformation({
+            ...row,
+            contractChangeReason: e,
+            status: '3',
+            originalContractCode: row.contractNumber,
+            updateDate: that.gettime(),
+            createDate: that.gettime(),
+            contractChangeTime: that.gettime(),
+            updateUser:localStorage.getItem('roleName')
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message: '终止成功',
+                type: 'success'
+              })
+              let c1 = row.shopNumber
+              modifyResourceStatus({
+                resourcesId: c1,
+                status:"0"
+              }).then(res => {
+                console.error(res)
+              })
+              // this.$emit('removeonaction', '1')
+              this.getAll()
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
       },
-      details(row) {
+      details(row,e) {
+        this.issp = e
         this.detailsinfo = row
         this.onaction = '3'
       },
-      biangeng(row) {
-        alert(`合同变更 - 店铺ID: ${row.id}`);
-      },
-      xuyue(row) {
-        alert(`合同续约 - 店铺ID: ${row.id}`);
-      },
-      zhongzhi(row) {
-        alert(`合同终止 - 店铺ID: ${row.id}`);
+      removeinfo(row, e) {
+        this.contractChangeReason = e
+        // console.error(this.contractChangeReason)
+        this.detailsinfo = row
+        this.onaction = '4'
       },
       async getAll() {
-        const res = await contractRenewalReminder(this.pagequery)
+        const res = await changeContractInformationqueryByPage(this.pagequery)
         this.tableData = res.data.content
         this.total = res.data.totalElements
       },
       removeonaction(e) {
         console.error(e)
         this.onaction = e
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
       handleCurrentChange(val) {
         this.pagequery.pageNumber = val - 1
@@ -259,7 +453,8 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            dataStatus:'1',
+            status:'',
+            contractType:'1',
             contractName: ''
           },
           this.getAll()
@@ -270,29 +465,38 @@
 </script>
 
 <style scoped>
+  .el-table {
+    /* height: calc(100vh - 330px); */
+  }
+
   .zhuti {
-    padding: 0  20px 20px 20px;
+    padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
 
   }
-  .chengeXia{
-    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
+
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
   }
 
-  /deep/ .el-form-item__content {
+  /* /deep/ .el-form-item__content {
     line-height: 0;
-  }
+  } */
 
- 
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    color: #ACACAC;
+  }
 
   .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-    padding-bottom: 10px;
-
   }
 
   .greens {
@@ -301,27 +505,21 @@
 
   /deep/ .el-table__row {
     font-size: 14px;
-    color:#000000e6;
-    height:42px;
+    color: #000000e6;
+    height: 42px;
   }
 
   .fenye {
     margin-top: 20px;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
   }
 
   /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;
@@ -353,161 +551,124 @@
     background: #fff;
     height: 50px;
   }
-    /deep/ .bg-purple[data-v-3bebae82]{
+
+  /deep/ .bg-purple[data-v-3bebae82] {
     background: #fff;
     height: 50px;
   }
 
-::v-deep .bg-purple{
+  ::v-deep .bg-purple {
     background: #fff;
     height: 50px;
   }
+
   /deep/ .el-form--label-top .el-form-item__label {
     padding: 0;
   }
-::v-deep .el-form-item{
-  margin-bottom:16px;
-}
-  .device-form .el-form-item__label::after {
-    content: "*";
-    color: #1A1A1A;
-    margin-left: 5px;
-    font-size: 16px;
-  }
-
 
   ::v-deep .el-dialog__wrapper {
     .el-dialog__header {
-      background-color: #FAFAFA;
+      background-color: #fff;
     }
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
+
+
+
   .dialog-footer {
     display: flex;
     justify-content: flex-end;
     border-top: solid rgba(209, 209, 209, 0.2) 2px;
     padding-top: 20px;
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
-   ::v-deep .el-input__inner:hover {
-        border: #3F9B6A 1px solid;
-     }
-     ::v-deep .el-select .el-input.is-focus .el-input__inner{
-         border-color:#3F9B6A
-     }
-::v-deep .btn .el-button:focus,
-.el-button:hover {
-  border: 1px solid #3F9B6A;
-}
-.el-select-dropdown__item.selected{
+
+
+
+
+  .el-select-dropdown__item.selected {
     color: #3F9B6A;
-}
+  }
+
+  ::v-deep .el-dialog__title {
+    color: #000;
+  }
 
-.el-pagination__sizes .el-input .el-input__inner:hover{
-    border-color: #3F9B6A;
-}
-::v-deep .el-dialog__wrapper{
+  ::v-deep .el-dialog__wrapper {
 
-  .dialog_css{
+    .dialog_css {
       margin-right: 12px;
-      margin-top:61px !important;
-      .el-dialog__title {
-        font-size: 16px !important;
-        font-weight: 600;
-        color: #000;
-      }
+      margin-top: 61px !important;
+
+    }
+
+    .diaslog_zhong {
+      margin-left: 222px;
+      margin-top: 61px !important;
+    }
+
+  }
+
+  /deep/ .el-table_1_column_8 .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
   }
-  .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-  }
-
-}
- ::v-deep .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-     .el-dialog__header{
-       background-color:#fff;
-       border-bottom:1px solid #EFEFEF;
-       .el-dialog__title{
-         font-size: 14px;
-          color: #000000e6;
-       }
-     }
-     .el-dialog__body{
-       padding:10px 20px 30px 20px
-     }
-  }
-
- /deep/ .el-table_1_column_8 .hetong{
-   color:#7DBB9A;
-   text-decoration: underline;
-}
-/deep/ .first-column-bg {
+
+  /deep/ .first-column-bg {
     background-color: #FAFAFA !important;
   }
 
-.el-table tr{
-  height:56px;
-}
+  .el-table tr {
+    height: 56px;
+  }
 
-::v-deep .table3{
-  .el-table__empty-block{
-    display:none;
+  ::v-deep .table3 {
+    .el-table__empty-block {
+      display: none;
+    }
   }
-}
-::v-deep .textarea{
-  width: 85%;
-   .el-textarea__inner{
-    width: 100%;
+
+  ::v-deep .textarea {
+    width: 85%;
+
+    .el-textarea__inner {
+      width: 100%;
+    }
   }
-}
-::v-deep .el-button--mini{
-  padding: 7px 10px;
-}
-::v-deep .pass_input{
+
+  ::v-deep .el-button--mini {
+    padding: 7px 10px;
+  }
+
+  ::v-deep .pass_input {
     width: 100%;
+
     .el-input__inner {
       border: none;
-       padding:0;
-       }
-  }
-::v-deep .pass_select{
-  width: 100%;
- .el-input__inner {
-   border: none;
-   padding:0;
+      padding: 0;
     }
-  .el-icon-arrow-up:before{
-    content:''
   }
 
-}
- /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background-color: #fff;
-}
+  ::v-deep .pass_select {
+    width: 100%;
 
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
 
-</style>
-<style lang="scss" scoped>
-  ::v-deep .bian_css{
-    .el-dialog__header{
-      padding:0px;
+    .el-icon-arrow-up:before {
+      content: ''
     }
+
   }
-  ::v-deep .buttonHover:hover{
-    color:#3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
-  }
-  ::v-deep .el-pagination__total{
-        position: absolute;
-        left: 33px;
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: #fff;
   }
 </style>
+<style lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
 
+
+</style>
diff --git a/admin-web-master/src/views/shopRental/rentTermination/index copy 3.vue b/admin-web-master/src/views/shopRental/rentTermination/index copy 3.vue
new file mode 100644
index 0000000..71a62f7
--- /dev/null
+++ b/admin-web-master/src/views/shopRental/rentTermination/index copy 3.vue
@@ -0,0 +1,419 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti" v-if="onaction == '1'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商铺租赁服务</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">退租决算管理</span></div>
+      </div>
+      <!-- 线上 -->
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <el-form :inline="true" :model="pagequery">
+            <el-form-item label="合同名称">
+              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+          </el-form>
+
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <!-- <div style="margin-bottom: 20px;">
+          <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+            icon="el-icon-circle-plus-outline">新增</el-button>
+          <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button>
+        </div> -->
+        <!-- 表格 -->
+
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="承租人名称">
+            <template slot-scope="scope">
+              {{scope.row.cereContractInformation.tenantName}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="租赁类型">
+            <template slot-scope="scope">
+              {{scope.row.cereContractInformation.contractType}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="手机号">
+            <template slot-scope="scope">
+              {{scope.row.cereContractInformation.tenantTelephone}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="资源名称">
+            <template slot-scope="scope">
+              {{scope.row.cereContractInformation.cereBasicInformationShop.shopName || scope.row.cereContractInformation.cereAdvertisingInformation.advertisingName || scope.row.cereContractInformation.cereBasicInformationVenue.venueName}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="租赁起止时间">
+            <template slot-scope="scope">
+              {{scope.row.cereContractInformation.contractSigningDate}}至{{scope.row.cereContractInformation.contractTerminationDate}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间">
+            <template slot-scope="scope">
+              {{scope.row.createTime}}
+
+            </template>
+          </el-table-column>
+          <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>
+            </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;">{{total}}</span> 项数据</div>
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
+            small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
+        </div>
+
+      </div>
+
+    </div>
+
+
+
+
+
+
+    <div class="zhuti" v-if="onaction == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">新增</span></div>
+      </div>
+
+      <div style="padding: 20px 20px 20px 0;">
+        <add :info="detailsinfo" @removeonaction="removeonaction"></add>
+      </div>
+    </div>
+    <div class="zhuti" v-if="onaction == '3'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">查看</span></div>
+      </div>
+      <div>
+        <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha>
+      </div>
+      <!-- <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="removeonaction('1')">返回</el-button>
+      </div> -->
+    </div>
+  </div>
+
+
+</template>
+
+<script>
+  import {
+    changeContractInformationqueryByPage,
+  } from '@/api/newly.js'
+  import add from './add'
+  import busCha from '../../../components/buscha/busCha'
+  export default {
+    data() {
+      return {
+        detailsinfo:{},
+        pagequery: {
+          pageNumber: 0,
+          pageSize: 10,
+          contractName: '',
+          dataStatus:'1',
+        },
+        tableData: [],
+        total: 0,
+        onaction: '1',
+        info:{}
+      }
+    },
+    components: {
+      add,busCha
+    },
+    created() {
+      this.getAll()
+
+    },
+    methods: {
+      addgzd(row) {
+        this.detailsinfo = row
+        this.onaction = '2'
+      },
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
+      },
+      biangeng(row) {
+        alert(`合同变更 - 店铺ID: ${row.id}`);
+      },
+      xuyue(row) {
+        alert(`合同续约 - 店铺ID: ${row.id}`);
+      },
+      zhongzhi(row) {
+        alert(`合同终止 - 店铺ID: ${row.id}`);
+      },
+      async getAll() {
+        const res = await changeContractInformationqueryByPage(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
+      },
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
+      },
+      handleCurrentChange(val) {
+        this.pagequery.pageNumber = val-1
+        this.getAll()
+      },
+      handleSizeChange(val) {
+        this.pagequery.pageSize = val
+      },
+      // 查询按钮
+      async onSubmit() {
+        this.pagequery.pageNumber = 0
+        this.getAll()
+      },
+      //重置按钮
+      resetting() {
+        this.pagequery = {
+            pageNumber: 0,
+            pageSize: 10,
+            contractName: '',
+            dataStatus:'1',
+          },
+          this.getAll()
+      },
+    }
+
+  }
+</script>
+
+<style scoped>
+  .el-table {
+    /* height: calc(100vh - 330px); */
+  }
+
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
+  }
+
+  /* /deep/ .el-form-item__content {
+    line-height: 0;
+  } */
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    color: #ACACAC;
+  }
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+  /deep/ .el-table__row {
+    font-size: 14px;
+    color: #000000e6;
+    height: 42px;
+  }
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
+  }
+
+
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #d3dce6;
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .bg-purple[data-v-3bebae82] {
+    background: #fff;
+    height: 50px;
+  }
+
+  ::v-deep .bg-purple {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+
+  ::v-deep .el-dialog__wrapper {
+    .el-dialog__header {
+      background-color: #fff;
+    }
+  }
+
+
+
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    border-top: solid rgba(209, 209, 209, 0.2) 2px;
+    padding-top: 20px;
+  }
+
+
+
+
+  .el-select-dropdown__item.selected {
+    color: #3F9B6A;
+  }
+
+  ::v-deep .el-dialog__title {
+    color: #000;
+  }
+
+  ::v-deep .el-dialog__wrapper {
+
+    .dialog_css {
+      margin-right: 12px;
+      margin-top: 61px !important;
+
+    }
+
+    .diaslog_zhong {
+      margin-left: 222px;
+      margin-top: 61px !important;
+    }
+
+  }
+
+  /deep/ .el-table_1_column_8 .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
+  }
+
+  /deep/ .first-column-bg {
+    background-color: #FAFAFA !important;
+  }
+
+  .el-table tr {
+    height: 56px;
+  }
+
+  ::v-deep .table3 {
+    .el-table__empty-block {
+      display: none;
+    }
+  }
+
+  ::v-deep .textarea {
+    width: 85%;
+
+    .el-textarea__inner {
+      width: 100%;
+    }
+  }
+
+  ::v-deep .el-button--mini {
+    padding: 7px 10px;
+  }
+
+  ::v-deep .pass_input {
+    width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
+  }
+
+  ::v-deep .pass_select {
+    width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
+
+    .el-icon-arrow-up:before {
+      content: ''
+    }
+
+  }
+
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: #fff;
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
+  }
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+</style>
diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue
index f49abde..0c588eb 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/index.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue
@@ -10,11 +10,19 @@
         <!-- 搜索 -->
         <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="status">
+              <el-select v-model="pagequery.status" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="使用中" value="1"></el-option>
+                <el-option label="往期合同" value="2"></el-option>
+                <el-option label="已终止" value="3"></el-option>
+                
+              </el-select>
+            </el-form-item> -->
           </el-form>
-
+          
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -23,62 +31,63 @@
             </el-button>
           </div>
         </div>
-        <!-- <div style="margin-bottom: 20px;">
-          <el-button @click="removeonaction('2')" style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-            icon="el-icon-circle-plus-outline">新增</el-button>
-          <el-button @click="" style="background-color: #3F9B6A;color: #fff">批量导入</el-button>
-        </div> -->
+        <div style="margin-bottom: 20px;">
+        </div>
         <!-- 表格 -->
-
         <el-table :data="tableData"
           :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="承租人名称">
             <template slot-scope="scope">
               {{scope.row.cereContractInformation.tenantName}}
-
             </template>
           </el-table-column>
           <el-table-column label="租赁类型">
             <template slot-scope="scope">
               {{scope.row.cereContractInformation.contractType}}
-
             </template>
           </el-table-column>
           <el-table-column label="手机号">
             <template slot-scope="scope">
               {{scope.row.cereContractInformation.tenantTelephone}}
-
             </template>
           </el-table-column>
           <el-table-column label="资源名称">
             <template slot-scope="scope">
-              {{scope.row.cereContractInformation.tenantTelephone}}
-
+              {{scope.row.cereContractInformation.cereBasicInformationShop.shopName || scope.row.cereContractInformation.cereAdvertisingInformation.advertisingName || scope.row.cereContractInformation.cereBasicInformationVenue.venueName}}
             </template>
           </el-table-column>
           <el-table-column label="租赁起止时间">
             <template slot-scope="scope">
               {{scope.row.cereContractInformation.contractSigningDate}}至{{scope.row.cereContractInformation.contractTerminationDate}}
-
             </template>
           </el-table-column>
           <el-table-column label="申请时间">
             <template slot-scope="scope">
               {{scope.row.createTime}}
-
             </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right">
+          <el-table-column prop="status" label="状态">
+            <template slot-scope="scope">
+              <span v-if='scope.row.status == 1'>待审核</span>
+              <span v-else-if='scope.row.status == 2'>已同意</span>
+              <span v-else-if='scope.row.status == 3'>已拒绝</span>
+              <span v-else>待发起</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div>
+              <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
+              <div v-if='scope.row.status == 2' @click="addgzd(scope.row)" class="tableBtn greens">生成退租告知单</div>
+              <div v-if='scope.row.status == 1 && scope.row.isInterior == 1'  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
+              <div v-if="scope.row.status == null || scope.row.status == '0'"  @click="remove(scope.row)" class="tableBtn greens">内部审核</div>
+              <div v-if="scope.row.status == null || scope.row.status == '0'"  @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</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;">{{total}}</span> 项数据</div>
-          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10" background
-            small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
             @current-change="handleCurrentChange">
           </el-pagination>
         </div>
@@ -108,7 +117,7 @@
             style="color:#000000e6">查看</span></div>
       </div>
       <div>
-        <busCha :info="detailsinfo" @removeonaction="removeonaction"></busCha>
+        <busCha :issp="issp" :info="detailsinfo.cereContractInformation" :newinfo="detailsinfo" @removeonaction="removeonaction"></busCha>
       </div>
       <!-- <div>
         <el-button class="buttonHover"
@@ -116,57 +125,305 @@
           @click="removeonaction('1')">返回</el-button>
       </div> -->
     </div>
+    <div class="zhuti" v-if="onaction == '4'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>退租决算管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">{{contractChangeReason}}</span></div>
+      </div>
+
+      <div style="padding: 20px 20px 20px 0;">
+        <!-- <addremove :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction">
+        </addremove> -->
+        <add :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction"></add>
+      </div>
+    </div>
+    <el-dialog :visible.sync="openoa" title="OA" width="65%" append-to-body center :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false">
+      <el-form v-if="openoa"  style="padding-right: 50px;padding-top: 20px;" :model="ruleForm" :rules="rulesoa" ref="oaForm" label-width="130px" class="demo-ruleForm">
+        <el-form-item label="审核人" prop="reviewers">
+          <el-select v-model="ruleForm.reviewers" placeholder="请选择" style="width: 100%;">
+            <el-option label="陈阳" value="1858710592190291968"></el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div style="display: flex; justify-content: flex-end; align-items: center;padding: 20px 50px;">
+        <el-button @click="openoa =false" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+        <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 
 
 </template>
 
 <script>
+ import {
+    changeContractInformationqueryByPage,changeContractInformationedit,generalBySurrenderTenancy
+  } from '@/api/newly.js'
+  import {
+    contractGetAllnew,
+    edit,
+    editById
+  } from '@/api/manage.js'
+ import add from './add'
+  import addremove from '@/components/add/addremoveht.vue'
+  import busCha from '@/components/buscha/busChanew'
   import {
-    changeContractInformationqueryByPage,
+    cereContractInformation
+  } from '@/api/commodityLease.js'
+  import {
+    modifyResourceStatus,general
   } from '@/api/newly.js'
-  import add from './add'
-  import busCha from '../../../components/buscha/busCha'
+  import axios from 'axios'
   export default {
     data() {
       return {
-        detailsinfo:{},
+        issp:'1',
+        rulesoa: {
+          reviewers: [{
+            required: true,
+            message: '请选择审核人',
+            trigger: 'blur'
+          }, ],
+        },
+        ruleForm:{
+          reviewers:""
+        },
+        openoa:false,
+        contractChangeReason: '',
+        detailsinfo: {},
         pagequery: {
+          // status:'1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: '',
-          dataStatus:'1',
+          contractType:'0',
+          contractName: ''
         },
         tableData: [],
         total: 0,
         onaction: '1',
-        info:{}
+        formInline: {},
+        oainfo:{}
       }
     },
     components: {
-      add,busCha
+      add,
+      busCha,
+      addremove
     },
     created() {
       this.getAll()
-
     },
     methods: {
       addgzd(row) {
         this.detailsinfo = row
         this.onaction = '2'
       },
-      details(row) {
-        this.detailsinfo = row
-        this.onaction = '3'
+      remove(row) {
+        let that = this
+        this.$confirm('是否确定内部审核吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          changeContractInformationedit({
+            ...row,
+            isInterior:'1',
+            status: '1',
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) { 
+              this.$message({
+                  message: '处理成功',
+                  type: 'success'
+                })
+                this.resetting()
+              
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
       },
-      biangeng(row) {
-        alert(`合同变更 - 店铺ID: ${row.id}`);
+      openOAitem(row){
+        this.oainfo = row
+        this.ruleForm.reviewers = ''
+        this.openoa = true
       },
-      xuyue(row) {
-        alert(`合同续约 - 店铺ID: ${row.id}`);
+       downloadBase64File(base64String, fileName, mimeType) {
+        try {
+          // 将 Base64 字符串解码为二进制数据
+          const byteCharacters = atob(base64String);
+          const byteNumbers = new Array(byteCharacters.length);
+          for (let i = 0; i < byteCharacters.length; i++) {
+            byteNumbers[i] = byteCharacters.charCodeAt(i);
+          }
+          const byteArray = new Uint8Array(byteNumbers);
+
+          // 创建 Blob 对象
+          const blob = new Blob([byteArray], { type: mimeType });
+
+          // 生成下载链接并触发下载
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          link.setAttribute('download', fileName); // 设置下载文件名
+          document.body.appendChild(link);
+          link.click();
+
+          // 清理生成的 URL 对象
+          window.URL.revokeObjectURL(url);
+          document.body.removeChild(link);
+
+          console.log('文件下载成功:', fileName);
+        } catch (error) {
+          console.error('文件下载失败:', error);
+        }
       },
-      zhongzhi(row) {
-        alert(`合同终止 - 店铺ID: ${row.id}`);
+      async OA(){
+        // console.error(row)
+        let row = this.oainfo
+        await this.$refs.oaForm.validate((valid) => {
+          
+        })
+        if(!this.ruleForm.reviewers) {
+          return
+        }
+        const loading = this.$loading({
+          fullscreen: true
+        })
+        this.openoa = false
+        const response = await axios({
+          method: 'get',
+          url: this.$baseURL + row.cereContractInformation.appendicesContract, // 文件 URL
+          responseType: 'arraybuffer' // 指定响应类型为二进制数据
+        });
+        const file = new File([response.data], 'filename.txt', { type: 'text/plain' });
+        let fd = new FormData();
+        fd.append('files', file); 
+        fd.append('reviewers', this.ruleForm.reviewers);
+        fd.append('fileNames', '合同.docx');
+        fd.append('title', `${row.cereContractInformation.contractName}退租审批`);
+        fd.append('changeContractInformationId', row.id);
+		    // fd.append('sponsor', userData.user.id);
+        fd.append('sponsor', 11);
+        console.log(fd);
+  
+        generalBySurrenderTenancy(fd).then(res => {
+          console.log(res);
+          let data = JSON.parse(res.data)
+          if(data.code == '0'){
+            this.$message({
+              type: 'success',
+              message: '发起成功'
+            })
+            loading.close();
+            this.resetting()
+          } else {
+            this.$message({
+              type: 'error',
+              message: data.message
+            })
+          }
+        })
+
+        
+      },
+      gettime() {
+        // 获取当前时间
+        let currentTime = new Date();
+
+        // 获取年份
+        let year = currentTime.getFullYear();
+
+        // 获取月份（注意月份是从0开始计数的，所以需要加1）
+        let month = currentTime.getMonth() + 1;
+
+        // 获取日期
+        let day = currentTime.getDate();
+
+        // 获取小时
+        let hours = currentTime.getHours();
+
+        // 获取分钟
+        let minutes = currentTime.getMinutes();
+
+        // 获取秒数
+        let seconds = currentTime.getSeconds();
+
+        // 获取毫秒数
+        let milliseconds = currentTime.getMilliseconds();
+
+        // 格式化时间为 YYYY-MM-DD
+        let formattedDate = `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 HH:MM:SS
+        let formattedTime =
+          `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        // 格式化时间为 YYYY-MM-DD HH:MM:SS
+        let formattedDateTime = `${formattedDate} ${formattedTime}`;
+        return formattedDateTime
+
+      },
+      removeinfozz(row, e) {
+        let that = this
+        this.$confirm('确定要终止合同吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cereContractInformation({
+            ...row,
+            contractChangeReason: e,
+            status: '3',
+            originalContractCode: row.contractNumber,
+            updateDate: that.gettime(),
+            createDate: that.gettime(),
+            contractChangeTime: that.gettime(),
+            updateUser:localStorage.getItem('roleName')
+          }).then(res => {
+            console.error(res)
+            if (res.code == 200) {
+              this.$message({
+                message: '终止成功',
+                type: 'success'
+              })
+              let c1 = row.shopNumber
+              modifyResourceStatus({
+                resourcesId: c1,
+                status:"0"
+              }).then(res => {
+                console.error(res)
+              })
+              // this.$emit('removeonaction', '1')
+              this.getAll()
+            } else {
+              this.$message({
+                message: res.msg,
+                type: 'error'
+              })
+            }
+
+          })
+        })
+      },
+      details(row,e) {
+        this.issp = e
+        this.detailsinfo = row
+        this.onaction = '3'
+      },
+      removeinfo(row, e) {
+        this.contractChangeReason = e
+        // console.error(this.contractChangeReason)
+        this.detailsinfo = row
+        this.onaction = '4'
       },
       async getAll() {
         const res = await changeContractInformationqueryByPage(this.pagequery)
@@ -176,9 +433,11 @@
       removeonaction(e) {
         console.error(e)
         this.onaction = e
+        this.pagequery.pageNumber = 0
+        this.getAll()
       },
       handleCurrentChange(val) {
-        this.pagequery.pageNumber = val-1
+        this.pagequery.pageNumber = val - 1
         this.getAll()
       },
       handleSizeChange(val) {
@@ -194,8 +453,9 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            contractName: '',
-            dataStatus:'1',
+            status:'',
+            contractType:'0',
+            contractName: ''
           },
           this.getAll()
       },
@@ -410,10 +670,5 @@
     padding: 0 0 !important;
   }
 
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
-  }
+
 </style>
diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json
index 4ee1bd8..05ac50b 100644
--- a/lvdao-miniapp/pages.json
+++ b/lvdao-miniapp/pages.json
@@ -448,6 +448,13 @@
 				}
 			},
 			{
+				"path": "weball/web",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": ""
+				}
+			},
+			{
 				"path": "tishi/tishi",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
diff --git a/lvdao-miniapp/pages/activityAdd/activityAdd.vue b/lvdao-miniapp/pages/activityAdd/activityAdd.vue
index 2530dfb..08bdf11 100644
--- a/lvdao-miniapp/pages/activityAdd/activityAdd.vue
+++ b/lvdao-miniapp/pages/activityAdd/activityAdd.vue
@@ -2,36 +2,36 @@
 	<view class="page">
 		<u-form :model="form" ref="uForm" label-position="left" :label-width="180">
 			<view class="add-list" style="padding-bottom: 0;">
-				<u-form-item label="*封面图片" borderBottom labelPosition="top">
+				<u-form-item :required="true" label="封面图片" borderBottom labelPosition="top">
 					<!-- <u-upload :action="$upload"  :auto-upload="true"  ref="uUpload" :max-count="1" ></u-upload> -->
 					<u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="1" :file-list="fist"
 						@on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
 				</u-form-item>
 			</view>
 			<view class="add-list" style="padding-bottom: 0;">
-				<u-form-item label="*活动名称" borderBottom>
+				<u-form-item :required="true" label="活动名称" borderBottom>
 					<u-input v-model="form.activityName"  />
 				</u-form-item>
-				<u-form-item label="*开始时间" borderBottom>
+				<u-form-item :required="true" label="开始时间" borderBottom>
 					<u-input v-model="form.startTime" type="select" @click="startShow = true" placeholder="请选择"/>
 					<u-picker mode="time" v-model="startShow" :params="params" @confirm="startTimeChange"></u-picker>
 				</u-form-item>
-				<u-form-item label="*结束时间" borderBottom>
+				<u-form-item :required="true" label="结束时间" borderBottom>
 					<u-input v-model="form.endTime" type="select" @click="endShow = true" placeholder="请选择"/>
 					<u-picker mode="time" v-model="endShow" :params="params" @confirm="endTimeChange"></u-picker>
 				</u-form-item>
-				<u-form-item label="*活动类型" borderBottom>
+				<u-form-item :required="true" label="活动类型" borderBottom>
 					<u-input v-model="form.activityType" type="select" @click="typeShow = true" placeholder="请选择"/>
 					<u-select v-model="typeShow" :list="typeList" @confirm="typeChange"></u-select>
 				</u-form-item>
-				<u-form-item label="*可参与人数" borderBottom>
+				<u-form-item :required="true" label="可参与人数" borderBottom>
 					<u-number-box v-model="form.maxParticipants" :input-width="'100%'" :min="0"></u-number-box>
 				</u-form-item>
-				<u-form-item label="*举办区域" borderBottom>
+				<u-form-item :required="true" label="举办区域" borderBottom>
 					<u-input v-model="form.region" />
 				</u-form-item>
-				<u-form-item label="*活动内容"  type = 'textarea'  borderBottom auto-height="100">
-					<u-input v-model="form.content" />
+				<u-form-item :required="true" label="活动内容" borderBottom label-position="top">
+					<u-input border type="textarea" height="150" v-model="form.content" />
 				</u-form-item>
 			</view>
 			
diff --git a/lvdao-miniapp/pages/advertisement/advertisement.vue b/lvdao-miniapp/pages/advertisement/advertisement.vue
index 201d46b..8bf51b9 100644
--- a/lvdao-miniapp/pages/advertisement/advertisement.vue
+++ b/lvdao-miniapp/pages/advertisement/advertisement.vue
@@ -42,7 +42,7 @@
 						<view>
 							<view class="goods-list-text">
 								<view class="goods-list-txt">广告位类型：{{item.advertisingType}}</view>
-								<view class="goods-list-txt">广告尺寸：{{item.dimensions}}</view>
+								<view class="goods-list-txt">广告尺寸：{{item.dimensions || '--'}}</view>
 							</view>
 							<view class="goods-list-text" v-if="item.advertisingType == '线上广告位'">
 								<view class="goods-list-txt">轮播顺序：<text>{{item.rotationOrder}}</text></view>
@@ -139,7 +139,7 @@
 				let items = JSON.stringify(item)
 				console.log(items)
 				uni.navigateTo({
-					url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+					url: `/pages/advertisementDetail/advertisementDetail?item=${encodeURIComponent(items)}`
 				})
 			},
 			
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index 2f8beca..686cc8a 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -57,7 +57,7 @@
 									<text>{{tableData.playDuration || '--'}}</text>
 								</view>
 							</u-col>
-							<u-col span="5" >
+							<u-col span="12" >
 								<view class="form-item">
 									<view class="label">推送地址：</view>
 									<text>{{tableData.pushAddress || '--'}}</text>
@@ -66,10 +66,11 @@
 							<u-col span="12">
 								<view class="form-item">
 									<view class="label">介绍：</view>
-									<view style='flex: 1;'>
-										<rich-text v-if="tableData.memo" :nodes="tableData.memo"></rich-text>
-										<text v-else>无</text>
-									</view>
+									<text v-if="!tableData.memo">无</text>
+								</view>
+								<view style='flex: 1;'>
+									<rich-text v-if="tableData.memo" :nodes="tableData.memo"></rich-text>
+									
 								</view>
 							</u-col>
 						</view>
@@ -196,7 +197,7 @@
 		},
 		onLoad(option) {
 			this.imgurl = this.$img
-			let data = JSON.parse(option.item)
+			let data = JSON.parse(decodeURIComponent(option.item))
 			console.log(data)
 			this.tableData = data
 			this.resourcesId = `gg${data.id}`
diff --git a/lvdao-miniapp/pages/field/field.vue b/lvdao-miniapp/pages/field/field.vue
index 4a7c2c2..54f49e9 100644
--- a/lvdao-miniapp/pages/field/field.vue
+++ b/lvdao-miniapp/pages/field/field.vue
@@ -96,7 +96,7 @@
 							<view class="retail-price">
 								<text>面积:</text>
 								<text class="max">{{item.actualArea}}</text>
-								<text class="min">/m²</text>
+								<text class="min">m²</text>
 							</view>
 						</view>
 					</view>
diff --git a/lvdao-miniapp/pages/home/home.scss b/lvdao-miniapp/pages/home/home.scss
index 6aa3ddf..6bf44f7 100644
--- a/lvdao-miniapp/pages/home/home.scss
+++ b/lvdao-miniapp/pages/home/home.scss
@@ -183,6 +183,7 @@
 	padding: 30rpx 0;
 	margin-top: 20rpx;
 	flex-wrap: wrap;
+	justify-content: space-around;
 	// justify-content: center;
 	.list{
 		display: flex;
diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue
index 0e1f1db..a012c01 100644
--- a/lvdao-miniapp/pages/home/home.vue
+++ b/lvdao-miniapp/pages/home/home.vue
@@ -65,14 +65,22 @@
 							<text>租广告</text>
 						</view>
 					</view>
-					<view class="list" @click="wuye">
+			<!-- 		<view class="list" @click="wuye">
+						<view class="icon">
+							<image :src="$imgUrl('/gouwulan.png')"></image>
+						</view>
+						<view class="title">
+							<text>商城</text>
+						</view>
+					</view> -->
+				<!-- 	<view class="list" @click="wuye">
 						<view class="icon">
 							<image :src="$imgUrl('/home4.png')"></image>
 						</view>
 						<view class="title">
 							<text>物业缴费</text>
 						</view>
-					</view>
+					</view> -->
 					<!-- 					<view class="list" @click="gopath('/pagesA/hxlist/hxlist')">
 						<view class="icon">
 							<image  :src="$imgUrl('/home4.png')"></image>
@@ -635,7 +643,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/advertisementDetail/advertisementDetail?item=${items}`
+						url: `/pages/advertisementDetail/advertisementDetail?item=${encodeURIComponent(items)}`
 					})
 				}
 
@@ -685,15 +693,18 @@
 
 			},
 			wuye() {
-				if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
-					uni.navigateTo({
-						url: `/pages/propertyPay/propertyPayList/propertyPayList`
-					})
-				}else{
-					uni.navigateTo({
-						url: `/pages/login/login`
-					})
-				}
+				uni.navigateTo({
+					url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
+				})
+				// if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
+				// 	uni.navigateTo({
+				// 		url: `/pages/propertyPay/propertyPayList/propertyPayList`
+				// 	})
+				// }else{
+				// 	uni.navigateTo({
+				// 		url: `/pages/login/login`
+				// 	})
+				// }
 				
 
 			},
diff --git a/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue b/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue
index 90ad0e5..f54abfc 100644
--- a/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue
+++ b/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue
@@ -23,7 +23,7 @@
 						<u-image  :src="imgurl+item.coverImage" border-radius="10"  height="110px" width="100%" style="margin-top:8px;margin-right:8px;" ></u-image>
 						<!-- <u-image  :src="$img+item.coverImage" border-radius="10" mode="heightFix"  style="margin-right:8px;height:110px" ></u-image> -->
 						<view class="info">
-							<view class="title">{{item.title}}</view>
+							<view class="title one-omit">{{item.title}}</view>
 							<view class="name">活动时间：{{item.startTime}}至{{item.endTime}}</view>
 							<view style="margin-top: 5px;height:23px;">
 								<u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 8db2c16..94163fa 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -50,12 +50,12 @@
 								<text>我的问卷</text>
 							</view>
 						</view> -->
-						<view class="service-list-list">
+						<view class="service-list-list" @click="myativity">
 							<view class="thumb">
 								<text v-if="Islogin">0</text>
 								<text v-else>{{activityNum}}</text>
 							</view>
-							<view class="name" @click="myativity">
+							<view class="name" >
 								<text>我的活动</text>
 							</view>
 						</view>
diff --git a/lvdao-miniapp/pages/participation/participation.scss b/lvdao-miniapp/pages/participation/participation.scss
index 77f47c5..463b8b9 100644
--- a/lvdao-miniapp/pages/participation/participation.scss
+++ b/lvdao-miniapp/pages/participation/participation.scss
@@ -170,10 +170,6 @@
 	}
 }
 .huo-card-item{
-					font-size: 20rpx;
-					line-height: 1.5;
-					white-space: nowrap; /* 防止文本换行 */
-					    text-overflow: ellipsis; /* 显示省略号 */
-					    /* 如果需要设置宽度，可以添加 width 属性 */
-					  overflow:hidden;
-				}
\ No newline at end of file
+	font-size: 20rpx;
+}
+			
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/participation/participation.vue b/lvdao-miniapp/pages/participation/participation.vue
index 4d6b48e..3494297 100644
--- a/lvdao-miniapp/pages/participation/participation.vue
+++ b/lvdao-miniapp/pages/participation/participation.vue
@@ -2,48 +2,54 @@
 	<!-- 活动参与 -->
 	<view class="page">
 		<view class="more page-box" @click="toMyAdd">
-			<u-section :bold="false" title="我的活动申请" sub-title='' :show-line="false" color="#0FBB59" >
+			<u-section :bold="false" title="我的活动申请" sub-title='' :show-line="false" color="#0FBB59">
 				<view slot="right">
 					<u-icon name="arrow-rightward" color="#0FBB59" size="28"></u-icon>
 				</view>
 			</u-section>
 		</view>
 		<!-- 搜索 -->
-	<!-- 	<view class="head-search">
+		<!-- 	<view class="head-search">
 			<u-search bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" :show-action="false" @search="search"></u-search>
 			<u-button type="success" @click="search">搜索</u-button>
 		</view> -->
-		<view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;" >
-			<u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
+		<view
+			style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;	margin: 22rpx 24rpx;overflow: hidden;">
+			<u-search
+				:action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}"
+				bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search"
+				@search="search" @custom="search"></u-search>
 		</view>
 		<view class="screen-list">
 			<u-dropdown menu-icon="arrow-down-fill" :title-size="24" :height="40">
-				<u-dropdown-item v-model="pageIndex.orderingRule" title="时间排序" :options="sortTypeOptions" @change="search"></u-dropdown-item>
-				<u-dropdown-item v-model="pageIndex.activeState" title="活动状态" :options="statusOptions" @change="search"></u-dropdown-item>
+				<u-dropdown-item v-model="pageIndex.orderingRule" title="时间排序" :options="sortTypeOptions"
+					@change="search"></u-dropdown-item>
+				<u-dropdown-item v-model="pageIndex.activeState" title="活动状态" :options="statusOptions"
+					@change="search"></u-dropdown-item>
 			</u-dropdown>
 		</view>
-		<!-- 订单列表 -->
 		<view class="goods-data">
-			<u-row gutter="16" class="goods-list">
-				<u-col span="6" v-for="(item,index) in datalist" :key="index"  @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >
-					<view class="demo-layout good-item" style="margin-bottom: 30rpx;">
-						<u-image  :src="imgurl+item.coverImage" border-radius="10" mode="heightFix" height="110px" style="margin-top:8px;margin-right:8px;" ></u-image>
+			<view style="width: 100%;display: flex;flex-wrap: wrap;">
+				<view style="width: 47%;margin-left: 2%;background: #fff;margin-bottom: 30rpx;padding: 20rpx;border-radius: 18rpx;"  v-for="(item,index) in datalist" :key="index" @click="toDetail(item.id)">
+					<view class="demo-layout good-item">
+						<u-image :src="imgurl+item.coverImage" border-radius="10" height="110px" width="100%"
+							style="margin-top:8px;margin-right:8px;"></u-image>
+						<!-- <u-image  :src="$img+item.coverImage" border-radius="10" mode="heightFix"  style="margin-right:8px;height:110px" ></u-image> -->
 						<view class="info">
-							<view class="title">{{item.activityName}}</view>
-							<view class="huo-card-item">活动日期：<span>{{item.startTime}}至{{item.endTime}}</span></view>
+							<view class="title one-omit" >{{item.activityName}}</view>
+							<view class="huo-card-item one-omit" style="margin: 14rpx 0;">活动日期：<span>{{item.startTime}}至{{item.endTime}}</span></view>
 							<view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view>
-						<view style="margin-top: 5px;height:23px">
-							<u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>
-							<u-tag text="未开始" type="info" mode="dark"  v-if="item.activeState==0"/>
-							<u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2"/>
-						</view>
+							<view style="margin-top: 5px;height:23px">
+								<u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1" />
+								<u-tag text="未开始" type="info" mode="dark" v-if="item.activeState==0" />
+								<u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2" />
+							</view>
 						</view>
 					</view>
-				</u-col>
-				
-			</u-row>
-			<!-- <u-loadmore :status="status" @loadmore='loading'/> -->
+				</view>
+			</view>
 		</view>
+
 		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
 			<u-button type="success" @click="toAdd">活动申请</u-button>
@@ -59,24 +65,37 @@
 				datalist: [],
 				total: 1,
 
-				sortTypeOptions: [
-					{ label: '正序', value: 1 },
-					{ label: '倒序', value: 2 },
+				sortTypeOptions: [{
+						label: '正序',
+						value: 1
+					},
+					{
+						label: '倒序',
+						value: 2
+					},
 				],
-				statusOptions: [
-					{ label: '进行中', value: 1 },
-					{ label: '已结束', value: 2 },
-					{ label: '未开始', value: 0 },
+				statusOptions: [{
+						label: '进行中',
+						value: 1
+					},
+					{
+						label: '已结束',
+						value: 2
+					},
+					{
+						label: '未开始',
+						value: 0
+					},
 				],
-				pageIndex :{
+				pageIndex: {
 					activityName: '', // 搜索项
 					orderingRule: 1, // 排序方式
-					activeState:null, // 活动状态
+					activeState: null, // 活动状态
 					pageNumber: 1,
 					pageSize: 10,
-					auditStatus:'3',
+					auditStatus: '3',
 				},
-				imgurl:''
+				imgurl: ''
 			}
 		},
 		onLoad() {
@@ -100,9 +119,9 @@
 			this.getAll()
 		},
 		methods: {
-			getAll(val){
-				this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',this.pageIndex,1).then(res => {
-				   this.datalist = res.data.data.content
+			getAll(val) {
+				this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST', this.pageIndex, 1).then(res => {
+					this.datalist = res.data.data.content
 				}).catch(err => {
 					console.log(err)
 					//请求失败
@@ -115,13 +134,13 @@
 				})
 			},
 			search() {
-				
-			this.getAll()
+
+				this.getAll()
 			},
-			
+
 			loading() {
 				let that = this
-				if(that.status == 'nomore') return;
+				if (that.status == 'nomore') return;
 				that.status = 'loading';
 				that.page = ++that.page;
 				setTimeout(() => {
@@ -129,22 +148,22 @@
 					that.status = that.list >= that.total ? 'nomore' : 'loadmore';
 				}, 300)
 			},
-			join(){
+			join() {
 				uni.navigateTo({
 					url: '/pages/mycreated/mycreated?id=1'
 				})
 			},
 			toAdd() {
-				uni.navigateTo({	
+				uni.navigateTo({
 					url: '/pages/activityAdd/activityAdd'
 				})
 			},
 			toDetail(item, path) {
-				
+
 				uni.navigateTo({
 					url: `${path}?item=${item}`
 				})
-				
+
 			},
 		}
 	}
@@ -152,4 +171,4 @@
 
 <style scoped lang="scss">
 	@import 'participation.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
index 2df432e..ae00b52 100644
--- a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
+++ b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
@@ -13,14 +13,14 @@
 				<view class="info-items">
 					<view class="info-item">
 						<view class="title">{{item.itemName}}</view>
-						<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.payPrice}}</text></view>
+						<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{ item.detailsVOList | jsitem}}</text></view>
 					</view>
 					<view class="info-item" style="color: #808080;">
 						<view class="left">单价：￥{{item.itemStandard}}</view>
 						<view class="right">费率：{{item.cheapRate}}%</view>
 					</view>
 					<view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0">
-						<view class="list" v-for="(item1,index1) in item.itemDetailsVOList">
+						<view v-if="item1.isshowxz" class="list" v-for="(item1,index1) in item.itemDetailsVOList">
 							<view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view>
 							<view class="info-item" style="margin-top: 6rpx;">
 								<text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text>
@@ -103,6 +103,20 @@
 				cent:{}
 			}
 		},
+		filters: {
+		
+			jsitem(e) {
+				// console.error(e)
+				let num = 0
+				for (let n = 0; n < e.length; n++) {
+					// num = num + Number(e[n].payPrice)
+					if(e[n].isshowxz){
+						num = num + Number(e[n].payPrice)
+					}
+				}
+				return num.toFixed(2)
+			}
+		},
 		onLoad(e) {
 			this.cent = JSON.parse(e.cent)
 			console.error(this.cent)
diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
index 9c30569..8d69771 100644
--- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
+++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
@@ -45,7 +45,7 @@
 									</view>
 									<view class="info-item">
 										<text style="margin-right: 20rpx;">单价：￥{{item.itemStandard}}</text>
-										<text>费率：{{item.cheapRate}}%</text>
+										<text>费率：{{item.cheapRate || 0}}%</text>
 									</view>
 								</view>
 							</view>
@@ -123,6 +123,7 @@
 </template>
 
 <script>
+	import { toMiniPay } from "@/utils/tool.js"
 	export default {
 		data() {
 			return {
@@ -313,7 +314,7 @@
 
 				// })
 			},
-			submit() {
+			async submit() {
 
 				// console.log(this.recordList)
 				let c1 = []
@@ -350,80 +351,21 @@
 					"paymentContent": JSON.stringify(c1)
 				}
 				console.log(info)
-				this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => {
+				const payId = await this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => {
 					console.error(res.data)
+					let c1 = res.data.data.split('=')[1]
+					console.error(c1)
 					if(res.data.code =='200') {
-						uni.navigateTo({
-							url:'/pagesA/payweb/payweb?url='+escape(res.data.data)
-						})
+						return c1
+						
+						// uni.navigateTo({
+						// 	url:'/pagesA/payweb/payweb?url='+escape(res.data.data)
+						// })
 					}
 				})
-				return
-				// 	this.loadShow = true
-				// setTimeout(()=>{
-				// 	this.loadShow = false
-				// },2000)
-				if (this.fangshi == '付款码扫码支付') {
-					this.joinShow = false
-
-				} else {
-					let payList = {
-						additional: "附加交易授权",
-						backUrl: "",
-						channelId: "",
-						expireTime: 1800,
-						finishUrl: "",
-						latitude: "1",
-						longitude: "1",
-						orderNo: "",
-						payId: "",
-						payMerData: [{
-							amount: 1,
-							body: "物业缴费",
-						}],
-						payType: "Online",
-						returnUrl: "",
-						showBtn: "1",
-						siteId: "",
-						toApp: "0",
-						totalAmount: 1,
-						uid: "1693617316237021185",
-						universalLink: ""
-					}
-					const randomNumber = Math.floor(Math.random() * 10000); // 生成一个0到9999之间的随机数
-					const timestamp = new Date().getTime(); // 获取当前时间的时间戳
-					payList.orderNo = `${randomNumber}${timestamp}`
-
-					payList.uid = uni.getStorageSync('shopId')
-					this.$http.sendRequest('/aggregationPayment/createOrder', 'POST', payList, 1).then(res => {
-						console.log(JSON.parse(res.data.data).data.codeUrl)
-						let url = JSON.parse(res.data.data).data.codeUrl
-
-						// window.location.href = url
-						// plus.runtime.openURL(url , function(e) {console.log(e)})
-						uni.showModal({
-							title: res.data.message,
-							showCancel: false,
-							success: ress => {
-								uni.switchTab({
-									url: '/pages/home/home'
-								})
-							}
-						})
-					})
-
-					this.joinShow = false
-					// uni.showModal({
-					// 	title: '支付成功	',
-					// 	showCancel:false,
-					// 	success:ress => {
-					// 		uni.switchTab({
-					// 			url: '/pages/home/home'
-					// 		})
-					// 	}
-					// })
-				}
-
+				const payIdbackPath= '/pages/home/home'
+				await toMiniPay(payId,payIdbackPath)
+				
 			},
 			confirm(e) {
 				console.log(e)
@@ -437,7 +379,7 @@
 					this.recordList = res.data.data.detailsVOList.map(item => {
 						item.isxl = true
 						item.isshowxz = false
-						item.detailsVOList = item.detailsVOList.map(item1 => {
+						item.detailsVOList = item.itemDetailsVOList.map(item1 => {
 							item1.isshowxz = false
 							return item1
 						})
diff --git a/lvdao-miniapp/pages/shops/shops.vue b/lvdao-miniapp/pages/shops/shops.vue
index 1e32eb9..45da886 100644
--- a/lvdao-miniapp/pages/shops/shops.vue
+++ b/lvdao-miniapp/pages/shops/shops.vue
@@ -67,7 +67,7 @@
 								<text class="line"></text> -->
 								<text>面积:</text>
 								<text class="max">{{item.actualUsableArea}}</text>
-								<text class="min">/m²</text>
+								<text class="min">m²</text>
 							</view>
 						</view>
 					</view>
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index 9866d3f..34b26e6 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -190,7 +190,7 @@
 							path: '/pages/activityAdd/activityAdd'
 						},
 						{
-							name: '意向申请',
+							name: '寻租申请',
 							img: '/yxsq.png',
 							path: '/pages/rsaManagement/rsaManagement'
 						},
@@ -252,9 +252,14 @@
 							img: '/zjjf.png',
 							path: '/pagesA/rentPay/rentPay'
 						},
+						{
+							name: '物业缴费',
+							img: '/shuidichou.png',
+							path: '/pages/propertyPay/propertyPayList/propertyPayList'
+						},
 					]
 				}, ],
-pageList6: [{
+				pageList6: [{
 					id: 5,
 					title: '推广管理',
 					children: [{
@@ -305,8 +310,13 @@ pageList6: [{
 			async toPath1(path) {
 				let c1 = uni.getStorageSync('user').phone
 				// let c1 = '18188305496'
-				await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => {
-					if(res.data.data.list.length>0) {
+				await this.$http.sendRequest('/check/getAll', 'POST', {
+					"shopPhone": c1,
+					"checkState": "1",
+					"page": 1,
+					"pageSize": 1
+				}, 1).then(res => {
+					if (res.data.data.list.length > 0) {
 						uni.setStorageSync('shopId', res.data.data.list[0].shopId);
 					} else {
 						// uni.show
diff --git a/lvdao-miniapp/pagesA/addsb/addsb.vue b/lvdao-miniapp/pagesA/addsb/addsb.vue
index 075be55..a2aea58 100644
--- a/lvdao-miniapp/pagesA/addsb/addsb.vue
+++ b/lvdao-miniapp/pagesA/addsb/addsb.vue
@@ -2,23 +2,23 @@
 	<view class="appbox">
 
 		<view style="display: flex;" v-if="type == '1'">
-			<view @click="changeonindex('意见反馈')" :class="onindex == '意见反馈'?'onclasst1':'classt1'">
-				意见反馈
+			<view @click="changeonindex('事件上报')" :class="onindex == '事件上报'?'onclasst1':'classt1'">
+				事件上报
 				<view class="onindex"></view>
 			</view>
-			<view @click="changeonindex('我的反馈')" :class="onindex == '我的反馈'?'onclasst1':'classt1'">
-				我的反馈
+			<view @click="changeonindex('我的上报')" :class="onindex == '我的上报'?'onclasst1':'classt1'">
+				我的上报
 				<view class="onindex"></view>
 			</view>
 		</view>
 		<view style="display: flex;" v-if="type == '2'">
-			<view :class="onindex == '意见反馈编辑'?'onclasst1':'classt1'">
-				意见反馈编辑
+			<view :class="onindex == '事件上报编辑'?'onclasst1':'classt1'">
+				事件上报编辑
 				<view class="onindex"></view>
 			</view>
 		</view>
 		<view style="flex: 1;overflow-y: scroll;">
-			<view v-if="onindex == '意见反馈'" style="overflow-y: scroll;height: 100%;">
+			<view v-if="onindex == '事件上报'" style="overflow-y: scroll;height: 100%;">
 				<view class="fromitem">
 					<view class="t1 tit1">
 						上报位置
@@ -54,7 +54,7 @@
 					<u-button style="width: 100%;" type="success" @click="submit">提交</u-button>
 				</view>
 			</view>
-			<scroll-view style="height: 100%;" scroll-y v-if="onindex == '我的反馈'" @scrolltolower="scrolltolower">
+			<scroll-view style="height: 100%;" scroll-y v-if="onindex == '我的上报'" @scrolltolower="scrolltolower">
 				<view v-if="mylist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 				<view style="background: #fff;border-radius: 18rpx;padding: 30rpx;margin-top: 30rpx;"
 					v-for="(item,index) in mylist">
@@ -86,7 +86,7 @@
 					</view>
 				</view>
 			</scroll-view>
-			<view v-if="onindex == '意见反馈编辑'">
+			<view v-if="onindex == '事件上报编辑'">
 				<view class="fromitem">
 					<view class="t1 tit1">
 						上报位置
@@ -142,7 +142,7 @@
 				typeShow: false,
 				typeList: [],
 				ontype: null,
-				onindex: '意见反馈',
+				onindex: '事件上报',
 				form: {
 					problemDescribe: '',
 					reportLocation: '',
@@ -190,7 +190,7 @@
 			},
 			qux() {
 				this.type = '1'
-				this.changeonindex('我的反馈')
+				this.changeonindex('我的上报')
 			},
 			remove(e) {
 				this.removeinfo = e
@@ -202,7 +202,7 @@
 				})
 				this.ontype = this.removeinfo.eventTypeName;
 				console.error(this.fist)
-				this.onindex = '意见反馈编辑'
+				this.onindex = '事件上报编辑'
 				this.type = '2'
 			},
 			removeonfo() {
@@ -219,7 +219,7 @@
 						})
 						setTimeout(() => {
 							this.type = '1'
-							this.changeonindex('我的反馈')
+							this.changeonindex('我的上报')
 						}, 1000);
 					} else{
 						uni.showToast({
@@ -253,9 +253,9 @@
 				this.mylist = []
 				this.ontype = null
 				this.page = 0
-				if (this.onindex == '意见反馈') {
+				if (this.onindex == '事件上报') {
 
-				} else if (this.onindex == '我的反馈') {
+				} else if (this.onindex == '我的上报') {
 					this.gain()
 				}
 			},
@@ -291,7 +291,7 @@
 							userPhone: uni.getStorageSync('user').phone,
 						}
 						setTimeout(() => {
-							this.changeonindex('我的反馈')
+							this.changeonindex('我的上报')
 						}, 1000);
 					} else{
 						uni.showToast({
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
index 0834e19..dfb418f 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
@@ -49,12 +49,12 @@
 
 				<view class="form-item">
 					<view class="label">实际使用面积</view>
-					<text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}/M²</text>
+					<text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}m²</text>
 					<text  v-else>无</text>
 				</view>
 				<view class="form-item">
 					<view class="label">产权面积</view>
-					<text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}/M²</text>
+					<text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}m²</text>
 					<text v-else>无</text>
 				</view>
 				<view class="form-item">
@@ -179,8 +179,9 @@
 				:custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
 		<view class="page-footer" v-if="record.dataStatus =='1' ">
 			<u-button  style="background-color: #DFE0E4; flex: 1; margin: 0 10px;"
-				@click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')">申请退租</u-button>
-			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true">申请续租</u-button>
+				@click="getQuit('/pagesA/myZiyuan/myZiyuanQuit','0')">申请退租</u-button>
+				<!-- <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true">申请续租</u-button> -->
+			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit','1')">申请续租</u-button>
 			<u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)"
 				v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
 		</view>
@@ -277,9 +278,9 @@
 
 		},
 		methods: {
-			getQuit(urls) {
+			getQuit(urls,type) {
 				uni.navigateTo({
-					url: urls + `?ids=${this.heData.id}`
+					url: urls + `?ids=${this.heData.id}` + `&type=${type}`
 				})
 			},
 			xufirm() {
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
index 03d8a57..c81c963 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 
-		<view class="add-list">
+		<view class="add-list" >
 			<u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250">
 				<u-form-item label="*申请原因" prop="reasonForApplication" borderBottom>
 				</u-form-item>
@@ -10,7 +10,7 @@
 		</view>
 		<view class="add-list">
 			<u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250">
-				<u-form-item label="*申请退租时间" prop="applicationTime" borderBottom>
+				<u-form-item label="*申请时间" prop="applicationTime" borderBottom>
 					<u-input v-model="ruleForm.applicationTime" type="select" @click="busStartshow = true"
 						placeholder="请选择" :custom-style="selStyle" />
 					<u-picker mode="time" v-model="busStartshow" :params="params" @confirm="busStTimeChange"></u-picker>
@@ -59,6 +59,9 @@
 			if (option.ids) {
 				this.ruleForm.contractId = Number(option.ids)
 			}
+			if (option.type) {
+				this.ruleForm.contractType = option.type
+			}
 		},
 		onShow() {},
 		methods: {
@@ -79,29 +82,40 @@
 						icon: 'none',
 						title: '请输入申请原因'
 					});
-					return;
+					return false;
 				}
 				if (!this.ruleForm.applicationTime) {
 					uni.showToast({
 						icon: 'none',
 						title: '请选择退租申请时间'
 					});
-					return;
+					return false;
 				}
-
+				return true;
 			},
 			go() {
 				this.ruleForm.createUser = uni.getStorageSync('user').phone
 				this.ruleForm.createTime = this.getCurrentTime()
-				this.chek()
+				let c1 = this.chek()
+				if(!c1) {
+					return
+				}
 				this.$http.sendRequest('/changeContractInformation/add', 'POST', this.ruleForm, 1).then(res => {
-					uni.showToast({
-						title: '提交成功',
-						icon: 'none',
-					});
-					uni.switchTab({
-						url: '/pages/my/my'
-					});
+
+					if(res.data.code == '200') {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+						});
+						setTimeout(()=>{
+							uni.navigateBack()
+						},1000)
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+						});
+					}
 
 				})
 			},
diff --git a/lvdao-miniapp/pagesA/rentPay/goPay.vue b/lvdao-miniapp/pagesA/rentPay/goPay.vue
index d640e9d..2a028b8 100644
--- a/lvdao-miniapp/pagesA/rentPay/goPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/goPay.vue
@@ -9,7 +9,7 @@
 		</view>
 		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
-			<u-button style="width: 100%;border-radius: 15px;" type="success"  @click="submit">支付</u-button>
+			<u-button style="width: 100%;border-radius: 15px;" type="success" @click="submit">支付</u-button>
 		</view>
 	</view>
 </template>
@@ -18,68 +18,71 @@
 	export default {
 		data() {
 			return {
-				receivedMsg:[],
-				allPay:0
-				}
+				receivedMsg: [],
+				allPay: 0
+			}
 		},
 		onLoad(options) {
-		 if(options.msg){
-			let receivedMsg = JSON.parse(options.msg)
-			this.receivedMsg = receivedMsg
-			receivedMsg.map(item=>{
-				this.allPay += item.paymentAmount
-			})
-		 }
+			if (options.msg) {
+				let receivedMsg = JSON.parse(options.msg)
+				this.receivedMsg = receivedMsg
+				receivedMsg.map(item => {
+					this.allPay += item.paymentAmount
+				})
+			}
 		},
 		onShow() {
-				const isLogin = uni.getStorageSync('token');
-				if (isLogin == '') {
-					// 如果未登录，跳转到登录页面
-					uni.navigateTo({
-						url: '/pages/login/login'
-					})
-				} else {
-		
-					this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
-						 if(res.data.code == '20004' || res.data.code == '20003'){
-							 uni.navigateTo({
-							 	url: '/pages/login/login'
-							 })
-						 }
-					})
-				}
-		
-			},
-				methods: {
-					submit(){
-						
-						let arr = []
-						this.receivedMsg.map(item=>{
-							let obj = {
-								orderId:item.tenementOrder,
-								money:item.paymentAmount,
-							}
-							arr.push(obj)
+			const isLogin = uni.getStorageSync('token');
+			if (isLogin == '') {
+				// 如果未登录，跳转到登录页面
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					"pageSize": 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}).then(res => {
+					if (res.data.code == '20004' || res.data.code == '20003') {
+						uni.navigateTo({
+							url: '/pages/login/login'
 						})
-						
-						// return
-						this.$http.sendRequest('/order/rentAggregatePayment','POST',arr,3).then(res => {
-							console.log(JSON.parse(res.data.data).data.codeUrl)
-							 if(res.data.data){
-								 uni.redirectTo({
-								 	url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
-								 })
-							 }
+					}
+				})
+			}
+
+		},
+		methods: {
+			submit() {
+
+				let arr = []
+				this.receivedMsg.map(item => {
+					let obj = {
+						orderId: item.tenementOrder,
+						money: item.paymentAmount,
+					}
+					arr.push(obj)
+				})
+
+				// return
+				this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
+					console.log(JSON.parse(res.data.data).data.codeUrl)
+					if (res.data.data) {
+						uni.redirectTo({
+							url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
 						})
-					
 					}
-				}
-}				
-	
+				})
+
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-	.page{
+	.page {
 		position: absolute;
 		left: 0;
 		top: 0;
@@ -87,32 +90,36 @@
 		height: 100%;
 		padding: 0 20rpx;
 	}
-	.timsg{
-		height:20vh;
+
+	.timsg {
+		height: 20vh;
 		text-align: center;
 		padding: 50px 0;
-		.msgtitle{
+
+		.msgtitle {
 			margin-bottom: 20px;
 			font-size: 30rpx;
 			color: #A4A4A4;
 		}
+
 		.price {
 			color: #0FBB59;
 			font-size: 50rpx;
 			font-weight: 700;
 		}
 	}
-	.page-footer{
+
+	.page-footer {
 		position: fixed;
 		left: 0;
 		bottom: 0;
 		width: 100%;
-		
+
 		background-color: #FFFFFF;
 		padding: 20rpx 20rpx;
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 		z-index: 999;
-		
-			}
+
+	}
 </style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.scss b/lvdao-miniapp/pagesA/rentPay/rentPay.scss
index b21dd50..7fe5a70 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPay.scss
+++ b/lvdao-miniapp/pagesA/rentPay/rentPay.scss
@@ -96,10 +96,9 @@
 	bottom: 0;
 	width: 100%;
 	background-color: #FFFFFF;
-	padding: 10rpx 20rpx;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
+	padding: 30rpx;
 	z-index: 999;
+	box-sizing: border-box;
 	.footer-buy{
 		display: flex;
 		align-items: center;
@@ -112,14 +111,7 @@
 			min-width: 20%;
 			height: 70rpx;
 		}
- .buttons{
-	font-size: 30rpx;
 
-		margin: 0 10rpx !important;
-		height: 32px !important;
-		border-radius: 10rpx !important;
-		margin-top: 20rpx !important;
-}
 .u-size-default.data-v-3bf2dba7 {
   font-size: 30rpx;
 	    height: 100% !important;
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.vue b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
index 273e979..f46144a 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
@@ -219,10 +219,32 @@
 							payArr.push(item)
 						}
 					})
-					const msg = JSON.stringify(payArr)
-					uni.navigateTo({
-						url: `/pagesA/rentPay/goPay?msg=${msg}`
+					
+					let arr = []
+					payArr.map(item => {
+						let obj = {
+							orderId: item.tenementOrder,
+							money: item.paymentAmount,
+						}
+						arr.push(obj)
+					})
+					
+					// return
+					this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
+						console.log(res.data)
+						if (res.data.data) {
+							// uni.redirectTo({
+							// 	url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
+							// })
+						}
 					})
+					
+					
+					
+					// const msg = JSON.stringify(payArr)
+					// uni.navigateTo({
+					// 	url: `/pagesA/rentPay/goPay?msg=${msg}`
+					// })
 				}
 			},
 			confirm(e) {
diff --git a/lvdao-miniapp/pagesA/weball/web.vue b/lvdao-miniapp/pagesA/weball/web.vue
new file mode 100644
index 0000000..64512d6
--- /dev/null
+++ b/lvdao-miniapp/pagesA/weball/web.vue
@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:''
+			}
+		},
+		onLoad(e) {
+			if(e.url) {
+				this.url = e.url
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/lvdao-miniapp/static/icon/icon1.png b/lvdao-miniapp/static/icon/icon1.png
index db64251..51cc2dd 100644
--- a/lvdao-miniapp/static/icon/icon1.png
+++ b/lvdao-miniapp/static/icon/icon1.png
diff --git a/lvdao-miniapp/static/icon/icon11.png b/lvdao-miniapp/static/icon/icon11.png
index 515e69c..c201682 100644
--- a/lvdao-miniapp/static/icon/icon11.png
+++ b/lvdao-miniapp/static/icon/icon11.png
diff --git a/lvdao-miniapp/static/icon/icon12.png b/lvdao-miniapp/static/icon/icon12.png
index 01758eb..3fefc22 100644
--- a/lvdao-miniapp/static/icon/icon12.png
+++ b/lvdao-miniapp/static/icon/icon12.png
diff --git a/lvdao-miniapp/static/icon/icon13.png b/lvdao-miniapp/static/icon/icon13.png
index 00af973..6327c8c 100644
--- a/lvdao-miniapp/static/icon/icon13.png
+++ b/lvdao-miniapp/static/icon/icon13.png
diff --git a/lvdao-miniapp/static/icon/icon14.png b/lvdao-miniapp/static/icon/icon14.png
index e1b804a..63e387e 100644
--- a/lvdao-miniapp/static/icon/icon14.png
+++ b/lvdao-miniapp/static/icon/icon14.png
diff --git a/lvdao-miniapp/static/icon/icon15.png b/lvdao-miniapp/static/icon/icon15.png
index 98ec6b0..c1e5217 100644
--- a/lvdao-miniapp/static/icon/icon15.png
+++ b/lvdao-miniapp/static/icon/icon15.png
diff --git a/lvdao-miniapp/static/icon/icon16.png b/lvdao-miniapp/static/icon/icon16.png
index 0318489..1215999 100644
--- a/lvdao-miniapp/static/icon/icon16.png
+++ b/lvdao-miniapp/static/icon/icon16.png
diff --git a/lvdao-miniapp/static/icon/icon2.png b/lvdao-miniapp/static/icon/icon2.png
index c522de6..d124468 100644
--- a/lvdao-miniapp/static/icon/icon2.png
+++ b/lvdao-miniapp/static/icon/icon2.png
diff --git a/lvdao-miniapp/static/icon/icon4.png b/lvdao-miniapp/static/icon/icon4.png
index 10dc869..8963b94 100644
--- a/lvdao-miniapp/static/icon/icon4.png
+++ b/lvdao-miniapp/static/icon/icon4.png
diff --git a/lvdao-miniapp/static/icon/icon6.png b/lvdao-miniapp/static/icon/icon6.png
index fb8967c..d435dd6 100644
--- a/lvdao-miniapp/static/icon/icon6.png
+++ b/lvdao-miniapp/static/icon/icon6.png
diff --git a/lvdao-miniapp/static/icon/icon7.png b/lvdao-miniapp/static/icon/icon7.png
index e5e3c62..c70b747 100644
--- a/lvdao-miniapp/static/icon/icon7.png
+++ b/lvdao-miniapp/static/icon/icon7.png
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 0baf976..4f1d764 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,17 +21,17 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
 		
-		bases = 'http://128.10.249.23:9003'+ url;
+		// bases = 'http://128.10.249.8:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
-		// bases = c1 + 'cdwlMall/meserver/admin-server' + url;
+		bases = c1 + 'cdwlMall/meserver/admin-server' + url;
 		
 	}else if(baseUrl == 3){
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
-		bases = 'http://128.10.249.23:9007' + url;
-		// bases = c1 + 'cdwlMall/meserver/api' + url;
+		// bases = 'http://128.10.249.8:9007' + url;
+		bases = c1 + 'cdwlMall/meserver/api' + url;
 		
 	}else{
 		// bases = 'http://128.10.249.22:9004' + url;
@@ -39,9 +39,9 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
-		bases = 'http://128.10.249.23:9004' + url;
+		// bases = 'http://128.10.249.8:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
-		// bases = c1 + 'cdwlMall/business-server' + url;
+		bases = c1 + 'cdwlMall/business-server' + url;
 		
 	}
 	var token = uni.getStorageSync('token') || '';
diff --git a/lvdao-miniapp/utils/tool.js b/lvdao-miniapp/utils/tool.js
new file mode 100644
index 0000000..4544e05
--- /dev/null
+++ b/lvdao-miniapp/utils/tool.js
@@ -0,0 +1,25 @@
+export function toMiniPay(payId, backPath) {
+	return new Promise((resolve, reject) =>{
+		console.error(payId, backPath)
+		uni.navigateToMiniProgram({
+			appId: "wxf0f8b911ac324457", //支付小程序的 
+			path:`pages/common/travelMini?payId=${payId}`, // 打开支付小程序的指定页面
+			extraData: {}, //需要传递给目标小程序的数据
+			envVersion: "trial", //打开的对应小程序环境:开发 develop、体验 tria1、生产 release
+			success: function() {
+				resolve(); //成功回调
+			},
+			fail: function(res) {
+				console.log(res);
+				if (backPath) {
+					uni.reLaunch({
+						ur1: `${backPath}?paystate=CANCEL PAY`
+					});
+				} else {
+					console.log("取消支付就停留在当前页");
+				}
+				reject("跳转失败");
+			}
+		})
+	})
+}
\ No newline at end of file