diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 89e2702..2fb7494 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -1,5 +1,38 @@
 import request from '@/utils/request'
 // import request from '@/utils/request2'
+
+// 方案资源
+export function resourcesFindPlan(data) {
+  return request({
+    url: '/cereBusinessPlan/resourcesFindPlan',
+    method: 'post',
+    data
+  })
+}
+// 发消息
+export function sendToUser(data) {
+  return request({
+    url: '/cereMessage/sendToUser',
+    method: 'post',
+    data
+  })
+}
+// 修改查询合同的店铺
+export function cereAssetShopInformationedit(data) {
+  return request({
+    url: '/cereAssetShopInformation/edit',
+    method: 'post',
+    data
+  })
+}
+// 查询合同的店铺
+export function cereAssetShopInformationqueryByPage(data) {
+  return request({
+    url: '/cereAssetShopInformation/queryByPage',
+    method: 'post',
+    data
+  })
+}
 // 退租决算管理oa
 export function generalBySurrenderTenancy(data) {
   return request({
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index afd88a8..9aad14c 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -32,7 +32,26 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+            <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择"
+              style="margin-top:5px;width: 100%;" @change="lvdaoSel">
+              <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
+                :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+		
+        <el-col :span="12">
+          <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+            <el-select v-model="ruleForm.belongingParkTrail" placeholder="请选择" style="width: 100%;">
+              <el-option :label="item.name" :value="item.code" v-for="(item,index) in gongyuanList"
+                :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="归属部门" prop="department">
@@ -112,16 +131,16 @@
     miniioupload
   } from '../../api/commodityLease.js'
   import {
-    gongyuan,
-    addList,
-    editList
-  } from '../../api/map1.js';
-  import {
     changadd,
     changedit
   } from '../../api/information'
   import newmap from "@/components/newmap/indexall";
    import wangEditor from "@/components/editor/index"
+   import {
+    lvdaoduan,
+	parkTrails,
+  gongyuan
+  } from '@/api/information.js';
   export default {
     components: {
       upimg,
@@ -132,6 +151,7 @@
     },
     data() {
       return {
+        
         lat: 30.67,
         lng: 104.06,
         ontype: '线上广告位',
@@ -167,8 +187,15 @@
           phoneNumber: '', // 联系电话
           createDate: '', // 创建时间
           createUser: '', // 创建人
+          belongingGreenwaySection: '', // 所属绿道段
+          belongingParkTrail: '', // 所属公园/步道
         },
         rulesSt: {
+          belongingGreenwaySection: [{
+            required: true,
+            message: '请填写所属绿道段',
+            trigger: 'blur'
+          }, ],
           venueName: [{
             required: true,
             message: '请输入场地名称',
@@ -208,6 +235,7 @@
         uploadFiles: [],
         filesLength: 1,
         gongyuanList: [],
+        lvdaoList: [],
         fileData: [],
         parentMessage: {},
         edit: true
@@ -235,6 +263,9 @@
       } else {
 
       }
+      const lvdao = await lvdaoduan()
+	const gongyua  = await parkTrails() 
+	  this.lvdaoList = lvdao.data.concat(gongyua.data)
     },
     methods: {
       
diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue
index 9f46199..bb098d2 100644
--- a/admin-web-master/src/components/add/addht.vue
+++ b/admin-web-master/src/components/add/addht.vue
@@ -40,7 +40,8 @@
     cereContractTemplate,cerePlatformMerchant
   } from '@/api/newly.js'
   import {
-    dataInprotDocument,modifyResourceStatus
+    dataInprotDocument,modifyResourceStatus,
+    cereAssetShopInformationqueryByPage,cereAssetShopInformationedit
   } from '@/api/newly.js'
 import {
     msgedit
@@ -115,7 +116,8 @@ import {
           templateInformationUrl:''
         },
         templateAttachment:'',
-        AddData:[]
+        AddData:[],
+        dpinfo:null
       }
     },
     props: {
@@ -142,6 +144,12 @@ import {
         if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
           this.AddData.push(this.info.cereBasicInformationVenue)
         }
+        cereAssetShopInformationqueryByPage({"pageNumber":0,"pageSize":10,"contractId":this.info.id}).then(res => {
+          console.error(res.data.content)
+          if(res.data.content.length>0){
+            this.dpinfo = res.data.content[0]
+          }
+        })
         // for (let index = 0; index < this.shopList.length; index++) {
         //   const element = this.shopList[index];
         //   console.error(element)
@@ -256,6 +264,14 @@ import {
                 }).then(res => {
                   console.error(res)
                 })
+                if(this.dpinfo) {
+                  cereAssetShopInformationedit({
+                    ...this.dpinfo,
+                    contractId:res.data
+                  }).then(res => {
+                    console.error(res)
+                  })
+                }
                 this.$emit('removeonaction', '1')
               } else {
                 this.$message({
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index e76063d..099989e 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -1,6 +1,6 @@
 <template>
   <div >
-    <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="100px"
+    <el-form v-if="ontype =='线上广告位' && iShsow" :model="formInline" :rules="rules" ref="formInline" label-width="130px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
         <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -56,7 +56,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="100px"
+    <el-form v-if="ontype =='实体广告位' && iShsow" :model="formInline" :rules="rulesSt" ref="formInline" label-width="130px"
       class="demo-ruleForm">
       <el-form-item label="广告位类型" prop="advertisingType">
         <el-select @change="changeadvertisingType" v-model="formInline.advertisingType" placeholder="请选择" style="width: 100%;">
@@ -66,6 +66,19 @@
       <el-form-item label="广告位名称" prop="advertisingName">
         <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
       </el-form-item>
+      <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+        <el-select v-model="formInline.belongingGreenwaySection" placeholder="请选择"
+          style="margin-top:5px;width: 100%;" @change="lvdaoSel">
+          <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
+            :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+        <el-select v-model="formInline.belongingParkTrail" placeholder="请选择" style="width: 100%;">
+          <el-option :label="item.name" :value="item.code" v-for="(item,index) in gongyuanList"
+            :key="index"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="详细位置" prop="detailedLocation">
         <el-input v-model="formInline.detailedLocation"  :disabled="true"  placeholder="请地图标点选择位置" maxlength="100"></el-input>
       </el-form-item>
@@ -128,12 +141,13 @@
   import {
     miniioupload
   } from '../../api/commodityLease.js'
-  import {
-    gongyuan,
-    addList,
-    editList
-  } from '../../api/map1.js';
+ import { addList } from '@/api/map1.js';
  import wangEditor from "@/components/editor/index"
+ import {
+    lvdaoduan,
+	parkTrails,
+  gongyuan
+  } from '@/api/information.js';
   export default {
     components: {
       upimg,
@@ -186,9 +200,12 @@
           playDuration: null, // 播放时长
           pushAddress: '', // 推送地址
           memo: '', // 备注信息
-          onlineType: '' // 线上类型
+          onlineType: '' ,// 线上类型
+          belongingGreenwaySection: '', // 所属绿道段
+          belongingParkTrail: '', // 所属公园/步道
         },
         rules: {
+          
           advertisingType: [{
             required: true,
             message: '请选择广告类型',
@@ -216,6 +233,11 @@
           }],
         },
         rulesSt: {
+          belongingGreenwaySection: [{
+            required: true,
+            message: '请填写所属绿道段',
+            trigger: 'blur'
+          }, ],
           advertisingType: [{
             required: true,
             message: '请选择广告类型',
@@ -258,7 +280,8 @@
         fileData: [],
         parentMessage: {},
         edit: true,
-        iShsow:true
+        iShsow:true,
+        lvdaoList: [],
       };
     },
     props: {
@@ -303,6 +326,9 @@
           this.formInline.advertisingType = '实体广告位'
         }
       }
+      const lvdao = await lvdaoduan()
+	const gongyua  = await parkTrails() 
+	  this.lvdaoList = lvdao.data.concat(gongyua.data)
     },
     methods: {
       validateNumber(field, value) {
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index 81620fd..a19cf9e 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -228,7 +228,7 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-      <div v-if="info.dataStatus == '5' && issp == '2'" style="margin-top: 20px;">
+      <div v-if="info.dataStatus == '4' && issp == '2'" style="margin-top: 20px;">
         <TitleWithCircle title="审核情况"/>
         <div style="padding: 20px;">
           <el-form :model="info" label-width="100px" class="demo-ruleForm">
@@ -257,7 +257,7 @@
         </div>
       </div>
       <div>
-        <el-button v-if="info.dataStatus == '5' && issp == '2'" @click="minSev"
+        <el-button v-if="info.dataStatus == '4' && 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;"
@@ -354,9 +354,13 @@
       this.list1 = JSON.parse(this.info.templateInformation)
       console.log(this.list1)
       this.url = process.env.VUE_APP_DOMAIN_PREFIX_1
-      queryByContractcontractNumber({
+      let infonew = {
         contractNumber: this.info.contractNumber
-      }).then(res => {
+      }
+      if(this.info.dataStatus == 1) {
+        infonew.dataStatus = '1'
+      }
+      queryByContractcontractNumber(infonew).then(res => {
         console.error(res)
         // this.shop = res.data.shop
         this.siteIds = res.data.siteIds
@@ -376,6 +380,7 @@
     methods: {
       minSev() {
         editById({
+          isInterior:'1',
           contractNumber: this.info.contractNumber,
           dataStatus: this.radio,
           reviewComments: this.reviewComments?this.reviewComments:null
diff --git a/admin-web-master/src/components/buscha/busChanew.vue b/admin-web-master/src/components/buscha/busChanew.vue
index d14f5ee..a502651 100644
--- a/admin-web-master/src/components/buscha/busChanew.vue
+++ b/admin-web-master/src/components/buscha/busChanew.vue
@@ -13,7 +13,7 @@
                 <el-form-item label="申请理由" prop="contractType">
                   <div class="duiqi">{{newinfo.reasonForApplication || '-'}}</div>
                 </el-form-item>
-                <el-form-item label="申请时间" prop="contractNumber">
+                <el-form-item label="申请时间" prop="applicationTime">
                   <div class="duiqi">{{newinfo.applicationTime || '-'}}</div>
                 </el-form-item>
               </el-form>
@@ -162,7 +162,7 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-      <div v-if="newinfo.status == '1' && issp == '2'" style="margin-top: 20px;">
+      <div v-if="(newinfo.status == null || newinfo.status == '0') && issp == '2'" style="margin-top: 20px;">
         <TitleWithCircle title="审核情况"/>
         <div style="padding: 20px;">
           <el-form :model="info" label-width="100px" class="demo-ruleForm">
@@ -191,7 +191,7 @@
         </div>
       </div>
       <div>
-        <el-button v-if="newinfo.status == '1' && issp == '2'" @click="minSev"
+        <el-button v-if="(newinfo.status == null || newinfo.status == '0') && 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;"
@@ -319,7 +319,8 @@
         changeContractInformationedit({
           ...this.newinfo,
           status: this.radio,
-          reviewComments: this.reviewComments?this.reviewComments:null
+          reviewComments: this.reviewComments?this.reviewComments:null,
+          isInterior:'1',
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index bdcb5bf..7b635af 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -31,6 +31,16 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
+                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无' }}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
                     <el-form-item label="归属部门" prop="department">
                       <div  class="duiqi">{{editbgid.department  || '无'}}</div>
                     </el-form-item>
@@ -114,17 +124,30 @@
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
           <div style="margin-top: 30px;" class="editcss">
-            <!-- <TitleWithCircle title="招商方案信息" />
+            <TitleWithCircle title="招商方案信息" />
             <div style="padding: 20px;">
               <el-table :data="datalist1"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                 tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="招商方案名称" prop="planName" min-width="200">
+                <el-table-column label="招商方案名称" prop="planName">
                 </el-table-column>
-                <el-table-column label="创建日期" prop="createTime" min-width="100">
+                <el-table-column label="涵盖资源数" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建时间" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.createTime || '-' }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建人" prop="createUser">
+                  <template slot-scope="scope">
+                    {{scope.row.createUser || '-' }}
+                  </template>
                 </el-table-column>
               </el-table>
-            </div> -->
+            </div>
             <TitleWithCircle title="策略方案" />
             <div style="padding: 20px;">
               <el-table :data="datalist"
@@ -257,13 +280,18 @@
     cereResourceStrategylist,
     cereBusinessPlan,
     cereBusinessOperationqueryByPage,
-    cereContractInformation
+    cereContractInformation,resourcesFindPlan
   } from '@/api/newly';
   import newmap from "@/components/newmap/indexall";
   import {
     changedit
   } from '@/api/information'
   import allimg from '@/components/chakan/allimg.vue';
+  import {
+	gongyuan,
+	parkTrails,
+	lvdaoduan,
+  } from '@/api/information.js';
   export default {
     components: {
       TitleWithCircle,
@@ -312,7 +340,8 @@
         list: [],
         parentMessage: {},
         datalist: [],
-        datalist1:[]
+        datalist1:[],
+        lvdaoList:[]
       }
     },
     created() {
@@ -326,12 +355,20 @@
           console.error(res)
           this.datalist = res.data
         })
-        cereBusinessPlan(c1).then(res => {
-          console.error(res)
+        // cereBusinessPlan(c1).then(res => {
+        //   console.error(res)
+        //   this.datalist1 = res.data
+        // })
+        resourcesFindPlan( {resourceManagement: 'cd' + this.editbgid.id}).then(res => {
+          if (!Array.isArray(res.data)) {
+            this.datalist1 = [];
+            return;
+          }
           this.datalist1 = res.data
         })
         this.getAllxsj()
         this.getAllzl()
+        this.getAll()
       }
       
     },
@@ -339,6 +376,30 @@
 
     },
     methods: {
+      async	getAll(){
+			const lvdao = await lvdaoduan()
+			const gongyua  = await parkTrails() 
+			const budao = await gongyuan()
+			const lvList = lvdao.data.concat(gongyua.data)
+			
+			this.lvdaoList = lvList.concat(budao.data)
+		},
+      getLvdaoNameByCode(code) {
+		    // 若传入的 code 为空，直接返回空字符串
+		    if (!code) {
+		        return '';
+		    }
+		    // 遍历 this.lvdaoList 数组
+		    for (let i = 0; i < this.lvdaoList.length; i++) {
+		        const item = this.lvdaoList[i];
+		        // 当传入的 code 等于 item 的 code 时，返回 item 的 name
+		        if (item.code === code) {
+		            return item.name;
+		        }
+		    }
+		    // 若遍历完数组都没找到匹配的 code，返回空字符串
+		    return '无';
+		},
       open(row) {
         console.error(row)
         this.xiangTab= 'first'
diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue
index 91ed52b..9b3d326 100644
--- a/admin-web-master/src/components/chakan/map.vue
+++ b/admin-web-master/src/components/chakan/map.vue
@@ -6,7 +6,7 @@
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;">
-              <el-form :model="editbgid" ref="formInline" label-width="100px" class="demo-ruleForm">
+              <el-form :model="editbgid" ref="formInline" label-width="130px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="广告位名称" prop="advertisingName">
@@ -59,6 +59,16 @@
                 </el-row>
                 <el-row :gutter="20" v-if="editbgid.advertisingType == '实体广告位'">
                   <el-col :span="8">
+                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无' }}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
                     <el-form-item label="设备类型" prop="deviceType" >
                       <div class="duiqi">{{editbgid.deviceType || '无'}}</div>
                     </el-form-item>
@@ -125,17 +135,30 @@
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
           <div style="margin-top: 30px;" class="editcss">
-            <!-- <TitleWithCircle title="招商方案信息" />
+            <TitleWithCircle title="招商方案信息" />
             <div style="padding: 20px;">
               <el-table :data="datalist1"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                 tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="招商方案名称" prop="planName" min-width="200">
+                <el-table-column label="招商方案名称" prop="planName">
+                </el-table-column>
+                <el-table-column label="涵盖资源数" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
+                  </template>
                 </el-table-column>
-                <el-table-column label="创建日期" prop="createTime" min-width="100">
+                <el-table-column label="创建时间" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.createTime || '-' }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建人" prop="createUser">
+                  <template slot-scope="scope">
+                    {{scope.row.createUser || '-' }}
+                  </template>
                 </el-table-column>
               </el-table>
-            </div> -->
+            </div>
             <TitleWithCircle title="策略方案" />
             <div style="padding: 20px;">
               <el-table :data="datalist"
@@ -268,12 +291,17 @@
     cereBusinessOperationqueryByPage,
     cereResourceStrategylist,
     cereBusinessPlan,
-    cereContractInformation,
+    cereContractInformation,resourcesFindPlan
   } from '@/api/newly';
   import {
     editList
   } from '@/api/map1.js';
   import allimg from '@/components/chakan/allimg.vue';
+  import {
+	gongyuan,
+	parkTrails,
+	lvdaoduan,
+  } from '@/api/information.js';
   export default {
     components: {
       TitleWithCircle,
@@ -323,7 +351,8 @@
         list: [],
         parentMessage: {},
         datalist: [],
-        datalist1:[]
+        datalist1:[],
+        lvdaoList:[]
       }
     },
     created() {
@@ -341,8 +370,15 @@
           }
           this.datalist = res.data
         })
-        cereBusinessPlan(c1).then(res => {
-          console.error(res)
+        // cereBusinessPlan(c1).then(res => {
+        //   console.error(res)
+        //   if (!Array.isArray(res.data)) {
+        //     this.datalist1 = [];
+        //     return;
+        //   }
+        //   this.datalist1 = res.data
+        // })
+        resourcesFindPlan( {resourceManagement: 'gg' + this.editbgid.id}).then(res => {
           if (!Array.isArray(res.data)) {
             this.datalist1 = [];
             return;
@@ -353,12 +389,37 @@
         this.getAllzl()
       }
 
-
+      this.getAll()
     },
     computed: {
 
     },
     methods: {
+      async	getAll(){
+			const lvdao = await lvdaoduan()
+			const gongyua  = await parkTrails() 
+			const budao = await gongyuan()
+			const lvList = lvdao.data.concat(gongyua.data)
+			
+			this.lvdaoList = lvList.concat(budao.data)
+		},
+      
+      getLvdaoNameByCode(code) {
+		    // 若传入的 code 为空，直接返回空字符串
+		    if (!code) {
+		        return '';
+		    }
+		    // 遍历 this.lvdaoList 数组
+		    for (let i = 0; i < this.lvdaoList.length; i++) {
+		        const item = this.lvdaoList[i];
+		        // 当传入的 code 等于 item 的 code 时，返回 item 的 name
+		        if (item.code === code) {
+		            return item.name;
+		        }
+		    }
+		    // 若遍历完数组都没找到匹配的 code，返回空字符串
+		    return '无';
+		},
       open(row) {
         console.error(row)
         this.xiangTab= 'first'
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index bb1895b..d358e08 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -49,12 +49,12 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection)}}</div>
+                      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}</div>
                     </el-form-item>
                   </el-col>
 				  <el-col :span="8">
 				    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
-				      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail)}}</div>
+				      <div class="duiqi">{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}</div>
 				    </el-form-item>
 				  </el-col>
                   <el-col :span="8">
@@ -146,17 +146,30 @@
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
           <div style="margin-top: 30px;" class="editcss">
-            <!-- <TitleWithCircle title="招商方案信息" />
+            <TitleWithCircle title="招商方案信息" />
             <div style="padding: 20px;">
               <el-table :data="datalist1"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                 tooltip-effect="dark custom-tooltip-effect">
-                <el-table-column label="招商方案名称" prop="planName" min-width="200">
+                <el-table-column label="招商方案名称" prop="planName">
                 </el-table-column>
-                <el-table-column label="创建日期" prop="createTime" min-width="100">
+                <el-table-column label="涵盖资源数" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.resourceManagement?(scope.row.resourceManagement.split(',').length):0}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建时间" prop="createTime">
+                  <template slot-scope="scope">
+                    {{scope.row.createTime || '-' }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="创建人" prop="createUser">
+                  <template slot-scope="scope">
+                    {{scope.row.createUser || '-' }}
+                  </template>
                 </el-table-column>
               </el-table>
-            </div> -->
+            </div>
             <TitleWithCircle title="策略方案" />
             <div style="padding: 20px;">
               <el-table :data="datalist"
@@ -311,6 +324,7 @@
     cereBusinessPlan,
     cereBusinessOperationqueryByPage,
     cereContractInformation,
+    resourcesFindPlan
   } from '@/api/newly';
   import newmap from "@/components/newmap/index";
   import {
@@ -385,7 +399,14 @@
           }
           this.datalist = res.data
         })
-        cereBusinessPlan(c1).then(res => {
+        // cereBusinessPlan(c1).then(res => {
+        //   if (!Array.isArray(res.data)) {
+        //     this.datalist1 = [];
+        //     return;
+        //   }
+        //   this.datalist1 = res.data
+        // })
+        resourcesFindPlan( {resourceManagement: 'sp' + this.editbgid.id}).then(res => {
           if (!Array.isArray(res.data)) {
             this.datalist1 = [];
             return;
diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js
index a06cfd4..392cfce 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -32,8 +32,39 @@ Vue.prototype.$echarts = echarts
 
 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
 Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall`
+import {
+  sendToUser
+} from '@/api/newly.js'
+Vue.prototype.$setmsg = async function() {
 
-
+  let info = {
+    "content": "测试消息内容", // 消息内容
+    "messageClass": 1, // 消息类型（1:指定用户发送）
+    "messageType": "通知", // 消息类型描述
+    "cereMessageReceipts": [ // 接收人列表
+      {
+        "phone": '18121815567', // 用户ID
+        "messageType": "通知", // 消息类型
+        "content": "测试内容" // 消息内容
+      }
+    ]
+  }
+  await sendToUser(info).then(res => {
+    console.error(res)
+    if (res.code == 200) {
+      this.$message({
+        message: '发送成功',
+        type: 'success'
+      })
+      this.$emit('removeonaction', '1')
+    } else {
+      this.$message({
+        message: '发送失败',
+        type: 'error'
+      })
+    }
+  })
+};
 
 let host = window.location.host;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
diff --git a/admin-web-master/src/store/modules/settings.js b/admin-web-master/src/store/modules/settings.js
index b3f33f8..e8768f6 100644
--- a/admin-web-master/src/store/modules/settings.js
+++ b/admin-web-master/src/store/modules/settings.js
@@ -7,7 +7,7 @@ const state = {
   fixedHeader: fixedHeader,
   sidebarLogo: sidebarLogo
 }
-
+ 
 const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
     // eslint-disable-next-line no-prototype-builtins
diff --git a/admin-web-master/src/views/couponmanagement/capitalpool.vue b/admin-web-master/src/views/couponmanagement/capitalpool.vue
index c7dce7b..81f6b1a 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpool.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpool.vue
@@ -566,7 +566,7 @@
       async getAll() {
         const res = await getcereFundsPoolData(this.query)
         this.tableData = res.data.content
-        this.total = res.data.numberOfElements
+        this.total = res.data.totalElements
       },
       handleSizeChange(val) {
         this.query.pageSize = val
@@ -664,7 +664,7 @@
 <style scoped lang="scss">
 
   .el-table {
-    height: calc(100vh - 330px);
+   // height: calc(100vh - 330px);
   }
 
  
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index afc56db..8f2367e 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -98,8 +98,9 @@
             <template slot-scope="scope">
               <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
               <!--  -->
-              <div v-if='scope.row.dataStatus == 5 && scope.row.isInterior == 1'  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
-              <div v-if='scope.row.dataStatus == 4'  @click="remove(scope.row)" class="tableBtn greens">内部审核</div>
+              <!-- <div v-if='scope.row.dataStatus == 5 && scope.row.isInterior == 1'  @click="details(scope.row,'2')" class="tableBtn greens">审核</div> -->
+              <div v-if='scope.row.dataStatus == 4'  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
+              <!-- <div v-if='scope.row.dataStatus == 4'  @click="remove(scope.row)" class="tableBtn greens">内部审核</div> -->
               <div v-if='scope.row.dataStatus == 4'  @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
diff --git a/admin-web-master/src/views/shopRental/renewalMan/index.vue b/admin-web-master/src/views/shopRental/renewalMan/index.vue
index e24a54f..761b487 100644
--- a/admin-web-master/src/views/shopRental/renewalMan/index.vue
+++ b/admin-web-master/src/views/shopRental/renewalMan/index.vue
@@ -77,9 +77,10 @@
           <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 == null || scope.row.status == '0'"  @click="details(scope.row,'2')" 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 == 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>
diff --git a/admin-web-master/src/views/shopRental/rentTermination/add.vue b/admin-web-master/src/views/shopRental/rentTermination/add.vue
index 6928cd1..e33f93a 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/add.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/add.vue
@@ -2,7 +2,7 @@
   <div>
     <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
       <el-form-item label="退租日期" prop="exitDate">
-        <el-input v-model="info.contractTerminationDate" disabled></el-input>
+        <el-input v-model="info.applicationTime" disabled></el-input>
       </el-form-item>
       <el-form-item label="退租原因" prop="reasonForExit">
         <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.reasonForExit" placeholder="请输入退租原因"
@@ -33,7 +33,7 @@
           <div class="form-header">退租告知单</div>
           <div class="form-group">
             <label for="remarks">退租日期：</label>
-            <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.contractTerminationDate"></div>
+            <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.applicationTime"></div>
           </div>
           <div class="form-group">
             <label for="remarks">退租原因：</label>
@@ -162,7 +162,7 @@
         pdf.save('downloaded.pdf');
       },
       yulanShow() {
-        this.formInline.exitDate = this.info.contractTerminationDate
+        this.formInline.exitDate = this.info.applicationTime
         this.$refs.heForm.validate((valid) => {
           console.log(valid)
           if (valid) {
@@ -178,7 +178,7 @@
        
       },
       async add() {
-
+        let that = this
         console.log({...this.info})
         const content = this.$refs.contentToConvert;
 
@@ -188,28 +188,32 @@
         this.formInline.contractId = this.info.id
         this.formInline.tenantId = this.info.relatedMerchants
         this.formInline.tenantPhone = this.info.tenantTelephone
-        this.formInline.exitDate = this.info.contractTerminationDate
+        this.formInline.exitDate = this.info.applicationTime
         this.formInline.pdfUrl = canvas.toDataURL('image/png')
         console.log({...this.formInline})
         // return
         this.$refs.heForm.validate((valid) => {
           console.log(valid)
           if (valid) {
-            cereTerminateNotice(this.formInline).then(res => {
-              console.error(res)
-              if (res.code == 200) {
-                this.$message({
-                  message: '发送成功',
-                  type: 'success'
-                })
-                this.$emit('removeonaction', '1')
-              } else {
-                this.$message({
-                  message: '发送失败',
-                  type: 'error'
-                })
-              }
-            })
+            // 调用全局方法setmsg
+            that.$setmsg();
+          
+
+            // cereTerminateNotice(this.formInline).then(res => {
+            //   console.error(res)
+            //   if (res.code == 200) {
+            //     this.$message({
+            //       message: '发送成功',
+            //       type: 'success'
+            //     })
+            //     this.$emit('removeonaction', '1')
+            //   } else {
+            //     this.$message({
+            //       message: '发送失败',
+            //       type: 'error'
+            //     })
+            //   }
+            // })
           } else {
             this.$message({
               message: '请填写完整信息',
diff --git a/admin-web-master/src/views/shopRental/rentTermination/index.vue b/admin-web-master/src/views/shopRental/rentTermination/index.vue
index 0c588eb..aa6572a 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/index.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/index.vue
@@ -78,8 +78,9 @@
             <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="details(scope.row,'2')" 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>
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index 0424970..7fc259e 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -233,7 +233,12 @@
 					url: '/pages/login/login'
 				})
 			} else {
-
+				this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{phone:uni.getStorageSync('user').phone},1).then(res => {
+					console.error(res)
+				})
+				this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{phone:uni.getStorageSync('user').phone},1).then(res => {
+					console.error(res)
+				})
 				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({
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index 9431b63..42646cb 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -25,7 +25,13 @@
 				<view class="info">
 					<view class="nickname" @click="!user.name?gopath('/pages/login/login'):''">
 						<text style="width: 100%;" v-if="!user.name" >请登录</text>
-						<text v-else>{{user.name}}</text>
+						<view v-else>
+							<view style="font-size: 28rpx;
+					font-weight: bold;
+					color: #fff;">{{user.name}}</view>
+							<view style="font-size: 25rpx;
+					color: #fff;margin-top: 14rpx;">{{user.phone}}</view>
+						</view>
 					</view>
 				</view>
 				<view class="user-right">
diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
index 8d69771..1491181 100644
--- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
+++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
@@ -363,9 +363,10 @@
 						// })
 					}
 				})
-				const payIdbackPath= '/pages/home/home'
-				await toMiniPay(payId,payIdbackPath)
-				
+				if(payId) {
+					const payIdbackPath= '/pages/home/home'
+					await toMiniPay(payId,payIdbackPath)
+				}
 			},
 			confirm(e) {
 				console.log(e)
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.vue b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
index f46144a..cad2ed7 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPay.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPay.vue
@@ -27,7 +27,7 @@
 						<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false"
 							active-color="#0EBB5A" @change="xuanAll(item,$event)" />
 
-						<view class="list-item">
+						<view class="list-item" @click="changeitemisshowxz(index)">
 							<view class="list-info">
 								<view class="info-items">
 									<view class="info-title">{{formatTime(payNum,item.tenementOrderDate)}}应缴租金：</view>
@@ -60,6 +60,7 @@
 </template>
 
 <script>
+		import { toMiniPay } from "@/utils/tool.js"
 	export default {
 		data() {
 			return {
@@ -162,6 +163,11 @@
 
 		},
 		methods: {
+			changeitemisshowxz(index) {
+				this.recordList[index].gouxuan = !this.recordList[index].gouxuan
+				this.xuanAll(this.recordList[index],{value:this.recordList[index].gouxuan})
+				this.$forceUpdate()
+			},
 			 roundUpToTwoDecimals(num) {
 			    return Math.ceil(num * 100) / 100;
 			},
@@ -205,7 +211,7 @@
 					url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}`
 				})
 			},
-			joinShow() {
+			async joinShow() {
 				if (this.payAll == 0) {
 					uni.showToast({
 						icon: 'error',
@@ -230,14 +236,23 @@
 					})
 					
 					// return
-					this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
+					const payId =  this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
 						console.log(res.data)
+						console.log(JSON.parse(res.data.data).payUrl)
+						
 						if (res.data.data) {
+							let payUrl =  JSON.parse(res.data.data).payUrl
+							let c1 = payUrl.split('=')[1]
+							return c1
 							// uni.redirectTo({
 							// 	url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
 							// })
 						}
 					})
+					if(payId) {
+						const payIdbackPath= '/pages/home/home'
+						await toMiniPay(payId,payIdbackPath)
+					}