bug修复与优化

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -3,17 +3,6 @@
 		<u-tabs :list="tabs" @click="sectionChange" style="background-color: #fff;" :current=current
 			:itemStyle="{'width':'375rpx','padding':'24rpx'}" lineHeight="2px" lineWidth="30px"></u-tabs>
 		<view class="contain" v-show="cdshow==true">
-			<!-- 日期选择器 -->
-			<!-- 	<view class="topbilledit">
-				<view class="changetime1">
-					<picker mode="date" :value="dataForm.costCycle" fields="month" @change="dateChange">
-						<view class="selestDate">{{dataForm.costCycle}}</view>
-					</picker>
-				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
-				</view>
-			</view> -->
 			<view class="nodata" v-if="nodata==true">
 				暂无数据
 			</view>
@@ -21,22 +10,35 @@
 				<!-- <view style="padding:16rpx 0 16rpx 32rpx">
 					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view> -->
-				<view class="paisong2" style="margin-top: 16rpx;">
-					<view class="status s2">
-						待支付
-					</view>
-					<view class="subtit">
-						物业费: <span>￥{{zddata.amount}}</span>
-					</view>
-					<view class="subtit">
-						管理费:￥ {{zddata.glf}}
-					</view>
-					<view class="subtit">
-						中央空调使用费:￥ {{zddata.ktf}}
-					</view>
-					<view class="subtit">
-						电梯费:￥ {{zddata.dtf}}
+				<view class="paisong" style="margin-top: 16rpx;" v-for="(item,index) in billLists">
+					<u-icon name="arrow-up" @click="item.showMore=false" class="iconBtn" size="20px"
+						v-if="item.showMore" color="#999"></u-icon>
+					<u-icon name="arrow-down" @click="item.showMore=true" class="iconBtn" size="22px" color="#999"
+						v-else></u-icon>
+					<view class="title">
+						{{item.costType | getDictLab(that)}}: <span>￥{{item.amount}}
+							<text class="status s1" v-if='item.status==1'>
+								已支付
+							</text>
+							<text class="status s2" v-if='item.status==2'>
+								待支付
+							</text>
+							<text class="status s3" v-if='item.status==3'>
+								支付失败
+							</text></span>
+
 					</view>
+					<template v-if="item.showMore">
+						<view class="subtit" style="margin-top: 16rpx;" v-for="subItem in item.billLists"
+							:key="subItem.id">
+							<template v-if="item.costType!='PropertyFee'">
+								{{subItem.equipName}}:{{subItem.amount}}
+							</template>
+							<template v-else>
+								{{subItem.costType| getDictLab2(that)}}:{{subItem.amount}}
+							</template>
+						</view>
+					</template>
 				</view>
 			</template>
 		</view>
@@ -58,13 +60,28 @@
 				<view style="padding:16rpx 0 16rpx 32rpx">
 					共有 <span style="color: red">{{totalnumber}}</span>条记录
 				</view>
-				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true' 
-				style="height:400px;flex:1;padding-bottom: 49px;">
+				<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'
+					style="height:400px;flex:1;padding-bottom: 49px;">
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 						<view class="paisong2">
-							<view class="status" v-if="item.status==1">
+							<view class="status" v-if="item.type=='Subsidy'">
+								补助
+							</view>
+							<view class="status s2" v-if="item.type=='PreStorage'">
 								预存
 							</view>
+							<view class="status s3" v-if="item.type=='Refund'">
+								退费
+							</view>
+							<view class="status s4" v-if="item.type=='Water'">
+								水费
+							</view>
+							<view class="status s4" v-if="item.type=='Elec'">
+								电费
+							</view>
+							<view class="status s4" v-if="item.type=='PropertyFee'">
+								物业费
+							</view>
 							<view class="title">{{item.tenantInfo.name}}</view>
 							<view class="subtit">
 								扣缴金额: <span>￥{{item.amount}}</span>
@@ -84,15 +101,16 @@
 						</view>
 					</u-list-item>
 				</u-list>
-				<view class="Predeposit" v-show="dibucaidan">
-					<span @click="prestore('预存')">预存</span>
-					<span @click="prestore('补助')">补助</span>
-				</view>
+
 			</view>
 		</view>
+		<view class="Predeposit">
+			<span @click="prestore('预存')">预存</span>
+			<span @click="prestore('补助')">补助</span>
+		</view>
 		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
 			@cancel='canceltype'> </u-picker>
-		<u-popup :show="showpayjine" @close="closepay1" @open="openpay1" mode="bottom" :round="10" :closeable=true
+		<u-popup :show="showpayjine" @close="closepay1" mode="bottom" :round="10" :closeable=true
 			:closeOnClickOverlay=true>
 			<view class="paytall1" style="padding-bottom: 20rpx;">
 				<view class="hejitop">
@@ -109,21 +127,6 @@
 					<u-button type="primary" text="确认支付" @click="Confirmationpaymentjine"></u-button>
 				</view>
 			</view>
-			<!-- <view class="paytall">
-				<view class="hejitop">
-					{{prestorename}}
-				</view>
-				<view class="zhifufs">
-					<u--form labelWidth="30" labelPosition="left" :model="model1" :rules="rules" ref="uForm">
-						<u-form-item label="¥" prop="userInfo.amount" borderBottom ref="item1">
-							<u--input v-model="model1.userInfo.amount" border="none" placeholder="点击输入金额"></u--input>
-						</u-form-item>
-					</u--form>
-				</view>
-				<view style="margin: 0 32rpx;">
-					<u-button type="primary" text="确定" @click="Confirmationpaymentjine"></u-button>
-				</view>
-			</view> -->
 		</u-popup>
 
 		<view class="canys" v-if="zhifucanvas">
@@ -145,13 +148,17 @@
 	export default {
 		data() {
 			return {
+				that: this,
+				billstype: [],
+				columnstype: [],
+				PropertyTypedata: [],
+				billLists: [],
 				tabs: [{
 					name: '账单明细',
 				}, {
 					name: '扣缴记录'
 				}],
 				zhifucanvas: false,
-				dibucaidan: true,
 				prestorename: '',
 				model1: {
 					userInfo: {
@@ -192,7 +199,6 @@
 				},
 				nodata: true,
 				pd: true,
-				columnstype: [],
 				jfpost: {
 					tenantId: "",
 					costCycle: "",
@@ -205,35 +211,23 @@
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad: function(options) {
-
 			//option为object类型，会序列化上个页面传递的参数
 			this.fatherparameter = JSON.parse(decodeURIComponent(options.para));
-
-			let getDictDataList = uni.getStorageSync('getDictDataList');
-			for (let i = 0; i < getDictDataList.length; i++) {
-				if (getDictDataList[i].dictType == 'PayType') {
-					this.columnstype = [getDictDataList[i].dataList]
-				}
-
-
-				if (getDictDataList[i].dictType == 'PayStatus') {
-					this.payStatusList = [getDictDataList[i].dataList]
-				}
-			}
-
-
+			uni.setNavigationBarTitle({
+				title: this.fatherparameter.name
+			})
 			this.dataForm.tenantId = this.fatherparameter.id;
 			this.dataForm.costCycle = this.fatherparameter.cycle;
 			this.dataForm.page = 1;
-
-
 			this.jfpost.tenantId = this.fatherparameter.id;
 			this.jfpost.costCycle = this.fatherparameter.cycle;
 			this.jfpost.page = 1;
-
 			this.getalldata();
-			//	this.getPayStatusList();
-			//this.getPayTypeList();
+			var getDictDataList = uni.getStorageSync('getDictDataList');
+			this.billstype = getDictDataList.filter((item) => item.dictType == 'PayType');
+			this.columnstype = [this.billstype[0].dataList];
+			this.PropertyTypedata = getDictDataList.filter((item) => item.dictType == 'PropertyType');
+			console.log(this.columnstype)
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},
@@ -246,103 +240,107 @@
 		onUnload() {},
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
-
-
+		filters: {
+			getDictLab(v, that) {
+				let val = that.billstype[0].dataList.filter((item) => item.dictValue == v);
+				if (val && val[0]) {
+					return val[0].dictLabel;
+				}
+			},
+			getDictLab2(v, that) {
+				let val = that.PropertyTypedata[0].dataList.filter((item) => item.dictValue == v);
+				if (val && val[0]) {
+					return val[0].dictLabel || '11';
+				}
+			}
+		},
 		methods: {
+			// 创建订单
+			createOrder(postdata, type) {
+				uni.request({
+					url: BaseApi.BaseApi + '/pay/createOrder',
+					method: "POST",
+					data: postdata,
+					header: {
+						'content-type': 'application/x-www-form-urlencoded',
+						"token": uni.getStorageSync('tokendata'),
+					},
+					success: (res) => {
+						if (type) {
+							let qrcode = new QRCode('canvas', {
+								text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
+								width: 213,
+								height: 213,
+								colorDark: "black",
+								colorLight: "white",
+								correctLevel: QRCode.CorrectLevel.H,
+							});
+							if (this.prestorename == '补助') {
+
+							} else {
+
+							}
+						}
+					}
+				});
+			},
+			//预存和补助按钮点击
 			prestore(e) {
 				this.showpayjine = true;
-				this.dibucaidan = false;
 				this.prestorename = e;
 			},
+			//确认支付预存和补助
 			Confirmationpaymentjine() {
 				this.$refs.uForm.validate().then(res => {
 					this.showpayjine = false;
-					this.Predepositshow = false;
-					this.dibucaidan = true;
 					if (this.prestorename == '预存') {
 						this.prestoredata(this.model1.userInfo.amount)
 					} else if (this.prestorename == '补助') {
 						this.subsidydata(this.model1.userInfo.amount)
-					} else if (this.prestorename == '退费') {
-						//  this.refunddata(this.model1.userInfo.amount)
 					}
-							  
+
 				}).catch(errors => {
 					uni.$u.toast('校验失败');
-					
+
 				})
 			},
 			//预存
 			prestoredata(e) {
 				this.zhifucanvas = true;
+				this.showpayjine = false;
 				let postdata = {
 					totalFee: e,
 					tenantId: this.dataForm.tenantId,
 					tradeType: 'NATIVE',
 					billIds: ''
 				}
-				uni.request({
-					url: BaseApi.BaseApi + '/pay/createOrder',
-					method: "POST",
-					data: postdata,
-					header: {
-						'content-type': 'application/x-www-form-urlencoded',
-						"token": uni.getStorageSync('tokendata'),
-					},
-					success: (res) => {
-						let qrcode = new QRCode('canvas', {
-							text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
-							width: 213,
-							height: 213,
-							colorDark: "black",
-							colorLight: "white",
-							correctLevel: QRCode.CorrectLevel.H,
-						});
-						//   10秒之后调取查询订单
-						let that = this;
-						setTimeout(function() {
-							that.zhifucanvas = false;
-							that.zddata = {};
-							that.dataForm.page = 1;
-							that.getalldata();
-							this.jfpost.page = 1;
-							this.indexList = [];
-							this.getjfdata();
-						}, 15000);
-
-					}
-				});
-
+				this.createOrder(postdata, 1);
 			},
 			//补助
 			subsidydata(e) {
+				this.zhifucanvas = true;
+				this.showpayjine = false;
 				let postdata = {
 					totalFee: e,
 					tenantId: this.fatherparameter.id,
 					tradeType: 'NATIVE',
 					billIds: ''
 				}
-				this.$api.postJson('/pay/createOrder', postdata)
-					.then(res => {
-						this.$refs.uNotify.success('补助成功')
-					})
+				this.createOrder(postdata, 1);
 			},
 			closepay1() {
 				this.showpayjine = false
-				this.dibucaidan = true;
-			},
-			openpay1() {
-				console.log('open');
 			},
+			//微信二维码关闭
 			guanbi() {
 				this.zhifucanvas = false;
-				this.Predepositshow = true;
-				this.getalldata();
 				this.getjfdata();
 			},
+			//取消预存
 			canceltype() {
 				this.showtype = false;
 			},
+			//类型查询确定
 			confirmtype(e) {
 				this.showtype = false;
 				this.expensedata = e.value[0].dictLabel;
@@ -355,12 +353,13 @@
 				this.jfpost.page = 1;
 				this.getjfdata();
 			},
+			//类型查询
 			typechange() {
 				this.showtype = true;
 			},
+			//tab 切换
 			sectionChange(val) {
 				this.current = val.index;
-				console.log(val.index)
 				if (val.index == 0) {
 					this.cdshow = true;
 				} else if (val.index == 1) {
@@ -371,6 +370,7 @@
 				}
 
 			},
+			//加载更多
 			scrolltolower() {
 				if (this.pd) {
 					this.getjfdata();
@@ -378,11 +378,11 @@
 					return
 				}
 			},
+			//扣缴记录
 			getjfdata() {
 				this.$api.get('/payrecord/page', this.jfpost)
 					.then(res => {
 						this.totalnumber = res.data.data.total;
-						//  console.log('111111111111111111',res.data.data.list)
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
 							this.jfpost.page = this.jfpost.page + 1;
@@ -399,15 +399,7 @@
 
 					})
 			},
-			dateChange(e) {
-				this.myday = e.target.value;
-				this.dataForm.costCycle = e.target.value;
-				this.jfpost.costCycle = e.target.value;
-
-				this.zddata = {};
-				this.dataForm.page = 1;
-				this.getalldata();
-			},
+			//账单明细
 			getalldata() {
 				this.$api.post('/billinfo/billDetail', this.dataForm)
 					.then(res => {
@@ -416,12 +408,11 @@
 						if (res.data.data.length == 0) {
 							this.nodata = true;
 						} else {
+							for (let i = 0; i < res.data.data.length; i++) {
+								res.data.data[i].showMore = false;
+							}
 							this.nodata = false;
-							this.zddata.amount = res.data.data[0].amount;
-							this.zddata.glf = res.data.data[0].billLists[0].amount;
-							this.zddata.ktf = res.data.data[0].billLists[1].amount;
-							this.zddata.dtf = res.data.data[0].billLists[2].amount;
-
+							this.billLists = res.data.data;
 						}
 					})
 			},
@@ -587,20 +578,31 @@
 			span {
 				color: #FA5555;
 				font-weight: 600;
-			}
+				position: relative;
+
+				.status {
+					width: 50px;
+					padding: 3px 3px 10px 3px;
+					text-align: center;
+					font-size: 13px;
+					color: #fff;
+					background-color: #09C700;
+					border-radius: 11px;
+					position: absolute;
+					right: -50px;
+					top: -10px;
+					transform: scale(0.8);
+
+					&.s1 {
+						background: url('@/static/imgs/paySuccess.png') no-repeat;
+						background-size: 100%;
+					}
 
-			.status {
-				width: 100rpx;
-				padding: 6rpx;
-				text-align: center;
-				font-size: 24rpx;
-				color: #fff;
-				background-color: #09C700;
-				border-radius: 22rpx;
-				position: absolute;
-				left: 40%;
-				top: 20rpx;
-				transform: scale(.85);
+					&.s2 {
+						background: url('@/static/imgs/payerror.png') no-repeat;
+						background-size: 100%;
+					}
+				}
 			}
 		}
 
@@ -644,8 +646,16 @@
 			color: #fff;
 
 			&.s2 {
+				background-color: #09C700;
+			}
+
+			&.s3 {
 				background-color: #FA5555;
 			}
+
+			&.s4 {
+				background-color: #FF9C27;
+			}
 		}
 	}
 

pages/index/BillPending/BillPending.vue

@@ -29,26 +29,26 @@
 								color="#999" v-else></u-icon>
 							<checkbox :checked="item.check" class="check" @click="checkItem(item)" />
 							<view class="title">
-								物业费: <span>￥{{item.amount}}</span>
-								<view class="status s1" v-if='item.status==1'>
-									已支付
-								</view>
-								<view class="status s2" v-if='item.status==2'>
-									待支付
-								</view>
-								<view class="status s3" v-if='item.status==3'>
-									支付失败
-								</view>
+								{{item.costType | getDictLab(that)}}: <span>￥{{item.amount}}
+									<text class="status s1" v-if='item.status==1'>
+										已支付
+									</text>
+									<text class="status s2" v-if='item.status==2'>
+										待支付
+									</text>
+									<text class="status s3" v-if='item.status==3'>
+										支付失败
+									</text></span>
 							</view>
 							<template v-if="item.showMore">
-								<view class="subtit" style="margin-top: 16rpx;">
-									管理费:{{item.billLists[0].amount}}
-								</view>
-								<view class="subtit">
-									中央空调使用费:{{item.billLists[1].amount}}
-								</view>
-								<view class="subtit">
-									电梯费:{{item.billLists[2].amount}}
+								<view class="subtit" style="margin-top: 16rpx;" v-for="subItem in item.billLists"
+									:key="subItem.id">
+									<template v-if="item.costType!='PropertyFee'">
+										{{subItem.equipName}}:{{subItem.amount}}
+									</template>
+									<template v-else>
+										{{subItem.costType| getDictLab2(that)}}:{{subItem.amount}}
+									</template>
 								</view>
 							</template>
 						</view>
@@ -249,6 +249,9 @@
 				format: 'yyyy-mm'
 			})
 			return {
+				that: this,
+				billstype: [],
+				PropertyTypedata: [],
 				tabs: [{
 					name: '账单明细',
 				}, {
@@ -340,15 +343,19 @@
 		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
 			let userInfo = JSON.parse(decodeURIComponent(options.info));
 			this.dataForm.tenantId = userInfo.tenantId;
-			let getDictDataList = uni.getStorageSync('getDictDataList');
-			for (let i = 0; i < getDictDataList.length; i++) {
-				if (getDictDataList[i].dictType == 'PayType') {
-					this.columnstype = [getDictDataList[i].dataList]
-				}
-				if (getDictDataList[i].dictType == 'PropertyType') {
-					this.PropertyType = [getDictDataList[i].dataList]
-				}
-			}
+			var getDictDataList = uni.getStorageSync('getDictDataList');
+			this.billstype = getDictDataList.filter((item) => item.dictType == 'PayType');
+			this.columnstype = [this.billstype[0].dataList];
+			this.PropertyTypedata = getDictDataList.filter((item) => item.dictType == 'PropertyType');
+			this.PropertyType = [this.PropertyTypedata]
+			// for (let i = 0; i < getDictDataList.length; i++) {
+			// 	if (getDictDataList[i].dictType == 'PayType') {
+			// 		this.columnstype = [getDictDataList[i].dataList]
+			// 	}
+			// 	if (getDictDataList[i].dictType == 'PropertyType') {
+			// 		this.PropertyType = [getDictDataList[i].dataList]
+			// 	}
+			// }
 			this.getpaisongdata(); //账单明细
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -361,6 +368,20 @@
 		onUnload() {},
 		//监听用户下拉动作，一般用于下拉刷新
 		onPullDownRefresh() {},
+		filters: {
+			getDictLab(v, that) {
+				let val = that.billstype[0].dataList.filter((item) => item.dictValue == v);
+				if (val && val[0]) {
+					return val[0].dictLabel;
+				}
+			},
+			getDictLab2(v, that) {
+				let val = that.PropertyTypedata[0].dataList.filter((item) => item.dictValue == v);
+				if (val && val[0]) {
+					return val[0].dictLabel || '11';
+				}
+			}
+		},
 		methods: {
 			guanbi() {
 				this.zhifucanvas = false;
@@ -369,7 +390,7 @@
 				this.getpaisongdata();
 			},
 			// 创建订单
-			createOrder(postdata,type) {
+			createOrder(postdata, type) {
 				uni.request({
 					url: BaseApi.BaseApi + '/pay/createOrder',
 					method: "POST",
@@ -379,15 +400,15 @@
 						"token": uni.getStorageSync('tokendata'),
 					},
 					success: (res) => {
-						if(type){
-						let qrcode = new QRCode('canvas', {
-							text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
-							width: 213,
-							height: 213,
-							colorDark: "black",
-							colorLight: "white",
-							correctLevel: QRCode.CorrectLevel.H,
-						});
+						if (type) {
+							let qrcode = new QRCode('canvas', {
+								text: res.data.codeUrl, // weixin://wxpay/bizpayurl?pr=sZz****
+								width: 213,
+								height: 213,
+								colorDark: "black",
+								colorLight: "white",
+								correctLevel: QRCode.CorrectLevel.H,
+							});
 						}
 					}
 				});
@@ -404,7 +425,7 @@
 						tradeType: 'NATIVE',
 						billIds: ''
 					}
-					this.createOrder(postdata,1);
+					this.createOrder(postdata, 1);
 				}).catch(errors => {
 					//Funi.$u.toast('校验失败')
 				})
@@ -428,7 +449,7 @@
 			},
 			//提交订单
 			Confirmationpayment() {
-				this.showpay=false;
+				this.showpay = false;
 				if (this.zhifufangshi == 'zhanghu') {
 					//余额是否足够支付，不够提示充值
 					let billIdslist = this.billIds;
@@ -468,14 +489,14 @@
 					this.showpay = false;
 					let billIdslist = this.billIds.join(',');
 					let postdata = {
-						totalFee:this.heji,
+						totalFee: this.heji,
 						tenantId: this.dataForm.tenantId,
 						tradeType: 'NATIVE',
 						billIds: billIdslist
 					}
-					this.createOrder(postdata,1);
+					this.createOrder(postdata, 1);
 				}
-				this.heji=0;
+				this.heji = 0;
 			},
 			//确认提前缴费
 			jiaofeiconfirm() {
@@ -486,7 +507,7 @@
 				this.getpaisongdata();
 			},
 			// 取消缴费
-			cancleJiaofei(){
+			cancleJiaofei() {
 				this.showjiaofei = false;
 				this.dataForm.page = 1;
 				this.indexList1 = [];
@@ -539,12 +560,12 @@
 			},
 			// 我的订单
 			cancle(id, ind) {
-				let that=this;
+				let that = this;
 				uni.request({
 					url: BaseApi.BaseApi + '/pay/closeOrder/' + id,
 					methods: 'get',
 					success(res) {
-						if (res.data.returnCode =="SUCCESS") {
+						if (res.data.returnCode == "SUCCESS") {
 							that.orderList.splice(ind, 1);
 						}
 					}
@@ -626,7 +647,7 @@
 							this.pd = true;
 							this.jfnodata = false;
 						} else {
-							if(this.dataForm.page!=1){
+							if (this.dataForm.page != 1) {
 								uni.showToast({
 									title: '暂无更多数据了',
 									icon: 'none',

pages/index/Immediatecollection/Chargedetails/Chargedetails.vue

@@ -1,39 +1,33 @@
 <template>
-	<view>
 		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
+			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
-
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'
+			style="height: 400px;flex: 1;">
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-
 					<view class="companylist" @click="seedetail(item)">
-						<view class="Currentamount">
-							欠费金额:{{item.smsCode}}
+						<view class="Currentamount" style="color: #333;">
+							短信内容: {{item.content}}
 						</view>
 						<view class="Currentamount">
 							发送时间: {{item.createDate}}
 						</view>
-						<view class="Currentamount">
+						<!-- <view class="Currentamount">
 							空间信息:￥{{item.spacePos}}
-						</view>
-						<view class="Currentamount">
+						</view> -->
+						<!-- <view class="Currentamount">
 							联系电话: {{item.mobile}}
-						</view>
-						<view class="Currentamount">
+						</view> -->
+						<!-- <view class="Currentamount">
 							短信类型: 催费
-						</view>
-						<view class="Currentamount">
-							短信内容: {{item.content}}
-						</view>
+						</view> -->
+						
 					</view>
 
 				</u-list-item>
 			</u-list>
-
 		</view>
-	</view>
 </template>
 
 <script>
@@ -91,91 +85,50 @@ this.totalnumber=res.data.data.total;
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		min-height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
+	.u-listdata{
+		height:100%;
+		display: flex;
+		flex-direction: column;
 	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 0 32rpx 24rpx;
 		background: #fff;
-		min-height: 390rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx 10rpx;
+		border-radius: 8rpx;
 		position: relative;
-
+	
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 24rpx;
 		}
-	}
-
-	.settled {
-		background-color: #09C700;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #FA5555;
-		width: 100rpx;
-		height: 40rpx;
-		text-align: center;
-		line-height: 40rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-
-
-	.billall {}
-
-	.topbill {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
+	
+		.Currentamount {
+			margin-bottom: 4rpx;
+			color: #999;
+			margin-bottom: 20rpx;
+			font-size: 28rpx;
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+		.outstanding{
+			position: absolute;
+			width:96rpx;
+			height: 48rpx;
+			border-radius: 0 8rpx 0 20rpx;
+			right:0;
+			line-height: 48rpx;
+			text-align: center;
+			top:0;
+			z-index: 1;
+			font-size: 22rpx;
+			background-color:#30D3A2 ;
+			color: #fff;
+			&.PropertyFee{
+				background-color:#30D3A2 ;
+			}
+		}
+	
 	}
 </style>
 

pages/index/Immediatecollection/Immediatecollection.vue

@@ -37,8 +37,7 @@
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
 
-					<view class="companylist" @click="seedetail(item)">
-
+					<view class="companylist">
 						<view class="outstanding" :style="{
 						                'background-color': item.isExpedit == 1 ? '#09C700' : '#FA5555',
 						              }">
@@ -53,9 +52,9 @@
 						<view class="Currentamount">
 							欠费金额: <span>￥{{item.amount}}</span>
 						</view>
-						<view class="Currentamount">
+						<!-- <view class="Currentamount">
 							计费周期: {{item.costCycle}}
-						</view>
+						</view> -->
 						<view class="Currentamount">
 							欠费天数:￥{{item.arrearDay}}
 						</view>
@@ -66,6 +65,7 @@
 							联系电话: {{item.phone}}
 						</view>
 						<view class="Callfee">
+							<span @click.stop="seedetail(item)" class="one">催费记录</span>
 							<span v-if="item.isSettled == 0" @click.stop="handleClick(item.id)">催费</span>
 						</view>
 					</view>
@@ -380,11 +380,16 @@
 		display: flex;
 		justify-content: flex-end;
 		span{
-			padding: 16rpx 24rpx;
+			padding: 12rpx 16rpx;
 			border: 1px solid #2E69EB;
 			border-radius: 8rpx;
 			font-size: 24rpx;
 			color: #2E69EB;
+			&.one{
+				border-color: #999;
+				color: #999;
+				margin-right:20rpx;
+			}
 		}
 	}
 	.topbill {

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="billall">
-		<u-cell-group class="toptemplate">
+		<u-cell-group class="toptemplate" v-if="role=='Admin'">
 			<u-cell :title="mytitle"  @click="floorchange">
 				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
 					<u-icon slot="right-icon" size="40" color="#fff" name="search"></u-icon>
@@ -18,7 +18,6 @@
 		</view>
 
 		<view class="u-listdata">
-
 			<view style="padding:16rpx 0 16rpx 32rpx">
 				共有 <span style="color: red">{{totalnumber}}</span>条记录
 			</view>
@@ -41,25 +40,14 @@
 						<view class="Currentamount">
 							扣缴时间: {{item.createDate}}
 						</view>
-
 					</view>
-
 				</u-list-item>
 			</u-list>
-
 		</view>
-
-
-
-
 		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype"
 			@cancel='canceltype'></u-picker>
-
-
 		<u-picker :show="showfloor" :itemHeight="80" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
-
-
 		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
 	</view>
 </template>
@@ -102,6 +90,7 @@
 				columnstype: [
 
 				],
+				role:'',
 				feiyongtype:[],
 
 
@@ -109,7 +98,7 @@
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
-
+			this.role=uni.getStorageSync('role');
 			let getDictDataList = uni.getStorageSync('getDictDataList');
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'PayType') {

pages/login/login.vue

@@ -25,7 +25,7 @@
 
 			<view class="Userprotocols">
 				<view class="Userprotocolchecked">
-					<checkbox style="transform: scale(0.85)" :checked="rememberPsw" @click="checkboxChange" />
+					<checkbox style="transform: scale(0.85)" :checked="rememberPsw" @click="rememberPsw=!rememberPsw" />
 				</view>
 				<view class="Userprotocoltext">记住账号密码</view>
 			</view>
@@ -60,10 +60,6 @@
 		},
 
 		onLoad() {
-			//	 this.getCaptcha();
-			//this.getDeviceInfo();
-			//this.getOAID();
-
 		},
 		onUnload() {
 			//触发水印显示
@@ -74,8 +70,7 @@
 			const HBusername = uni.getStorageSync('HBusername');
 			//缓存的密码
 			const HBpassword = uni.getStorageSync('HBpassword');
-			//console.log("缓存的账号:"+HBusername)
-			//console.log("缓存的密码:"+HBpassword)
+			console.log(HBusername)
 			//有缓存就赋值给文本没有就清空
 			if (HBusername && HBpassword) {
 				this.account = HBusername;
@@ -84,50 +79,15 @@
 				this.account = '';
 				this.password = '';
 			}
-			//自动登录
 		},
 
 		methods: {
-			getDeviceInfo() {
-				plus.device.getInfo({
-					success: function(e) {
-						console.log('getDeviceInfo success: ' + JSON.stringify(e));
-
-					},
-					fail: function(e) {
-						console.log('getDeviceInfo failed: ' + JSON.stringify(e));
-					}
-				});
-			},
-			getOAID() {
-				plus.device.getOAID({
-					success: function(e) {
-						console.log('getOAID success: ' + JSON.stringify(e));
-					},
-					fail: function(e) {
-						console.log('getOAID failed: ' + JSON.stringify(e));
-					}
-				});
-			},
-
-
-
 			//复选框
 			checkboxChange: function(e) {
-				this.rememberPsw = !this.rememberPsw;
-				console.log('111111111111111111', this.rememberPsw)
-				if (this.rememberPsw == true) {
-					//获取缓存的账号 赋值
-					uni.getStorageSync('HBusername', this.account);
-					uni.getStorageSync('HBpassword', this.password);
-				} else { //销毁
-					uni.removeStorageSync('HBusername');
-					uni.removeStorageSync('HBpassword');
-				}
+				console.log(this.rememberPsw)
+				console.log(this.rememberPsw==true)
+			
 			},
-
-
-
 			loginbtn() {
 				if (this.account == "") {
 					this.$refs.uToast.show({
@@ -146,6 +106,15 @@
 					username: this.account,
 					password: this.password,
 				};
+				//是否记住密码
+				if (this.rememberPsw==true) {
+					//获取缓存的账号 赋值
+					uni.setStorageSync('HBusername',this.account);
+					uni.setStorageSync('HBpassword',this.password);
+				} else { //销毁
+					uni.removeStorageSync('HBusername');
+					uni.removeStorageSync('HBpassword');
+				}
 				//登录功能
 				this.$api.post("/login", formData).then((res) => {
 					if (res.data.code == 0) {
@@ -188,9 +157,6 @@
 								uni.removeStorageSync('HBusername');
 								uni.removeStorageSync('HBpassword');
 							}
-
-
-
 							//获取用户的信息，如组织架构，个人信息，权限等
 							Promise.all([
 								this.getpermissions(),
@@ -245,6 +211,7 @@
 					this.$api
 						.get("/user/userInfo", {})
 						.then((res) => {
+							uni.setStorageSync('role',res.data.data.roleCodes[0]);
 							uni.setStorageSync("getuserInfo", res.data.data);
 							resolve(res);
 						})
@@ -275,16 +242,6 @@
 				});
 			},
 
-			// 找回密码
-			forget() {
-				uni.navigateTo({
-					url: "/pages/login/forget",
-					success: (res) => {},
-					fail: () => {},
-					complete: () => {},
-				});
-			},
-
 			// 注册
 			register() {
 				uni.navigateTo({

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -17,7 +17,6 @@
 			</view>
 		</view>
 		<view class="dibu" v-show="dibucaidan">
-		
 			<view class="yucun" v-if='tk'>
 				<u-button type="error" text="退费" @click="prestore('退费')"></u-button>
 			</view>
@@ -104,12 +103,9 @@
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad(options) {
-		//	console.log(options.companyOrgId);
 			this.myid = options.companyOrgId;
 			this.getalldata(this.myid)
-			
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-			console.log('111111111111111111', getDictDataList)
 			for (let i = 0; i < getDictDataList.length; i++) {
 			    if (getDictDataList[i].dictType == 'PayType') {
 			        this.billstype = getDictDataList[i].dataList
@@ -118,10 +114,8 @@
 				    this.PropertyTypedata = getDictDataList[i].dataList
 				}  
 				
-				
 			}
 			
-			
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {
@@ -143,7 +137,7 @@
 			prestore() {
 				this.showpayjine = true;
 			},
-
+		
 			confirmtf() {
 				 
 				if(this.model1.userInfo.amount==''){