diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
index 111932a..51fbd42 100644
--- a/admin-web-master/dist.zip
+++ b/admin-web-master/dist.zip
diff --git a/admin-web-master/src/api/manage.js b/admin-web-master/src/api/manage.js
index 5565d1f..28a9873 100644
--- a/admin-web-master/src/api/manage.js
+++ b/admin-web-master/src/api/manage.js
@@ -1,4 +1,13 @@
 import request from '@/utils/request'
+// 合同修改
+
+export function edit(data) {
+  return request({
+    url: '/cereContractInformation/edit',
+    method: 'post',
+    data
+  })
+}
 // 合同查询new
 
 export function contractGetAllnew(data) {
diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index 1036f9b..2ad56a4 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -6,9 +6,10 @@ export function general(data) {
     url: '/oaInterconnection/general',
     method: 'post',
     data,
-    // headers: {
-    //   'Content-Type': 'Multipart/form-data'
-    // }
+    headers: {
+      // 'Content-Type': 'application/octet-stream'
+       'Content-Type': 'multipart/form-data'
+    }
   })
 }
 // 生成合同附件
diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue
index 13224f1..7f5d21d 100644
--- a/admin-web-master/src/components/add/addht.vue
+++ b/admin-web-master/src/components/add/addht.vue
@@ -108,7 +108,7 @@ import {
           // 合同附件
           appendicesContract: '',
           //合同状态
-          dataStatus: '1',
+          dataStatus: '4',
           //模版信息
           templateInformation:'',
           //模版url
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index ff21389..f5e55d7 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,10 +17,8 @@ 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 = 'http://128.10.249.47:9003';
-
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'http://192.168.2.225:9003';
+  baseURL = 'http://128.10.249.47:9003';
 
 } else {
   console.error('---------------------')
diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue
index 3f8a772..7f03875 100644
--- a/admin-web-master/src/views/promotion/contentMant.vue
+++ b/admin-web-master/src/views/promotion/contentMant.vue
@@ -85,7 +85,7 @@
 	       <el-table-column label="操作"  min-width="250" fixed="right">
 	         <template slot-scope="scope">
 	           <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
-	           <div @click="addbuss(3,scope.row)" class="tableBtn greens">宣传资料修改</div>
+	           <div @click="addbuss(3,scope.row)" class="tableBtn greens">修改</div>
 	           <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
 	         </template>
 	       </el-table-column>
@@ -229,7 +229,7 @@
             <wang-editor v-model="formInline.contentCompilation" ref="editor" :height="200"  v-else></wang-editor>
             
             </el-form-item>
-            <el-form-item :label="index!=3?'宣传资料上传':'宣传资料编辑'"  prop="accountNumber">
+            <el-form-item label="宣传资料上传"  prop="accountNumber">
             <!-- <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
                               :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
                                :auto-upload="true" v-if="index ==3 || index ==1">
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index ea97a95..0a3ec7f 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -87,6 +87,9 @@
               <span v-if='scope.row.dataStatus == 1'>使用中</span>
               <span v-else-if='scope.row.dataStatus == 2'>往期合同</span>
               <span v-else-if='scope.row.dataStatus == 3'>已终止</span>
+              <span v-else-if='scope.row.dataStatus == 4'>待发起</span>
+              <span v-else-if='scope.row.dataStatus == 5'>待审核</span>
+              <span v-else-if='scope.row.dataStatus == 6'>已拒绝</span>
               <span v-else>-</span>
             </template>
           </el-table-column>
@@ -94,7 +97,8 @@
           <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <!-- <div @click="OA(scope.row)" class="tableBtn greens">OA</div> -->
+              <!-- v-if='scope.row.dataStatus == 4' -->
+              <div  @click="OA(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>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
@@ -163,6 +167,7 @@
 <script>
   import {
     contractGetAllnew,
+    edit
   } from '@/api/manage.js'
   import add from '@/components/add/addht.vue'
   import addremove from '@/components/add/addremoveht.vue'
@@ -200,85 +205,91 @@
       this.getAll()
     },
     methods: {
-      async OA(row){
-        const response = await axios.get(this.$baseURL+row.appendicesContract);
+       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();
 
-        // 处理二进制数据
-        const blob = response.data;
-        console.log(blob);
+          // 清理生成的 URL 对象
+          window.URL.revokeObjectURL(url);
+          document.body.removeChild(link);
+
+          console.log('文件下载成功:', fileName);
+        } catch (error) {
+          console.error('文件下载失败:', error);
+        }
+      },
+      async OA(row){
+        console.log(this.$baseURL+row.appendicesContract)
+        const response = await axios({
+          method: 'get',
+          url: this.$baseURL + row.appendicesContract, // 文件 URL
+          responseType: 'arraybuffer' // 指定响应类型为二进制数据
+        });
+        console.log(JSON.stringify(response.data));
         // return
-        const base64Data = Buffer.from(blob, 'binary').toString('base64');
+        const buffer = Buffer.from(response.data);
+        const base64Data = buffer.toString('base64');
         console.log(base64Data);
+        // this.downloadBase64File(base64Data, 'contract_file', response.headers['content-type']);
         // return
-        const file = new File([blob], 'filename.txt', { type: 'text/plain' });
+        const file = new File([response.data], 'filename.txt', { type: 'text/plain' });
         console.log(file);
         let fd = new FormData();
-        fd.append('fileBytes', file); // 假设 formData 包含文件
-        fd.append('fileName', '"合同.txt"');
+        fd.append('files', file); // 假设 formData 包含文件
+        fd.append('reviewers', '1858710592190291968');
+        fd.append('fileNames', '合同.docx');
+        fd.append('title', '这是一个流程');
         console.log(fd);
-        let c1 = {
-          "title":"这是一个流程",
-          "files": [
-            {
-              fileName:'合同.txt',
-              fileBytes:base64Data
-              // fileBytes:'Y4EdWbGGg6gsD4eHlUR3aUmr0Xz050KI'
-            }
-          ],
-          "reviewers": ["1768540680428331008"],
-            // "account":"zsfu-test",
-            // "password":"000009",
-            // "accessKey":"HfHJ1cDCX4PuwSC5hox0cvJCdvnNFGOC",
-            // "secretAccessKey":"t05ebUtKp06004E90bfUBv1145R49Zg4",
-            // "sponsor":"1858710592190291968",
-            // // "id":"5c19f869063e57766b127177143e5c5d",
-            // "isonData":"这里是外部系统需要传递数据集合",
-            // "messageId":"外部系统唯一id",
-            // "reviewers":['1768540680428331008','1768539930201563136']
-        }
+        // return
+        // let c1 ={
+        //   "reviewers": '1858710592190291968',
+        //   "fileNames":'合同.docx',
+        //   "files":file,
+        //   "title": "这是一个流程"
+        // } 
         // c1.files.push(fd)
-        console.log(c1);
-        general(c1).then(res => {
-
+        // console.log(fd);
+        general(fd).then(res => {
+          console.log(res);
+          let data = JSON.parse(res.data)
+          if(data.code == '0'){
+            this.$message({
+              type: 'success',
+              message: '发起成功'
+            })
+            edit({
+              contractNumber: row.contractNumber,
+            dataStatus: '5',
+            }).then(res1 => {
+              console.error(res1)
+              this.resetting()
+            })
+          } else {
+            this.$message({
+              type: 'error',
+              message: data.message
+            })
+          }
         })
-        return
-        // URL.createObjectURL(this.$baseURL+row.appendicesContract)
-        const xhr = new XMLHttpRequest();
-        xhr.open('GET', this.$baseURL+row.appendicesContract, true);
-        xhr.responseType = 'blob'; // 设置响应类型为 blob
-
-        xhr.onload = () => {
-        if (xhr.status === 200) {
-          const blob = xhr.response;
-          console.log(blob);
-          // general({
-          //   "title":"这是一个流程",
-          //   "files": [{
-          //     "fileBytes":blob,
-          //     "fileName":"合同.txt"
-          //   }]
-          // }).then(res => {
-
-          // })
-          // 如果需要保存文件，可以创建一个 URL 对象并下载
-          const url = window.URL.createObjectURL(blob);
-          const link = document.createElement('a');
-          link.href = url;
-          console.log(link);
-          link.setAttribute('download', 'filename.ext'); // 设置下载的文件名
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link);
-        } else {
-          console.error('下载文件时出错:', xhr.status);
-        }
-        };
-
-        xhr.onerror = () => {
-        console.error('下载文件时出错');
-        };
 
-        xhr.send();
+        
       },
       gettime() {
         // 获取当前时间
diff --git a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
index c77f062..352748d 100644
--- a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
+++ b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
@@ -1,30 +1,35 @@
 <template>
 	<view class="page">
 		<view class="title-top">
-			<div class="left">
-				<text @click="show = true">2024年<u-icon name="arrow-down"></u-icon></text>
-				<u-picker v-model="show" mode="time" :params="{year: true}"></u-picker>
+			<div class="left" @click="show = true">
+				<text>{{year}}年<u-icon name="arrow-down"></u-icon></text>
+				<u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" />
+				<u-picker v-model="show" mode="time" :params="{year: true}" @confirm ="change"></u-picker>
 			</div>
-			<div class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</text></div>
+			<div class="right"><u-icon name="rmb"  class="price" /><text class="price">0</text></div>
 		</view>
+		<view v-if="dataList.length==0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<view class="record-list">
-			<view class="record-item" v-for="(item, index) in dataList" :key="index" @click="toDetail">
+			<view class="record-item" v-for="(item, index) in dataList" :key="index">
 				<view class="info-title">
-					<view class="title">7月</view>
-					<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</text></view>
+					<view class="title">{{item.yue}}月</view>
+					<view class="right"><u-icon name="rmb"  class="price" /><text class="price" >{{item.children | itemnum}}</text></view>
 				</view>
-				<view class="info-items" v-for="(v, i) in item.children" :key="i">
+				<view v-if="item.children.length==0" style="text-align: center;margin-top: 50rpx;margin-bottom: 30rpx;font-size: 24rpx;">暂无缴费数据</view>
+				<view class="info-items" v-for="(v, i) in item.children" :key="i" @click="toDetail(item.children)">
 					<view class="info-item">
-						<view class="left title">支付订单编号</view>
-						<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</text></view>
+						<view class="left title">{{v.transactionNumber}}</view>
+						<view class="right"><u-icon name="rmb"  class="price" /><text class="price">{{Number(v.actualPaymentFee)/100}}</text></view>
 					</view>
 					<view class="info-item">
-						<view class="left">物业费、服务费、卫生费</view>
-						<view class="right" style="color: #8A8A8A;">共3项</view>
+						<view class="left">
+							<text v-for="(t,a) in v.paymentContent">{{t.itemName}}</text>
+						</view>
+						<view class="right" style="color: #8A8A8A;">共{{v.paymentContent.length}}项</view>
 					</view>
 					<view class="info-item">
-						<view class="left" style="color: #0FBB59;">支付成功</view>
-						<view class="right" style="color: #8A8A8A;">07.11 15:21</view>
+						<view class="left" :style="v.orderStatus=='0'?'color: red;':v.orderStatus=='1'?'color: #0FBB59;':v.orderStatus=='2'?'color: red;':''">{{v.orderStatus=='0'?'待支付':v.orderStatus=='1'?'支付成功':v.orderStatus=='2'?'支付失败':'-'}}</view>
+						<view class="right" style="color: #8A8A8A;">{{v.paymentStartTime}}</view>
 					</view>
 				</view>
 			</view>
@@ -36,18 +41,140 @@
 	export default {
 		data() {
 			return {
+				year:'2025',
 				show: false,
 				dataList: [
-					{
-						children: [{}, {}]
+					{	yue:'1',
+						children: [
+							
+						]
 					},
-					{
-						children: [{}, {}]
+					{	yue:'2',
+						children: [
+							
+						]
+					},
+					{	yue:'3',
+						children: [
+							
+						]
+					},
+					{	yue:'4',
+						children: [
+							
+						]
+					},
+					{	yue:'5',
+						children: [
+							
+						]
+					},
+					{	yue:'6',
+						children: [
+							
+						]
+					},
+					{	yue:'7',
+						children: [
+							
+						]
+					},
+					{	yue:'8',
+						children: [
+							
+						]
+					},
+					{	yue:'9',
+						children: [
+							
+						]
+					},
+					{	yue:'10',
+						children: [
+							
+						]
+					},
+					{	yue:'11',
+						children: [
+							
+						]
+					},
+					{	yue:'12',
+						children: [
+							
+						]
 					},
 				]
 			}
 		},
+		onLoad() {
+			this.gain()
+		},
+		filters:{
+			itemnum(e){
+				// console.error(e)
+				let num = 0
+				for (let n = 0; n < e.length; n++) {
+					num = num + (Number(e[n].actualPaymentFee)/100)
+					// if(e[n].isshowxz){
+					// 	num = num + Number(e[n].payPrice)
+					// }
+				}
+				return num
+			}
+		},
+		computed:{
+			// allnum() {
+			// 	let num = 0 
+			// 	for (let i = 0; i < this.recordList.length; i++) {
+			// 		let list = this.recordList[i].itemDetailsVOList
+			// 		for (let n = 0; n < list.length; n++) {
+			// 			num = num + Number(list[n].payPrice)
+			// 		}
+			// 	}
+			// 	return num
+			// },
+			// allitemnum() {
+			// 	let num = 0
+			// 	for (let i = 0; i < this.recordList.length; i++) {
+			// 		let list = this.recordList[i].itemDetailsVOList
+			// 		for (let n = 0; n < list.length; n++) {
+			// 			if(list[n].isshowxz){
+			// 				num = num + Number(list[n].payPrice)
+			// 			}
+			// 		}
+			// 	}
+			// 	return num
+			// },
+		},
 		methods: {
+			change(e) {
+				console.error(e)
+				this.year = e.year
+				this.gain()
+			},
+			async gain() {
+				for (let i = 0; i < this.dataList.length; i++) {
+					let c1 ={
+						paymentAccount:uni.getStorageSync('user').phone, "pageSize":10,
+					    "pageNumber":0,
+					    "year":this.year,
+					    "month":this.dataList[i].yue,
+					}
+					await this.$http.sendRequest('cerePaymentInfo/queryByPage','POST',c1,1).then(res => {
+						this.dataList[i].children = res.data.data.content.map(item=>{
+							item.paymentContent = JSON.parse(item.paymentContent)
+							return item
+						})
+						// this.dataList = res.data.data.content.map(item=>{
+						// 	return item
+						// })
+						// console.error(this.dataList)
+					})
+				}
+				console.error(this.dataList)
+
+			},
 			toDetail() {
 				uni.navigateTo({
 					url: '/pages/propertyPay/payDetail/payDetail'
diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.scss b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.scss
index 186ee41..95e4748 100644
--- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.scss
+++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.scss
@@ -54,6 +54,8 @@
 			padding: 20rpx 30rpx;
 			border-bottom: #f6f6f6 solid 1rpx;
 			align-items: center;
+			font-size: 24rpx;
+			justify-content: space-between;
 			.list-item {
 				flex: 1;
 			}
@@ -62,7 +64,7 @@
 				display: flex;
 				align-items: center;
 				.img {
-					width: 72rpx;
+					// width: 72rpx;
 					height: 72rpx;
 					border-radius: 50%;
 					overflow: hidden;
@@ -82,7 +84,7 @@
 					.info-item {
 						font-size: 24rpx;
 						color: #808080;
-						margin-top: 20rpx;
+						margin-top: 10rpx;
 					}
 				}
 			}
diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
index d275cad..b7d19cb 100644
--- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
+++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
@@ -2,111 +2,114 @@
 	<view class="page">
 		<view class="search-box">
 			<view>
-				<u-input v-model="value" type="select" border @click="show = true" style="background-color: #F7F7F7;"/>
+				<u-input v-model="value" type="select" border @click="show = true" style="background-color: #F7F7F7;" placeholder="请选择店铺"/>
 				<u-select v-model="show" :list="list1" @confirm="confirm"></u-select>
 			</view>
 			<view class="search-total">
 				<view class="left">
-					<text class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</text>
-					<text>(含代缴费)</text>
+					<text class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />{{allnum}}</text>
+					<text style="margin-left: 20rpx;">(含代缴费)</text>
 				</view>
 				<div class="right" @click='toDetail'>
-					<text>缴费记录<u-icon name="arrow-right" style="margin-left: 8rpx;"></u-icon></text>
+					<text>缴费记录</text>
+					<u-icon name="arrow-right" style="margin-left: 8rpx;"></u-icon>
 				</div>
 			</view>
 		</view>
 		<!-- 记录列表 -->
-		<view class="record-list">
+		<view class="record-list" v-if="recordList.length>0">
 			<view class="record-list-box" v-for="(item,index) in recordList" :key="index">
 				<u-checkbox-group class="list-group" style="width: 100%;">
-						<view class="list">
-							<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" />
-							<view class="list-item">
-								<view class="list-info">
-									<view class="img">
-										 <image :src="$imgUrl('/img/2.jpg')"></image>
-									</view>
-									<view class="info-items">
-										<view class="info-title">{{item.name}}：<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</text></view>
-										<view class="info-item">
-											<text>单价：￥15</text>
-											<text>费率：100%</text>
-										</view>
+					<view class="list">
+						<u-checkbox @change="e=>quanxuanitem(e,index)" v-model="item.isshowxz" shape="circle" :label-disabled="false" />
+						<view class="list-item">
+							<view class="list-info">
+								<view class="img">
+									<image v-if="item.itemName == '物业费'" src="@/static/icon/icon11.png" mode="heightFix"></image>
+									<image v-else-if="item.itemName == '卫生费'" src="@/static/icon/icon12.png" mode="heightFix"></image>
+									<image v-else-if="item.itemName == '水费'" src="@/static/icon/icon13.png" mode="heightFix"></image>
+									<image v-else-if="item.itemName == '电费'" src="@/static/icon/icon14.png" mode="heightFix"></image>
+									<image v-else-if="item.itemName == '燃气费'" src="@/static/icon/icon15.png" mode="heightFix"></image>
+									<image v-else src="@/static/icon/icon16.png" mode="heightFix"></image>
+								</view>
+								<view class="info-items">
+									<view class="info-title">{{item.itemName}}：<text class="price"><u-icon name="rmb"
+												style="font-size: 24rpx;" />{{ item.itemDetailsVOList | jsitem}}</text></view>
+									<view class="info-item">
+										<text style="margin-right: 20rpx;">单价：￥{{item.itemStandard}}</text>
+										<text>费率：{{item.cheapRate}}%</text>
 									</view>
 								</view>
 							</view>
-							<view @click="recordList[index].showItem = !recordList[index].showItem"><u-icon name="arrow-right"></u-icon></view>
 						</view>
-						<view class="list" v-if="recordList[index].showItem">
-							<u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" />
-							<view class="">
-								<view class="info-item">周期：2022.02.22 - 2022.02.22</view>
-								<view class="info-item">
-									<text>数量：100m²</text>
-									<text>门店号：A5646</text>
+						<view><u-icon @click="changeisxl(index)" :name="item.isxl?'arrow-up':'arrow-down'"></u-icon></view>
+					</view>
+					<view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0 && item.isxl">
+						<view class="list" v-for="(item1,index1) in item.itemDetailsVOList">
+							<view style="display: flex;align-items: center;">
+								<u-checkbox v-model="item1.isshowxz" shape="circle" :label-disabled="false" />
+								<view class="">
+									<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>
+										<text>门店号：A5646</text>
+									</view>
 								</view>
 							</view>
 							<view class="">
-								<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />20.00</text>
+								<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />￥{{item1.payPrice}}</text>
 							</view>
 						</view>
+					</view>
 				</u-checkbox-group>
 			</view>
 		</view>
+		<view v-if="recordList.length==0" style="text-align: center;margin-top: 50rpx;" class="tit1">请选择店铺</view>
 		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
 			<view class="footer-buy">
-					<u-checkbox-group >
-							<u-checkbox 
-							shape="circle"
-								@change="quanxuan" 
-								v-model="showAll"
-							>全选</u-checkbox>
-						</u-checkbox-group>
+				<u-checkbox-group>
+					<u-checkbox shape="circle" @change="quanxuan" v-model="showAll">全选</u-checkbox>
+				</u-checkbox-group>
 				<view class="">
-					合计：<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</text>
+					合计：<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{allcknum}}</text>
 				</view>
 				<u-button type="success" style="margin: 0 10rpx;" @click="joinShow = true">去支付</u-button>
 			</view>
 		</view>
-		<u-popup class="userForm" v-model="joinShow" mode="center" :closeable="true" width="80%" >
-			<u-form class="form-box"  ref="uForm" :label-width="120" >
+		<u-popup class="userForm" v-model="joinShow" mode="center" :closeable="true" width="80%">
+			<u-form class="form-box" ref="uForm" :label-width="120">
 				<view style="padding: 30rpx;">
 					<view class="title">请选择支付方式</view>
 					<u-radio-group v-model="fangshi" @change="radioGroupChange" :wrap="true">
-								<u-radio 
-									@change="radioChange" 
-									v-for="(item, index) in list" :key="index" 
-									:name="item.name"
-									:disabled="item.disabled"
-									style="padding: 5px 0;"
-								>
-									{{item.name}}
-								</u-radio>
-							</u-radio-group>
-							<view class="" v-if="fangshi == 'H5支付'">
-							
-							</view>
-							<view class="" v-else>
-								<image :src="$imgUrl('/erwm.jpg')"   mode="widthFix"style="width: 80%;"/>
-								
-								
-							</view>
+						<u-radio @change="radioChange" v-for="(item, index) in list" :key="index" :name="item.name"
+							:disabled="item.disabled" style="padding: 5px 0;">
+							{{item.name}}
+						</u-radio>
+					</u-radio-group>
+					<view class="" v-if="fangshi == 'H5支付'">
+
+					</view>
+					<view class="" v-else>
+						<image :src="$imgUrl('/erwm.jpg')" mode="widthFix" style="width: 80%;" />
+
+
+					</view>
 					<!-- <u-form-item label="微信小程序支付">
 						
 					</u-form-item>
 					<u-form-item label="付款码扫码支付"></u-form-item> -->
 					<u-button type="success" @click="submit">提交</u-button>
-					
+
 				</view>
-				
+
 			</u-form>
-			
+
 		</u-popup>
-		 
+
 		<!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
 	</view>
-	
+
 </template>
 
 <script>
@@ -116,285 +119,275 @@
 				show: false,
 				joinShow: false,
 				value: '',
-				list1: [{ value: '0', label: '全部' },{ value: '1', label: '物业费' }, { value: '2', label: '水费' },{ value: '3', label: '卫生费' }, { value: '4', label: '燃气费' },{ value: '5', label: '电费' }	],
-				checked: [],
-				recordList:[
-					{
-						img: '',
-						name: '物业费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '卫生费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '水费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '电费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '燃气费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-				],
-				recordList1:[
-					{
-						img: '',
-						name: '物业费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '卫生费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '水费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '电费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
-					},
-					{
-						img: '',
-						name: '燃气费',
-						price: 15,
-						rate: '100%',
-						chilren: [],
-						showItem: false,
-						gouxuan:false
+				list1: [{
+					value: '0',
+					label: '全部'
+				}, {
+					value: '1',
+					label: '物业费'
+				}, {
+					value: '2',
+					label: '水费'
+				}, {
+					value: '3',
+					label: '卫生费'
+				}, {
+					value: '4',
+					label: '燃气费'
+				}, {
+					value: '5',
+					label: '电费'
+				}],
+				recordList: [],
+				list: [{
+						name: 'H5支付',
+						disabled: false
 					},
+					// {
+					// 	name: '付款码扫码支付',
+					// 	disabled: false
+					// }
 				],
-				list: [
-								{
-									name: 'H5支付',
-									disabled: false
-								},
-								// {
-								// 	name: '付款码扫码支付',
-								// 	disabled: false
-								// }
-							],
-							fangshi:'H5支付',
-							loadShow:false,
-							showAll:false,
-							
+				fangshi: 'H5支付',
+				showAll: false,
+
 			};
 		},
-		watch:{
-			recordList:{
-				deep:true,
-				handler(newVal){ 
-					 const allTrue = this.recordList.every(item => item.gouxuan)
-					 this.showAll = allTrue
+		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
+			}
+		},
+		computed:{
+			allnum() {
+				let num = 0 
+				for (let i = 0; i < this.recordList.length; i++) {
+					let list = this.recordList[i].itemDetailsVOList
+					for (let n = 0; n < list.length; n++) {
+						num = num + Number(list[n].payPrice)
+					}
+				}
+				return num
+			},
+			allcknum() {
+				let num = 0
+				for (let i = 0; i < this.recordList.length; i++) {
+					let list = this.recordList[i].itemDetailsVOList
+					for (let n = 0; n < list.length; n++) {
+						if(list[n].isshowxz){
+							num = num + Number(list[n].payPrice)
+						}
+					}
+				}
+				return num
+			},
+		},
+		watch: {
+			recordList: {
+				deep: true,
+				handler(newVal) {
+					for (let i = 0; i < this.recordList.length; i++) {
+						this.recordList[i].isshowxz = this.recordList[i].itemDetailsVOList.every(item => item.isshowxz)
+					}
+					const allTrue = this.recordList.every(item => item.isshowxz)
+					this.showAll = allTrue
+					
 				}
 			}
 		},
 		onShow() {
-		let shopId = {
-			shopId:uni.getStorageSync('shopId') || ''
-		}
-		  const isLogin = uni.getStorageSync('token');
-		  if (isLogin =='') { 
-		    // 如果未登录，跳转到登录页面
-		        	uni.navigateTo({
-		        	  url: '/pages/login/login'
-		        	})
-		  }else{
-			  let page={
-				condition:2
-			  }
-			 this.$http.sendRequest('/shop/getById', 'POST',shopId).then(res => {
-				 if(res.data.code !="20004"){
-					 this.shopMsg = res.data.data
-					 this.Islogin= false
-					 this.$http.sendRequest('/index/index', 'POST',page).then(res => {
-					 	//成功回调
-					 	this.tongji = res.data.data
-					 })
-				 }else{
-					 uni.navigateTo({
-					   url: '/pages/login/login'
-					 })
-				 }
-			 })
-		  }		
-		
+			let shopId = {
+				shopId: uni.getStorageSync('shopId') || ''
+			}
+			const isLogin = uni.getStorageSync('token');
+			if (isLogin == '') {
+				// 如果未登录，跳转到登录页面
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			} else {
+				
+				this.$http.sendRequest('cereAssetShopInformation/propertyQueryShopInformation', 'POST',{contactNumber:uni.getStorageSync('user').phone,pageNumber:1,pageSize:10} ,1).then(res => {
+					this.list1 = res.data.data.records.map(item=>{
+						let c1 = {
+							value: item.merchantId,
+							label: item.shopName,
+						}
+						return c1
+					})
+					// this.confirm(this.list1)
+					console.error(this.list1)
+				})
+			}
+
 		},
 		methods: {
-			quanxuan(e){	
-			
-			  const allTrue = this.recordList.every(item => item.gouxuan)
-			  if(allTrue){
-				  this.showAll = !this.showAll
-				  this.recordList.forEach(item => {
-				    item.gouxuan = !allTrue;
-				  });
-			  }else{
-				 this.showAll = true
-				  this.recordList.forEach(item => {
-				    item.gouxuan = !allTrue;
-				  });
-			  }
-	
-				
+		
+			changeisxl(e) {
+				this.recordList[e].isxl = !this.recordList[e].isxl
+			},
+			quanxuanitem(e,index) {
+				console.error(e)
+				console.error(this.recordList[index].itemDetailsVOList)
+				if (e.value) {
+					for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) {
+						this.recordList[index].itemDetailsVOList[i].isshowxz = true
+					}
+				} else {
+					for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) {
+						this.recordList[index].itemDetailsVOList[i].isshowxz = false
+					}
+				}
+			},
+			quanxuan(e) {
+				// this.showAll = e.value
+				console.error(e)
+				// const allTrue = this.recordList.every(item => item.gouxuan)
+				if (e.value) {
+					this.recordList = this.recordList.map(item=>{
+						item.isxl = true
+						item.isshowxz = true
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+							item1.isshowxz = true
+							return item1
+						})
+						return item
+					})
+				} else {
+					this.recordList = this.recordList.map(item=>{
+						item.isxl = true
+						item.isshowxz = false
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+							item1.isshowxz = false
+							return item1
+						})
+						return item
+					})
+				}
+
+
 			},
-			recordXq(item){
-				 const encodedItem = encodeURIComponent(JSON.stringify(item));
+			recordXq(item) {
+				const encodedItem = encodeURIComponent(JSON.stringify(item));
 				uni.navigateTo({
-				 url: `/pages/accepting/accepting?item=${encodedItem}`,
-				 })
+					url: `/pages/accepting/accepting?item=${encodedItem}`,
+				})
 			},
 			toDetail() {
 				uni.navigateTo({
 					url: '/pages/propertyPay/payRecord/payRecord'
 				})
 			},
-			contractdetail(){
+			contractdetail() {
 				// uni.navigateTo({
-				
+
 				// })
 			},
-			submit(){
-				
-			// 	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'
-						})
+			submit() {
+				console.log(this.recordList)
+				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'
+					// 		})
+					// 	}
+					// })
+				}
 
-			 this.joinShow = false
-			 	// uni.showModal({
-			 	// 	title: '支付成功	',
-			 	// 	showCancel:false,
-			 	// 	success:ress => {
-			 	// 		uni.switchTab({
-			 	// 			url: '/pages/home/home'
-			 	// 		})
-			 	// 	}
-			 	// })
-		 }
-		 
 			},
-			confirm(e){
+			confirm(e) {
 				console.log(e)
-				let arr =[]
-				if(e[0].label == '全部'){
-					this.recordList  = this.recordList1
-				}else{
-					this.recordList1.map(item =>{
-						if(item.name == e[0].label){
-							arr.push(item)
-						}
+					this.value = e[0].label
+				this.$http.sendRequest('eventReporting/propertyPayment', 'POST',{merchantId:e[0].value,pageNumber:1,pageSize:10} ,1).then(res => {
+					console.error(res)
+					this.recordList = res.data.data.itemDetailsVOList.map(item=>{
+						item.isxl = true
+						item.isshowxz = false
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+							item1.isshowxz = false
+							return item1
+						})
+						return item
 					})
-					this.recordList = arr 
-				}
-				this.value = e[0].label
-				
+				})
 			},
 			radioGroupChange(e) {
-						this.fangshi = e
-					}
+				this.fangshi = e
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 	@import 'propertyPayList.scss';
-</style> 
+	.tit1 {
+		color: #7a7a7a;
+		font-size: 26rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index d81ef1c..dc75231 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -133,8 +133,8 @@
 						children: [
 							{ name: '问卷调查', img: '/wjdc.png', path: '/pages/questionnaire/questionnaire' },
 							// { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
-							{ name: '我的活动', img: '/wdhd.png', path: '/pages/participation/participation' },
-							{ name: '活动申请', img: '/hdsq.png', path: '/pages/mycreated/mycreated' },
+							{ name: '活动参与', img: '/wdhd.png', path: '/pages/participation/participation' },
+							{ name: '活动申请', img: '/hdsq.png', path: '/pages/activityAdd/activityAdd' },
 							{ name: '意向申请', img: '/yxsq.png', path: '/pages/rsaManagement/rsaManagement' },
 						]
 					},
diff --git a/lvdao-miniapp/pagesA/addsb/addsb.vue b/lvdao-miniapp/pagesA/addsb/addsb.vue
index 355825c..075be55 100644
--- a/lvdao-miniapp/pagesA/addsb/addsb.vue
+++ b/lvdao-miniapp/pagesA/addsb/addsb.vue
@@ -55,7 +55,7 @@
 				</view>
 			</view>
 			<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 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">
 					<view style="display: flex;line-height: 50rpx;">
diff --git a/lvdao-miniapp/static/icon/icon11.png b/lvdao-miniapp/static/icon/icon11.png
new file mode 100644
index 0000000..515e69c
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon11.png
diff --git a/lvdao-miniapp/static/icon/icon12.png b/lvdao-miniapp/static/icon/icon12.png
new file mode 100644
index 0000000..01758eb
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon12.png
diff --git a/lvdao-miniapp/static/icon/icon13.png b/lvdao-miniapp/static/icon/icon13.png
new file mode 100644
index 0000000..00af973
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon13.png
diff --git a/lvdao-miniapp/static/icon/icon14.png b/lvdao-miniapp/static/icon/icon14.png
new file mode 100644
index 0000000..e1b804a
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon14.png
diff --git a/lvdao-miniapp/static/icon/icon15.png b/lvdao-miniapp/static/icon/icon15.png
new file mode 100644
index 0000000..98ec6b0
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon15.png
diff --git a/lvdao-miniapp/static/icon/icon16.png b/lvdao-miniapp/static/icon/icon16.png
new file mode 100644
index 0000000..0318489
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon16.png
diff --git a/lvdao-miniapp/static/icon/icon7.png b/lvdao-miniapp/static/icon/icon7.png
new file mode 100644
index 0000000..e5e3c62
--- /dev/null
+++ b/lvdao-miniapp/static/icon/icon7.png
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 9244e1d..34dfeb5 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,8 +1,8 @@
 
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
@@ -16,7 +16,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	}
 	var bases = ''
 	if(baseUrl == 1){
-		// bases = 'http://172.16.61.125:9003/' + url;
+		// bases = 'http://128.10.249.32:9003/' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
@@ -63,7 +63,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 			success(res) {
 				uni.hideLoading();
 				var code = res.data.code+'';
-				console.log("res",res)
+				// console.log("res",res)
 				switch (code) {
 					case '20001':
 						uni.showModal({