加入缴费历史功能

pages/my/my.vue

@@ -26,12 +26,7 @@
 		</view>
 
 		<view class="cu-list menu  margin-top">
-			<!-- <view v-if="ownerFlag== false" class="cu-item arrow" @click="bindingOwner()">
+			
-				<view class="content">
-					<text class="cuIcon-profile text-pink"></text>
-					<text class="text-grey">绑定业主</text>
-				</view>
-			</view> -->
 			<view class="cu-item arrow" @click="viewOwner()">
 				<view class="content">
 					<text class="cuIcon-profile text-pink"></text>
@@ -68,6 +63,12 @@
 					<text class="text-grey">我的报修单</text>
 				</view>
 			</view>
+			 <view  class="cu-item arrow" @click="feeDetail()">
+				<view class="content">
+					<text class="cuIcon-profile text-pink"></text>
+					<text class="text-grey">缴费历史</text>
+				</view>
+			</view>
 			
 			<view class="cu-item arrow" @click="myParking()">
 				<view class="content">
@@ -270,6 +271,19 @@
 					url: '/pages/settings/settings',
 				});
 			},
+			feeDetail:function(){
+				if (!this.ckeckUserInfo()) {
+					this.vc.navigateTo({
+						url: '../showlogin/showlogin'
+					}, () => {
+						this.refreshPageLoginInfo();
+					});
+					return;
+				}
+				this.vc.navigateTo({
+					url: '/pages/payFeeDetail/payFeeDetail',
+				});
+			},
 			/**
 			 * 查询业主头像
 			 */

pages/payFeeDetail/payFeeDetail.vue

@@ -1,7 +1,6 @@
 <template>
 	<view>
-		<view v-if="num != null && num != ''" class="block__title">{{num}}号车位</view>
+		<view  class="block__title">缴费历史</view>
-		<view v-if="floorNum != null && floorNum != ''" class="block__title">{{floorNum}}栋{{unitNum}}单元{{roomNum}}室</view>
 		<view v-if="noData == false">
 			<view v-for="(item,index) in feeDetails" :key="index" class="bg-white margin-bottom margin-right-xs radius margin-left-xs padding">
 				<view class="flex padding-bottom-xs solid-bottom justify-between">
@@ -10,7 +9,7 @@
 				</view>
 				<view class="flex margin-top justify-between">
 					<view class="text-gray">费用名称</view>
-					<view class="text-gray">{{feeName}}</view>
+					<view class="text-gray">{{item.feeName}}</view>
 				</view>
 				<view class="flex margin-top-xs justify-between">
 					<view class="text-gray">缴费编码</view>
@@ -32,6 +31,10 @@
 					<view class="text-gray">缴费时间</view>
 					<view class="text-gray">{{item.createTime}}</view>
 				</view>
+				<view class="flex margin-top-xs justify-between">
+					<view class="text-gray">备注</view>
+					<view class="text-gray">{{item.remark}}</view>
+				</view>
 			</view>
 		</view>
 		<view v-else>
@@ -54,13 +57,8 @@
 		data() {
 			return {
 				feeDetails: [],
-				feeId: '',
+				ownerId: '',
 				communityId: '',
-				feeName: '',
-				floorNum: '',
-				unitNum: '',
-				roomNum: '',
-				num: '',
 				noData: false
 			}
 		},
@@ -73,20 +71,14 @@
 		 */
 		onLoad: function(options) {
 			context.onLoad(options);
-			let _fee = JSON.parse(options.fee);
+			let _that = this;
-			this.feeId = _fee.feeId;
+			context.getOwner(function(_owner) {
-			this.feeName = _fee.feeName;
+				_that.ownerId = _owner.memberId;
-			this.floorNum = _fee.floorNum;
+				_that.communityId = _owner.communityId;
-			this.unitNum = _fee.unitNum;
+				_that._loadFeeDetail();
-			this.roomNum = _fee.roomNum;
+			});
-			this.communityId = _fee.communityId;
+
-			this.num = _fee.num;
 			
-			this._loadFeeDetail();
-			var pages = getCurrentPages();
-			var prevPage = pages[pages.length - 2]; //上一个页面
-			//直接调用上一个页面的setData()方法，把数据存到上一个页面中去
-			prevPage.needFefresh = false;
 		},
 		methods: {
 			_loadFeeDetail: function() {
@@ -94,7 +86,7 @@
 				let _objData = {
 					page: 1,
 					row: 30,
-					feeId: this.feeId,
+					ownerId: this.ownerId,
 					communityId: this.communityId
 				}
 				context.request({

pages/payParkingFeeList/payParkingFeeList.vue

@@ -46,7 +46,7 @@
 						<view class="text-gray">{{item.endTime}}</view>
 					</view>
 					<view class="solid-top flex justify-end margin-top padding-top-sm padding-bottom-sm">
-						<button class="cu-btn sm line-gray" @click="payFeeDetail(item)">历史缴费</button>
+						<!-- <button class="cu-btn sm line-gray" @click="payFeeDetail(item)">历史缴费</button> -->
 						<button class="cu-btn sm bg-green margin-left" @click="payFee(item)">缴费</button>
 					</view>
 				</view>
@@ -58,7 +58,6 @@
 			<view class=" bg-white  border flex justify-end" style="position: fixed;width: 100%; bottom: 0;">
 				<view class="btn-group line-height">
 					<button class="cu-btn bg-red shadow-blur lgplus sharp" @click="toCarOweFee()">欠费缴费</button>
-					
 				</view>
 			</view>
 		</view>