'最新'

杨鑫
2 parents 52fc03a8 9d4471c1
Showing 15 changed files with 431 additions and 178 deletions
admin-web-master/src/components/add/addinformation.vue
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
admin-web-master/src/views/rent/audit/index.vue
lvdao-miniapp/main.js
lvdao-miniapp/pages.json
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
lvdao-miniapp/pages/my/my.vue
lvdao-miniapp/pages/procedureList/procedureList.vue
lvdao-miniapp/pages/propertyPay/payDetail/payDetail.scss
lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
lvdao-miniapp/pages/propertyPay/payRecord/payRecord.scss
lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
lvdao-miniapp/pagesA/payweb/payweb.vue
lvdao-miniapp/utils/request.js
@@ -62,35 +62,43 @@
         </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="houseNumber">
             <el-input v-model="ruleForm.houseNumber" placeholder="请输入" 
               maxlength="20"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="归属部门" prop="belongingDepartment">
             <el-input v-model="ruleForm.belongingDepartment" placeholder="请输入" maxlength="20">
             </el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="负责人" prop="head">
             <el-input v-model="ruleForm.head" placeholder="请输入" maxlength="10">
             </el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="联系人" prop="contacts">
             <el-input v-model="ruleForm.contacts" placeholder="请输入" maxlength="50">
             </el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="联系方式" prop="telephone">
             <el-input v-model="ruleForm.telephone" placeholder="请输入" maxlength="20">
@@ -152,7 +160,7 @@
     lvdaoduan,
     addList,
     editList
-  } from '../../api/information.js';
+  } from '@/api/information.js';
   import newmap from "@/components/newmap/index";
   export default {
     components: {
@@ -193,6 +193,12 @@
     cereResourceStrategy,
     editStatus
   } from '@/api/newly.js'
+  import {
+    getAlls,changAlls
+  } from '@/api/information';
+  import {
+    likeGet,
+  } from '@/api/map1'
    import cl from '@/components/change/cl.vue'
   export default {
     data() {
@@ -232,9 +238,48 @@
       this.getAll()
     },
     methods: {
-      openhet(row) {
+      async openhet(row) {
         this.formInline = row
-        this.onaction = '2'
+                console.error(row)
+                let list = []
+        if(row.cereBasicInformationShop && row.cereBasicInformationShop.id) {
+          const res = await getAlls({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereBasicInformationShop.id
+          })
+          list = res.data.content
+          
+        }
+        if(row.cereAdvertisingInformation && row.cereAdvertisingInformation.id) {
+          const res = await likeGet({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereAdvertisingInformation.id
+          })
+          list = res.data.content
+        }
+        if(row.cereBasicInformationVenue && row.cereBasicInformationVenue.id) {
+          const res = await changAlls({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereBasicInformationVenue.id
+          })
+          list = res.data.content
+        }
+        console.error(list)
+        if(list.length>0) {
+          this.onaction = '2'
+        } else {
+          this.$message({
+            message: '该资源已被租赁',
+            type: 'error'
+          })
+        }
+        
       },
       changeauditStatus() {
         AdvertiserInfoEdit({
@@ -162,6 +162,12 @@
   import addremove from '@/components/add/addremoveht.vue'
   import zl from '@/components/chakan/zl'
   import {
+    getAlls,changAlls
+  } from '@/api/information';
+  import {
+    likeGet,
+  } from '@/api/map1'
+  import {
     cereContractInformation
   } from '@/api/commodityLease.js'
   export default {
@@ -196,9 +202,49 @@
       this.getAll()
     },
     methods: {
-      openhet(row) {
+      async openhet(row) {
         this.formInline = row
-        this.onaction = '2'
+        // console.error(row)
+        let list = []
+        if(row.cereBasicInformationShop && row.cereBasicInformationShop.id) {
+          const res = await getAlls({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereBasicInformationShop.id
+          })
+          list = res.data.content
+          
+        }
+        if(row.cereAdvertisingInformation && row.cereAdvertisingInformation.id) {
+          const res = await likeGet({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereAdvertisingInformation.id
+          })
+          list = res.data.content
+        }
+        if(row.cereBasicInformationVenue && row.cereBasicInformationVenue.id) {
+          const res = await changAlls({
+            pageNumber: 0,
+            pageSize: 10,
+            publishStatus:'2',
+            id: row.cereBasicInformationVenue.id
+          })
+          list = res.data.content
+        }
+        console.error(list)
+        if(list.length>0) {
+          this.onaction = '2'
+        } else {
+          this.$message({
+            message: '该资源已被租赁',
+            type: 'error'
+          })
+        }
+        
+       
       },
             //删除
       async closemsg(e) {
@@ -8,13 +8,13 @@ import uView from &quot;uview-ui&quot;;
 import DialogBox from './components/DialogBox/DialogBox';
 //  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/'
 Vue.config.productionTip = false
 Vue.prototype.$http = http
 Vue.prototype.$imgUrl = (url) => {
-  // return (c1 + "cdwlMall/questionnaire/file/static" + url);
-  return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
+  return (c1 + "cdwlMall/questionnaire/file/static" + url);
+  // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
 }
 Vue.prototype.$img = c1+ 'cdwlMall'
 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
@@ -390,13 +390,19 @@
 				"navigationBarTitleText": "问卷调查"
 			}
 		}
-
 	],
 	"subpackages": [{
 		"root": "pagesA",
 		"name": "pagesA",
 		"pages": [
 			{
+				"path": "/payweb/payweb",
+				"style": {
+					"navigationBarBackgroundColor": "#FFFFFF",
+					"navigationBarTitleText": ""
+				}
+			},
+			{
 				"path": "addsb/addsb",
 				"style": {
 					"navigationBarBackgroundColor": "#FFFFFF",
@@ -5,16 +5,17 @@
 		</view>
 		<view>
 			<view class="add-list" v-show="active == 0">
-				<view style="padding:15px;margin-top:10px;" v-if="map ==0">
+				<view style="padding:15px;margin-top:10px;" >
+					<!-- v-if="map ==0" -->
 						<wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected"  color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate"></wu-calendar>
 					</view>
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
-					<u-form-item :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
+					<u-form-item :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom>
 						<u-input v-model="model1.intendedLeaseTerm" type="select" placeholder="请选择上面时间" ></u-input>
 					</u-form-item>
-					<u-form-item :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom v-else>
+			<!-- 		<u-form-item :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom v-else>
 						<u-input v-model="model1.intendedLeaseTerm"  placeholder="请输入租赁周期" ></u-input>
-					</u-form-item>
+					</u-form-item> -->
 					<u-form-item :required="true" label="经营用途" prop="businessPurpose" borderBottom>
 						<u-input v-model="model1.businessPurpose"></u-input>
 					</u-form-item>
@@ -125,7 +125,7 @@
 					</view>
 				</view>
 				<!-- gopath('/pagesA/leaseAdd/leaseAdd') -->
-				<view class="list" @click="isshop()" v-if="!isshopon">
+				<view class="list" @click="isshop()" v-if="isshopon">
 					<view class="icon-data">
 						<view class="icon">
 							<image src="@/static/icon/icon1.png" mode="heightFix"></image>
@@ -230,7 +230,21 @@
 						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
-			
+				<view class="list" @click="out">
+					<view class="icon-data">
+						<view class="icon">
+							<image src="@/static/icon/icon7.png" mode="heightFix"></image>
+						</view>
+						<view class="data">
+							<view class="title">
+								<text>退出登录</text>
+							</view>
+						</view>
+					</view>
+					<view class="more">
+						<image :src="$imgUrl('/right2.png')"></image>
+					</view>
+				</view>
 			</view>
 		</view>
 		<!-- tabbar -->
@@ -249,7 +263,7 @@
 		},
 		data() {
 			return {
-				Islogin: true,
+				Islogin: false,
 				scrollTop: 0,
 				isHotline: false,
 				shopMsg: {},
@@ -262,7 +276,7 @@
 				activityNum: 0,
 				wenjuanNum: 0,
 				user: uni.getStorageSync('user'),
-				isshopon: false
+				isshopon: true
 			};
 		},
 		onload() {
@@ -270,6 +284,7 @@
 		},
 		onShow() {
 			const isLogin = uni.getStorageSync('token');
+			this.user = uni.getStorageSync('user')
 			if (isLogin == '') {
 				// 如果未登录，跳转到登录页面
 				uni.navigateTo({
@@ -278,18 +293,11 @@
 			} else {
 				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
-					 if(res.data.code == '20004' || res.data.code == '20003'){
-						 uni.navigateTo({
-						 	url: '/pages/login/login'
-						 })
-					 }
 					if(res.data.data.content.length>0) {
 						let c1 = res.data.data.content[0]
-						this.user = c1
 						console.error({...c1})
 						if(c1.checkState == '2') {
-							this.isshopon = true
-							this.Islogin = false
+							this.isshopon = false
 						} 
 					}
 				})
@@ -306,6 +314,12 @@
 			this.getALL()
 		},
 		methods: {
+			out() {
+				uni.clearStorage()
+				uni.reLaunch({
+					url:'/pages/login/login'
+				})
+			},
 			isshop() {
 				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
 					pageSize: 10,
@@ -392,8 +406,11 @@
 			},
 			repair() {
 				if (this.Islogin == false) {
+					// uni.navigateTo({
+					// 	url: '/pages/repair/repair'
+					// })
 					uni.navigateTo({
-						url: '/pages/repair/repair'
+						url: '/pagesA/addsb/addsb'
 					})
 				}
@@ -2,20 +2,20 @@
 	<view class="pages">
 		<view class="contents">
 			<view class="box" v-for="(item,index) in tableList" @click="getDetail(item.id)">
-			 <view style="width:70%">
-				 <view class="title">
-				 	{{item.title}}
-				 </view>
-				 <view class="desc">
-				 	<!-- <u-parse :html="item.announcementContent"></u-parse> -->
-					
-				 		{{item.content}}
-				 </view>
-			 </view>
+				<view style="width:70%">
+					<view class="title">
+						{{item.title}}
+					</view>
+					<view class="desc">
+						<!-- <u-parse :html="item.announcementContent"></u-parse> -->
+
+						{{item.content}}
+					</view>
+				</view>
 				<view class="time">
 					{{formatDateTime(item.createdAt)}}
 				</view>
-				
+
 			</view>
 		</view>
 	</view>
@@ -25,55 +25,55 @@
 	export default {
 		data() {
 			return {
-tableList:[],
-pageindex: {
-				receiverMerchant:'小程序商家',
-				pageNumber: 1,
-				pageSize: 10,
+				tableList: [],
+				pageindex: {
+					receiverMerchant: '小程序商家',
+					pageNumber: 1,
+					pageSize: 10,
 				},
 			}
 		},
-		onLoad(option){
-			
-			  // this.tableList = JSON.parse(option.item)
+		onLoad(option) {
+
+			// this.tableList = JSON.parse(option.item)
 		},
 		mounted() {
 			this.getALL()
 		},
 		methods: {
-			  formatDateTime(dateTimeString) {
-			    // 将输入的日期时间字符串转换为Date对象
-			    const inputDate = new Date(dateTimeString);
-			    const now = new Date();
-			
-			    // 获取年、月、日来进行比较
-			    const inputYear = inputDate.getFullYear();
-			    const inputMonth = inputDate.getMonth();
-			    const inputDay = inputDate.getDate();
-			
-			    const currentYear = now.getFullYear();
-			    const currentMonth = now.getMonth();
-			    const currentDay = now.getDate();
-			
-			    // 检查输入的日期是否为今天
-			    const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
-			
-			    // 格式化时间为HH:mm
-			    const hours = inputDate.getHours().toString().padStart(2, '0');
-			    const minutes = inputDate.getMinutes().toString().padStart(2, '0');
-			    const timeString = `${hours}:${minutes}`;
-			
-			    // 如果是今天，则在时间前面加上'今天'
-			    return isToday ? `今天${timeString}` : timeString;
-			  },
-getALL(){
-		this.$http.sendRequest('/cereMessageNotification/queryByPage', 'POST', this.pageindex,1).then(res => {
-			this.tableList =res.data.data.content 
-		})
+			formatDateTime(dateTimeString) {
+				// 将输入的日期时间字符串转换为Date对象
+				const inputDate = new Date(dateTimeString);
+				const now = new Date();
+
+				// 获取年、月、日来进行比较
+				const inputYear = inputDate.getFullYear();
+				const inputMonth = inputDate.getMonth();
+				const inputDay = inputDate.getDate();
+
+				const currentYear = now.getFullYear();
+				const currentMonth = now.getMonth();
+				const currentDay = now.getDate();
+
+				// 检查输入的日期是否为今天
+				const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
+
+				// 格式化时间为HH:mm
+				const hours = inputDate.getHours().toString().padStart(2, '0');
+				const minutes = inputDate.getMinutes().toString().padStart(2, '0');
+				const timeString = `${hours}:${minutes}`;
+
+				// 如果是今天，则在时间前面加上'今天'
+				return isToday ? `今天${timeString}` : timeString;
+			},
+			getALL() {
+				this.$http.sendRequest('/cereMessageNotification/queryByPage', 'POST', this.pageindex, 1).then(res => {
+					this.tableList = res.data.data.content
+				})
 			},
-			getDetail(id){
+			getDetail(id) {
 				uni.navigateTo({
-					url:`/pages/procedureList/procedureDetail?ids=${id}`
+					url: `/pages/procedureList/procedureDetail?ids=${id}`
 				})
 			},
 		}
@@ -90,7 +90,7 @@ getALL(){
 		.contents {
 			width: 100%;
-			
+
 			background-color: #fff;
 			margin-top: 20rpx;
@@ -98,23 +98,26 @@ getALL(){
 				width: 94%;
 				margin: 0 auto;
 				padding: 28rpx 0;
-				display:flex;
+				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				.title{
+
+				.title {
 					font-size: 30rpx;
 					font-weight: bold;
 				}
-				.time{
+
+				.time {
 					margin: 20rpx 0;
 					color: #888D9C;
 					font-size: 24rpx;
 				}
-				.desc{
+
+				.desc {
 					color: #888D9C;
 					font-size: 24rpx;
 					text-align: justify;
-					margin-top:10px;
+					margin-top: 10px;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
 					-webkit-line-clamp: 1;
@@ -14,7 +14,7 @@
 	margin-bottom: 20rpx;
 	.form-item {
 		display: flex;
-		align-items: center;
+		// align-items: center;
 		justify-content: space-between;
 		line-height: 50rpx;
 		padding: 6rpx 0;
 <template>
 	<view class="page">
 		<view class="content">
-			<view class="list-info" v-for="i in 5" :key="i">
+			<view class="list-info" v-for="item in cent.paymentContent" :key="i" style="align-items: flex-start;">
 				<view class="img">
-					 <image :src="$imgUrl('/img/2.jpg')"></image>
+					<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-item">
-						<view class="title">物业费</view>
-						<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</text></view>
+						<view class="title">{{item.itemName}}</view>
+						<view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.payPrice}}</text></view>
 					</view>
 					<view class="info-item" style="color: #808080;">
-						<view class="left">周期：2022.02.22 - 2022.02.22</view>
-						<view class="right">费率：100%</view>
+						<view class="left">单价：￥{{item.itemStandard}}</view>
+						<view class="right">费率：{{item.cheapRate}}%</view>
+					</view>
+					<view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0">
+						<view class="list" v-for="(item1,index1) in item.itemDetailsVOList">
+							<view 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 class="price"><u-icon name="rmb" style="font-size: 24rpx;" />￥{{item1.payPrice}}</text>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -20,52 +34,54 @@
 		<view class="content" style="padding: 8rpx 34rpx;">
 			<view class="form-item">
 				<view class="left">订单状态</view>
-				<view class="right">支付成功</view>
+				<view class="right">{{cent.orderStatus=='0'?'待支付':cent.orderStatus=='1'?'支付成功':cent.orderStatus=='2'?'支付失败':'-'}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">实缴费用</view>
-				<view class="right">￥500.00</view>
+				<view class="right">￥{{Number(cent.actualPaymentFee)/100}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">商户全称</view>
-				<view class="right">大兴鸡排</view>
+				<view class="right">{{cent.merchantName}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">门店号</view>
-				<view class="right">A2121</view>
+				<view class="right">{{cent.storeNumber}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">(户主)付款人</view>
-				<view class="right">张三</view>
+				<view class="right">{{cent.payerName}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">支付账号</view>
-				<view class="right">13454546578</view>
+				<view class="right">{{cent.paymentAccount}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">支付方式</view>
-				<view class="right">微信</view>
+				<view class="right">{{cent.paymentMethod}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">渠道</view>
-				<view class="right">线上</view>
+				<view class="right">{{cent.channel || '-'}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">支付开始时间</view>
-				<view class="right">2022-02-22  14:00:00</view>
+				<view class="right">{{cent.paymentStartTime}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">支付完成时间</view>
-				<view class="right">2022-02-22  14:00:00</view>
+				<view class="right">{{cent.paymentCompletionTime}}</view>
 			</view>
 			<view class="form-item">
 				<view class="left">支付订单号</view>
-				<view class="right">jh5465465451</view>
+				<view class="right" style="width: 60%;display: flex;flex-wrap: wrap;" v-if="cent.orderNumber">
+					<text style="width: 100%;text-align: right;" v-for="(item,index) in cent.orderNumber.split(',')">{{item}}</text>
+				</view>
 			</view>
 			<view class="form-item">
 				<view class="left">流水号</view>
-				<view class="right">024684651</view>
+				<view class="right" style="width: 60%;display: flex;flex-wrap: wrap;">{{cent.transactionNumber}}</view>
 			</view>
 		</view>
 	</view>
@@ -83,9 +99,14 @@
 					{
 						children: [{}, {}]
 					},
-				]
+				],
+				cent:{}
 			}
 		},
+		onLoad(e) {
+			this.cent = JSON.parse(e.cent)
+			console.error(this.cent)
+		},
 		methods: {
 			toDetail() {
 				uni.navigateTo({
@@ -51,6 +51,7 @@
 				justify-content: space-between;
 				// line-height: 50rpx;
 				padding: 8rpx 10rpx;
+			
 				.title {
 					font-weight: 700;
 				}
@@ -6,7 +6,7 @@
 				<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"><u-icon name="rmb"  class="price" /><text class="price">0</text></div>
+			<div class="right"><u-icon name="rmb"  class="price" /><text class="price">{{allnum}}</text></div>
 		</view>
 		<view v-if="dataList.length==0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<view class="record-list">
@@ -16,9 +16,9 @@
 					<view class="right"><u-icon name="rmb"  class="price" /><text class="price" >{{item.children | itemnum}}</text></view>
 				</view>
 				<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-items" v-for="(v, i) in item.children" :key="i" @click="toDetail(v)">
 					<view class="info-item">
-						<view class="left title">{{v.transactionNumber}}</view>
+						<view class="left title one-omit" style="width: 70%;">{{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">
@@ -34,6 +34,7 @@
 				</view>
 			</view>
 		</view>
+		<view style="height: 100rpx;"></view>
 	</view>
 </template>
@@ -108,6 +109,16 @@
 			}
 		},
 		onLoad() {
+			this.year = new Date().getFullYear(); 
+			let yuelist =  this.getCurrentYearMonths(this.year)
+			this.dataList = []
+			for (let i = 0; i < yuelist.length; i++) {
+				let item = {	
+						yue:yuelist[i],
+						children: []
+					}
+				this.dataList.push(item)
+			}
 			this.gain()
 		},
 		filters:{
@@ -116,41 +127,54 @@
 				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
-			// },
+			allnum() {
+				let num = 0 
+				for (let i = 0; i < this.dataList.length; i++) {
+					let list = this.dataList[i].children
+					for (let n = 0; n < list.length; n++) {
+						num = num + (Number(list[n].actualPaymentFee)/100)
+					}
+				}
+				return num
+			},
 		},
 		methods: {
+			getCurrentYearMonths(excludePastMonths) {
+			    const currentDate = new Date();
+			    const currentYear = currentDate.getFullYear();
+			    const currentMonth = currentDate.getMonth(); // getMonth() returns a zero-based index
+				console.error(currentYear,currentMonth)
+			    let months = [];
+				if(currentYear == Number(excludePastMonths)) {
+					for (let i = 0; i < currentMonth+1; i++) {
+						months.push(i+1)
+					}
+				} else if(currentYear < Number(excludePastMonths)) {
+					months = []
+				}else if(currentYear > Number(excludePastMonths)) {
+					for (let i = 0; i < 12; i++) {
+						months.push(i+1)
+					}
+				}
+			    return months;
+			},
 			change(e) {
 				console.error(e)
 				this.year = e.year
+				let yuelist =  this.getCurrentYearMonths(this.year)
+				this.dataList = []
+				for (let i = 0; i < yuelist.length; i++) {
+					let item = {	
+							yue:yuelist[i],
+							children: []
+						}
+					this.dataList.push(item)
+				}
 				this.gain()
 			},
 			async gain() {
@@ -161,7 +185,7 @@
 					    "year":this.year,
 					    "month":this.dataList[i].yue,
 					}
-					await this.$http.sendRequest('cerePaymentInfo/queryByPage','POST',c1,1).then(res => {
+					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
@@ -172,12 +196,14 @@
 						// console.error(this.dataList)
 					})
 				}
+				this.dataList.reverse()
 				console.error(this.dataList)
 			},
-			toDetail() {
+			toDetail(e) {
+				console.error(e)
 				uni.navigateTo({
-					url: '/pages/propertyPay/payDetail/payDetail'
+					url: '/pages/propertyPay/payDetail/payDetail?cent='+JSON.stringify(e)
 				})
 			}
 		}
@@ -2,7 +2,8 @@
 	<view class="page">
 		<view class="search-box">
 			<view>
-				<u-input v-model="value" type="select" border @click="show = true" style="background-color: #F7F7F7;" placeholder="请选择店铺"/>
+				<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">
@@ -21,20 +22,27 @@
 			<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 @change="e=>quanxuanitem(e,index)" v-model="item.isshowxz" shape="circle" :label-disabled="false" />
+						<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-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>
+												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>
@@ -42,7 +50,8 @@
 								</view>
 							</view>
 						</view>
-						<view><u-icon @click="changeisxl(index)" :name="item.isxl?'arrow-up':'arrow-down'"></u-icon></view>
+						<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">
@@ -57,7 +66,8 @@
 								</view>
 							</view>
 							<view class="">
-								<text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />￥{{item1.payPrice}}</text>
+								<text class="price"><u-icon name="rmb"
+										style="font-size: 24rpx;" />￥{{item1.payPrice}}</text>
 							</view>
 						</view>
 					</view>
@@ -74,7 +84,7 @@
 				<view class="">
 					合计：<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>
+				<u-button type="success" style="margin: 0 10rpx;" @click="submit">去支付</u-button>
 			</view>
 		</view>
 		<u-popup class="userForm" v-model="joinShow" mode="center" :closeable="true" width="80%">
@@ -153,10 +163,10 @@
 			};
 		},
-		filters:{
+		filters: {
-			jsitem(e){
-				console.error(e)
+			jsitem(e) {
+				// console.error(e)
 				let num = 0
 				for (let n = 0; n < e.length; n++) {
 					num = num + Number(e[n].payPrice)
@@ -167,9 +177,9 @@
 				return num
 			}
 		},
-		computed:{
+		computed: {
 			allnum() {
-				let num = 0 
+				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++) {
@@ -183,7 +193,7 @@
 				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){
+						if (list[n].isshowxz) {
 							num = num + Number(list[n].payPrice)
 						}
 					}
@@ -200,7 +210,7 @@
 					}
 					const allTrue = this.recordList.every(item => item.isshowxz)
 					this.showAll = allTrue
-					
+
 				}
 			}
 		},
@@ -215,27 +225,31 @@
 					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=>{
+
+				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)
+					this.confirm(this.list1)
 					console.error(this.list1)
 				})
 			}
 		},
 		methods: {
-		
+
 			changeisxl(e) {
 				this.recordList[e].isxl = !this.recordList[e].isxl
 			},
-			quanxuanitem(e,index) {
+			quanxuanitem(e, index) {
 				console.error(e)
 				console.error(this.recordList[index].itemDetailsVOList)
 				if (e.value) {
@@ -250,23 +264,23 @@
 			},
 			quanxuan(e) {
 				// this.showAll = e.value
-				console.error(e)
+				// console.error(e)
 				// const allTrue = this.recordList.every(item => item.gouxuan)
 				if (e.value) {
-					this.recordList = this.recordList.map(item=>{
+					this.recordList = this.recordList.map(item => {
 						item.isxl = true
 						item.isshowxz = true
-						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => {
 							item1.isshowxz = true
 							return item1
 						})
 						return item
 					})
 				} else {
-					this.recordList = this.recordList.map(item=>{
+					this.recordList = this.recordList.map(item => {
 						item.isxl = true
 						item.isshowxz = false
-						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => {
 							item1.isshowxz = false
 							return item1
 						})
@@ -293,7 +307,45 @@
 				// })
 			},
 			submit() {
-				console.log(this.recordList)
+
+				// console.log(this.recordList)
+				let c1 = []
+				for (let i = 0; i < this.recordList.length; i++) {
+					if (this.recordList[i].isshowxz) {
+						c1.push(this.recordList[i])
+					} else {
+						let newitem = JSON.parse(JSON.stringify(this.recordList[i]))
+						newitem.itemDetailsVOList = newitem.itemDetailsVOList.filter(function(item1) {
+							return item1.isshowxz
+						})
+						if (newitem.itemDetailsVOList.length > 0) {
+							c1.push(newitem)
+						}
+					}
+				}
+				console.log(c1)
+				let storeNumber = []
+				let orderNumber = []
+				for (let i = 0; i < c1.length; i++) {
+					for (let n = 0; n < c1[i].itemDetailsVOList.length; n++) {
+						// console.error(c1[i].itemDetailsVOList[n])
+						storeNumber.push(c1[i].itemDetailsVOList[n].storeCode)
+						orderNumber.push(c1[i].itemDetailsVOList[n].orderNo)
+					}
+				}
+				let info = {
+					"actualPaymentFee": this.allcknum * 100,
+					"merchantName": this.value,
+					"storeNumber": storeNumber.join(','),
+					"payerName": uni.getStorageSync('user').name,
+					"paymentAccount": uni.getStorageSync('user').phone,
+					"orderNumber": orderNumber.join(','),
+					"paymentContent": JSON.stringify(c1)
+				}
+				console.log(info)
+				this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => {
+					console.error(res)
+				})
 				return
 				// 	this.loadShow = true
 				// setTimeout(()=>{
@@ -363,13 +415,17 @@
 			},
 			confirm(e) {
 				console.log(e)
-					this.value = e[0].label
-				this.$http.sendRequest('eventReporting/propertyPayment', 'POST',{merchantId:e[0].value,pageNumber:1,pageSize:10} ,1).then(res => {
+				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=>{
+					this.recordList = res.data.data.itemDetailsVOList.map(item => {
 						item.isxl = true
 						item.isshowxz = false
-						item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{
+						item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => {
 							item1.isshowxz = false
 							return item1
 						})
@@ -386,6 +442,7 @@
 <style scoped lang="scss">
 	@import 'propertyPayList.scss';
+
 	.tit1 {
 		color: #7a7a7a;
 		font-size: 26rpx;
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
 //  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提交数据类型
@@ -21,10 +21,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
-		// bases = 'http://128.10.249.21:9003'+ url;
+		bases = 'http://128.10.249.18: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;