From c4af7f827a60004c74a5c687598f1403349b066c Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Thu, 6 Mar 2025 17:49:39 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist.zip                                            | Bin 5853563 -> 0 bytes
 admin-web-master/src/api/manage.js                                   |   9 +++++++++
 admin-web-master/src/components/add/addht.vue                        |   2 +-
 admin-web-master/src/utils/request.js                                |   4 ++--
 admin-web-master/src/views/shopRental/manage/index.vue               |  51 +++++++++++++++++++++++++++++++++++----------------
 lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue              |  27 +++++++++++++++++++++------
 lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.scss |   6 ++++--
 lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue  | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pagesA/addsb/addsb.vue                                 |   2 +-
 lvdao-miniapp/static/icon/icon11.png                                 | Bin 0 -> 1135 bytes
 lvdao-miniapp/static/icon/icon12.png                                 | Bin 0 -> 1404 bytes
 lvdao-miniapp/static/icon/icon13.png                                 | Bin 0 -> 1347 bytes
 lvdao-miniapp/static/icon/icon14.png                                 | Bin 0 -> 1228 bytes
 lvdao-miniapp/static/icon/icon15.png                                 | Bin 0 -> 1141 bytes
 lvdao-miniapp/static/icon/icon16.png                                 | Bin 0 -> 4241 bytes
 lvdao-miniapp/static/icon/icon7.png                                  | Bin 0 -> 1336 bytes
 lvdao-miniapp/utils/request.js                                       |   4 ++--
 17 files changed, 376 insertions(+), 338 deletions(-)
 delete mode 100644 admin-web-master/dist.zip
 create mode 100644 lvdao-miniapp/static/icon/icon11.png
 create mode 100644 lvdao-miniapp/static/icon/icon12.png
 create mode 100644 lvdao-miniapp/static/icon/icon13.png
 create mode 100644 lvdao-miniapp/static/icon/icon14.png
 create mode 100644 lvdao-miniapp/static/icon/icon15.png
 create mode 100644 lvdao-miniapp/static/icon/icon16.png
 create mode 100644 lvdao-miniapp/static/icon/icon7.png

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index 28a65f0..0000000
Binary files a/admin-web-master/dist.zip and /dev/null differ
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/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 283553d..6638354 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,11 +16,11 @@ let hostall = window.location.href;
 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://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://128.10.249.11:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'http://192.168.2.225:9003';
+  baseURL = 'http://128.10.250.209:9003';
 
 } else {
   console.error('---------------------')
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index ea97a95..641c360 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,7 @@
           <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> -->
+              <div v-if='scope.row.dataStatus == 4' @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 +166,7 @@
 <script>
   import {
     contractGetAllnew,
+    edit
   } from '@/api/manage.js'
   import add from '@/components/add/addht.vue'
   import addremove from '@/components/add/addremoveht.vue'
@@ -216,30 +220,45 @@
         fd.append('fileBytes', file); // 假设 formData 包含文件
         fd.append('fileName', '"合同.txt"');
         console.log(fd);
-        let c1 = {
-          "title":"这是一个流程",
+        let c1 ={
+          "account": "zsfu-test",
+          "password": "000009",
+          "accessKey": "HfHJ1cDCX4PuwSC5hoxQcvJCdvnNFG0C",
+          "secretAccessKey": "tO5ebUtKpO60o4E90bfUBvl145R49Zg4",
+          "id": "5c19f869063e57766b127177143e5c5d",
+          "sponsor": "1834057529668276224",
+          "reviewers": ["1858710592190291968"],
           "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']
-        }
+          "title": "这是一个流程"
+        } 
         // c1.files.push(fd)
         console.log(c1);
         general(c1).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)
diff --git a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
index c77f062..ae3a312 100644
--- a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
+++ b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
@@ -1,22 +1,23 @@
 <template>
 	<view class="page">
 		<view class="title-top">
-			<div class="left">
-				<text @click="show = true">2024年<u-icon name="arrow-down"></u-icon></text>
+			<div class="left" @click="show = true">
+				<text>2024年<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}"></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" style="font-size: 24rpx;" /><text class="price">6451.00</text></div>
 		</view>
 		<view class="record-list">
 			<view class="record-item" v-for="(item, index) in dataList" :key="index" @click="toDetail">
 				<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="right"><u-icon name="rmb" style="font-size: 24rpx;" /><text class="price">6451.00</text></view>
 				</view>
 				<view class="info-items" v-for="(v, i) in item.children" :key="i">
 					<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">{{item.orderNumber}}</view>
+						<view class="right"><u-icon name="rmb" style="font-size: 24rpx;" /><text class="price">500.00</text></view>
 					</view>
 					<view class="info-item">
 						<view class="left">物业费、服务费、卫生费</view>
@@ -47,7 +48,21 @@
 				]
 			}
 		},
+		onLoad() {
+			this.gain()
+		},
 		methods: {
+			gain() {
+				this.$http.sendRequest('cerePaymentInfo/queryByPage', 'POST',{paymentAccount:uni.getStorageSync('user').phone, "pageSize":10,
+    "pageNumber":0,
+    "year":"2025",
+    "month":"3"} ,1).then(res => {
+					this.dataList = res.data.data.content.map(item=>{
+						return item
+					})
+					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/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
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon11.png differ
diff --git a/lvdao-miniapp/static/icon/icon12.png b/lvdao-miniapp/static/icon/icon12.png
new file mode 100644
index 0000000..01758eb
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon12.png differ
diff --git a/lvdao-miniapp/static/icon/icon13.png b/lvdao-miniapp/static/icon/icon13.png
new file mode 100644
index 0000000..00af973
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon13.png differ
diff --git a/lvdao-miniapp/static/icon/icon14.png b/lvdao-miniapp/static/icon/icon14.png
new file mode 100644
index 0000000..e1b804a
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon14.png differ
diff --git a/lvdao-miniapp/static/icon/icon15.png b/lvdao-miniapp/static/icon/icon15.png
new file mode 100644
index 0000000..98ec6b0
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon15.png differ
diff --git a/lvdao-miniapp/static/icon/icon16.png b/lvdao-miniapp/static/icon/icon16.png
new file mode 100644
index 0000000..0318489
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon16.png differ
diff --git a/lvdao-miniapp/static/icon/icon7.png b/lvdao-miniapp/static/icon/icon7.png
new file mode 100644
index 0000000..e5e3c62
Binary files /dev/null and b/lvdao-miniapp/static/icon/icon7.png differ
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 1454b95..0523aef 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -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.250.25: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;
@@ -24,7 +24,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://128.10.249.21: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;
--
libgit2 0.21.4