Merge branch 'master' of http://git.ringzle.com:3000/liwei2496/wit-uniapp

pages.json

@@ -183,9 +183,18 @@
             {
                 "navigationBarTitleText": "扣缴记录",
                 "enablePullDownRefresh": false
-            }
-            
-        }
+            }      
+        },
+		  {
+		            "path" : "pages/Workorder/Tenantbill/companybill/companybill",
+		            "style" :                                                                                    
+		            {
+		                "navigationBarTitleText": "",
+		                "enablePullDownRefresh": false,
+								"navigationStyle": "custom" // 隐藏系统导航栏
+		            }
+		            
+		        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -44,44 +44,41 @@
 			</t-tr>
 		</t-table> -->
 
-<view class="u-listdata">
-	
-	
-	<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
-		<u-list-item v-for="(item, index) in indexList" :key="index">
-			<!-- <u-cell :title="`列表长度-${index + 1}`">
-				<u-avatar slot="icon" shape="square" size="35" :src="item.url"
-					customStyle="margin: -3px 5px -3px 0"></u-avatar>
-			</u-cell> -->
-			<view class="companylist" @click="seedetail(item)">
-				<view class="settled" v-if="item.status==1">
-					已结清
-				</view>
-				<view class="outstanding" v-if="item.status==0">
-					未结清
-				</view>
-				<h3>{{item.name}}</h3>
-				<view class="Currentamount">
-					本期金额: <span>￥{{item.feeTotal}}</span>
-				</view>
-				<view class="Currentamount">
-					欠费天数: {{item.elecAmount}}
-				</view>
-				<view class="Currentamount">
-					账户余额:￥{{item.balance}}
-				</view>
-				<view class="Currentamount">
-					联系电话: {{item.tel}}
-				</view>
-				<view class="Callfee"  v-if="item.status==0"   @click.stop="handleClick(item.id)">
-					催费
-				</view>
-			</view>
-	
-		</u-list-item>
-	</u-list>
-	
-</view>
+		<view class="u-listdata">
+
+
+			<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="settled" v-if="item.status==1">
+							已结清
+						</view>
+						<view class="outstanding" v-if="item.status==0">
+							未结清
+						</view>
+						<h3>{{item.name}}</h3>
+						<view class="Currentamount">
+							本期金额: <span>￥{{item.feeTotal}}</span>
+						</view>
+						<view class="Currentamount">
+							欠费天数: {{item.elecAmount}}
+						</view>
+						<view class="Currentamount">
+							账户余额:￥{{item.balance}}
+						</view>
+						<view class="Currentamount">
+							联系电话: {{item.tel}}
+						</view>
+						<view class="Callfee" v-if="item.status==0" @click.stop="handleClick(item.id)">
+							催费
+						</view>
+					</view>
+
+				</u-list-item>
+			</u-list>
+
+		</view>
 
 
 
@@ -126,8 +123,6 @@
 				// 	},				
 				// ],
 				indexList: [],
-
-
 				dataList: [],
 				dataForm: {
 					projectId: "",
@@ -146,6 +141,7 @@
 				showfloor: false,
 				loading: false,
 				columns: [],
+				pd: true,
 				columnData: [],
 				myday: '',
 				mytype: '全部',
@@ -192,32 +188,69 @@
 
 
 		methods: {
-			seedetail(e){
+			seedetail(e) {
 				  console.log('222',e)
+let faltesdata={
+	name:e.name,
+	id:e.id,
+	cycle:e.cycle
+}
+  console.log('111111111111111111',faltesdata)
+				uni.navigateTo({
+					url: "/pages/Workorder/Tenantbill/companybill/companybill?para=" + encodeURIComponent(JSON.stringify(faltesdata))
+				})
 			},
-			handleClick(e){
-				  console.log('111111111111111111',e)
-				  
+			handleClick(e) {
+				console.log('111111111111111111', e)
+				this.$api.post('/expeditrecord/charge', {
+						data: e
+					})
+					.then(res => {
+						if (res.data.code == 0) {
+							uni.showToast({
+								title: '催费成功',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none',
+								duration: 1500
+							})
+						}
+
+					})
 			},
 			scrolltolower() {
-				// this.loadmore()				 
-				this.dataForm.page = this.dataForm.page + 1;
-				console.log('111111111111111111', this.dataForm.page)
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return
+				}
+			},
+
+			getalldata() {
+
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
+
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
+							this.dataForm.page = this.dataForm.page + 1;
+							this.pd = true;
 						} else {
 							uni.showToast({
-								title:'暂无更多数据了',
+								title: '暂无更多数据了',
 								icon: 'none',
 								duration: 1500
 							})
+							this.pd = false;
 						}
 
-						console.log('111111111111111111', this.indexList)
 					})
 			},
+
 			loadmore() {
 				// for (let i = 0; i < 30; i++) {
 				// 	this.indexList.push({
@@ -227,14 +260,6 @@
 			},
 
 
-			getalldata() {
-				this.$api.get('/billinfo/paypage', this.dataForm)
-					.then(res => {
-						this.indexList = [];
-						this.indexList = res.data.data.list;
-
-					})
-			},
 			// edit(item) {
 			// 	console.log('111111111111111111', item)
 			// },
@@ -242,11 +267,11 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-			//	console.log('111111111111111111', e.value[0])
+				//	console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.mytype = e.value[0].label;
 				this.dataForm.cycle = e.value[0].id;
-				this.dataForm.page=1;
+				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			typechange() {
@@ -255,7 +280,7 @@
 			dateChange(e) {
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
-				this.dataForm.page=1;
+				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			getDate(type) {
@@ -291,7 +316,7 @@
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
-							this.dataForm.page=1;
+							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
 							this.showdct = true
@@ -345,19 +370,21 @@
 			padding-left: 9rpx;
 		}
 	}
-.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;
-}
+
+	.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;
+	}
+
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -0,0 +1,430 @@
+<template>
+	<view class="">
+		<view class="topname">
+			<view class="topname1" @click="goback">
+				<u-icon name="arrow-left" color="#000000" size="36"></u-icon>
+			</view>
+			<view class="topname2">
+				{{ this.fatherparameter.name}}
+			</view>
+		</view>
+
+		<view class="subsection">
+			<u-subsection :list="list" :current="current" @change="sectionChange"></u-subsection>
+		</view>
+		
+		<!-- 列表 -->
+		<!-- 账单明细 -->
+		<view class="" 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>
+			<view class="yesdata" v-if="nodata==false">
+				<view class="onerecord">
+					共有 <span>1</span>条记录
+				</view>
+				<view class="records">
+					<view class="records1">
+						待支付
+					</view>
+					<view class="Currentamount">
+						物业费: <span>￥{{zddata.amount}}</span>
+					</view>
+					<view class="Currentamount">
+						管理费:￥ {{zddata.glf}}
+					</view>
+					<view class="Currentamount">
+						中央空调使用费:￥ {{zddata.ktf}}
+					</view>
+					<view class="Currentamount">
+						电梯费:￥ {{zddata.dtf}}
+					</view>
+				</view>
+			</view>			
+		</view>
+		<!-- 缴费记录 -->
+		<view class="" v-show="cdshow==false">
+			<view class="topbilledit" @click="typechange">
+				<view class="changetime1">
+					{{expensedata}}
+				</view>
+				<view class="changetime2">
+					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+				</view>
+			</view>
+		<!-- 	列表 -->
+		<view class="nodata" v-if="jfnodata==true" >
+			暂无数据
+		</view>
+			<view class="u-listdata"  v-if="jfnodata==false">
+				
+				
+				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
+					<u-list-item v-for="(item, index) in indexList" :key="index">
+						
+						<view class="companylist" >
+							<view class="settled" v-if="item.status==1">
+								预存
+							</view>
+							<h3>{{item.tenantInfo.name}}</h3>
+							<view class="Currentamount1">
+								扣缴金额: <span>￥{{item.amount}}</span>
+							</view>
+							<view class="Currentamount1">
+								账户余额: {{item.surplus}}
+							</view>
+							<view class="Currentamount1">
+								租户电话:￥{{item.tenantInfo.tel}}
+							</view>
+							<view class="Currentamount1">
+								操作人: {{item.creator}}
+							</view>
+							<view class="Currentamount1">
+								扣缴时间: {{item.createDate}}
+							</view>
+						</view>
+				
+					</u-list-item>
+				</u-list>
+				
+			</view>
+		</view>
+
+
+		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>
+		</u-picker>
+	</view>
+</template>
+
+<script>
+	import {
+		isEmpty,
+		getDictDataList
+	} from "@/utils/index";
+	export default {
+		data() {
+			return {
+				jfnodata:false,
+				showtype: false,
+				cdshow: true,
+				fatherparameter: {},
+				expensedata:'全部',
+				list: ['账单明细', '缴费记录', ],
+				current: 0,
+				dataForm: {
+					tenantId: "",
+					costCycle: "",
+					type: "",
+					page: 1,
+					limit: 10,
+				},
+				indexList: [],
+				payStatusList: [],
+				zddata:{
+					amount:'',
+					dtf:'',
+					ktf:'',
+					glf:'',
+				},
+				nodata:true,
+				pd:true,
+				columnstype: [],
+				jfpost: {
+					tenantId: "",
+					costCycle: "",
+					type: "",
+					page: 1,
+					limit: 10,
+				},
+				
+			}
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad: function(options) { //option为object类型，会序列化上个页面传递的参数
+			//	console.log(options); //打印出上个页面传递的参数。
+			this.fatherparameter = JSON.parse(decodeURIComponent(options.para));
+			
+			
+			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();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {},
+
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+
+		methods: {
+			
+			    getPayTypeList() {
+					this.columnstype=[getDictDataList("PayType")]
+			    },
+			
+			getPayStatusList() {
+				this.payStatusList = getDictDataList("PayStatus");
+			//	console.log('0000', this.payStatusList)
+			},
+			goback() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			
+			
+			canceltype() {
+				this.showtype = false;
+			},
+			confirmtype(e) {
+				console.log('111111111111111111', e.value[0])
+				this.showtype = false;
+				this.expensedata = e.value[0].dictLabel;
+					if( e.value[0].dictLabel=='全部'){
+						this.jfpost.type= '';
+					}	else{
+						this.jfpost.type= e.value[0].dictValue;
+					}		
+								
+					
+				this.indexList=[];
+				this.jfpost.page = 1;
+				 this.getjfdata();
+			},
+			typechange() {
+				this.showtype = true;
+			},
+			sectionChange(index) {
+				this.current = index;
+				if (index == 0) {
+					this.cdshow = true;
+					this.dataForm.page = 1;
+					this.getalldata();
+				} else {
+					this.cdshow = false;
+					this.jfpost.page = 1;
+					this.indexList=[];
+					 this.getjfdata();
+				}
+			},
+			scrolltolower() {
+				if(this.pd){
+					this.getjfdata();
+				}else{
+					 return
+				}
+			},
+			getjfdata(){
+				this.$api.get('/payrecord/page', this.jfpost)
+					.then(res => {
+						//  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;
+								this.pd=true;
+								this.jfnodata=false;
+						} else {
+							uni.showToast({
+								title:'暂无更多数据了',
+								icon: 'none',
+								duration: 1500
+							})
+							this.pd=false;
+							this.jfnodata=true
+						}									
+								
+					})
+			},
+			
+			
+			dateChange(e) {
+				this.myday = e.target.value;
+				this.dataForm.costCycle = e.target.value;
+				this.jfpost.costCycle = e.target.value;
+				
+				this.dataForm.page = 1;
+				this.getalldata();
+			},
+			getalldata() {
+				this.$api.post('/billinfo/billDetail', this.dataForm)
+					.then(res => {
+						//console.log('111111111111111111', res.data)
+					//	this.indexList = [];
+					//	this.indexList = res.data.data;
+					//	console.log('222222', this.indexList)
+					if(res.data.data.length==0){
+						//  console.log('111111111111111111',)
+						this.zddata={};
+						  this.nodata=true;
+					}else{
+						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.nodata=false;
+					}	
+					})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.nodata{
+		text-align: center;
+		padding-top: 400rpx;
+		
+	}
+	.yesdata{
+		
+	}
+	.companylist {
+		margin: 20rpx 30rpx;
+		background: #fff;
+		height: 280rpx;
+		border-radius: 10px;
+		position: relative;
+	
+		h3 {
+			height: 70rpx;
+			line-height: 70rpx;
+			padding-left: 30rpx;
+		}
+	}
+	.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;
+	}
+	.Currentamount {
+		padding-left: 30rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		color: #BCB3A7;
+	
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+	
+	.Currentamount1 {
+		padding-left: 30rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		color: #BCB3A7;
+	
+		span {
+			color: #FA5555;
+			padding-left: 9rpx;
+		}
+	}
+	
+	.records1{
+		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;
+	}
+	.records{
+		display: flex;
+		flex-direction: column;
+		// justify-content: center;
+		position: relative;
+		width: 690rpx;
+		height: 210rpx;
+		background: #fff;
+		margin: 0 auto;
+		border-radius: 9rpx;
+	}
+	.onerecord{
+		width: 750rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		padding-left: 30rpx;
+		color: #999;
+		span{
+			color: red;
+		}
+	}
+	.topbilledit {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #fff;
+		height: 60rpx;
+	}
+
+	.changetime2 {
+		padding-left: 10rpx;
+	}
+
+	.subsection {
+		padding: 30rpx;
+		background: #fff;
+		margin-top: 30rpx;
+	}
+
+	.topname {
+		height: 44px;
+		width: 750rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.topname1 {
+		width: 50rpx;
+		padding-left: 10rpx;
+	}
+
+	.topname2 {
+		width: 700rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+</style>

pages/my/Changepassword/Changepassword.vue

@@ -1,21 +1,23 @@
 <template>
 	<view class="OutermostLayer">
 		<h4>登录密码修改</h4>
-		<u--form labelPosition="left" labelWidth='180' :model="model1" :rules="rules" ref="form1">
-			<u-form-item label="旧登录密码" prop="userInfo.oldpasswoed" borderBottom ref="item1">
-				<u--input v-model="model1.userInfo.oldpasswoed" border="surround"></u--input>
-			</u-form-item>
-			<u-form-item label="新登录密码" prop="userInfo.mewpasswoed1" borderBottom ref="item1">
-				<u--input v-model="model1.userInfo.mewpasswoed1" border="surround"></u--input>
-			</u-form-item>
-			</u-form-item>
-			<u-form-item label="请再次输入" prop="userInfo.mewpasswoed2" borderBottom ref="item1">
-				<u--input v-model="model1.userInfo.mewpasswoed2" border="surround"></u--input>
-			</u-form-item>
-
-		</u--form>
-		<view class="tijiao">
-			<u-button type="primary" @click="submit">确定修改</u-button>
+		<view class="xgmy">
+			<u--form labelPosition="left" labelWidth='180' :model="model1" :rules="rules" ref="form1">
+				<u-form-item label="旧登录密码" prop="userInfo.oldpasswoed" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.oldpasswoed" border="surround"></u--input>
+				</u-form-item>
+				<u-form-item label="新登录密码" prop="userInfo.mewpasswoed1" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.mewpasswoed1" border="surround"></u--input>
+				</u-form-item>
+				</u-form-item>
+				<u-form-item label="请再次输入" prop="userInfo.mewpasswoed2" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.mewpasswoed2" border="surround"></u--input>
+				</u-form-item>
+			
+			</u--form>
+			<view class="tijiao">
+				<u-button type="primary" @click="submit">确定修改</u-button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -82,11 +84,15 @@
 <style lang="scss">
 	.tijiao {
 		margin-top: 50rpx;
+		padding-bottom: 30rpx;
 	}
-
+.xgmy{
+	padding: 20rpx;
+}
 	.OutermostLayer h4 {
 		font-size: 35rpx;
-		margin-bottom: 30rpx;
+		margin-bottom: 10rpx;
+		padding-top: 20rpx;
 		text-align: center;
 	}
 </style>

pages/my/Commentssuggestions/Commentssuggestions.vue

@@ -1,42 +1,45 @@
 <template>
-	<view class="Commentssuggestions">
-		<view class="ssuggestion">
-			请您留下宝贵建议，我们会不断改进，精益求精，更好的为您提供服务。	
+	<view class="OutermostLayer">
+			<view class="Commentssuggestions">
+					<view class="ssuggestion">
+						请您留下宝贵建议，我们会不断改进，精益求精，更好的为您提供服务。	
+					</view>
+			<u--textarea v-model="ssuggestion" placeholder="请输入您的建议和评论" count ></u--textarea>
+			<view class="ssuggestion" style="padding-top: 30rpx;">
+						请您为这款APP打分。	
+					</view>
+			<view class="rates">
+				<view class="rates1">
+					APP界面美观
+				</view>
+				<view class="rates2">
+					<u-rate size=40 :count="count" v-model="score1"></u-rate>
+				</view>
+			</view>
+			<view class="rates">
+				<view class="rates1">
+					APP上手难易
+				</view>
+				<view class="rates2">
+					<u-rate size=40 :count="count" v-model="score2"></u-rate>
+				</view>
+			</view>
+			<view class="rates">
+				<view class="rates1">
+					APP相应速度
+				</view>
+				<view class="rates2">
+					<u-rate size=40 :count="count" v-model="score3"></u-rate>
+				</view>
+			</view>
+			
+			
+			<view class="yijian">
+				<u-button type="primary" text="提交意见"></u-button>
+			</view>
+				</view>
 		</view>
-<u--textarea v-model="ssuggestion" placeholder="请输入您的建议和评论" count ></u--textarea>
-<view class="ssuggestion" style="padding-top: 30rpx;">
-			请您为这款APP打分。	
-		</view>
-<view class="rates">
-	<view class="rates1">
-		APP界面美观
-	</view>
-	<view class="rates2">
-		<u-rate size=40 :count="count" v-model="score1"></u-rate>
-	</view>
-</view>
-<view class="rates">
-	<view class="rates1">
-		APP上手难易
-	</view>
-	<view class="rates2">
-		<u-rate size=40 :count="count" v-model="score2"></u-rate>
-	</view>
-</view>
-<view class="rates">
-	<view class="rates1">
-		APP相应速度
-	</view>
-	<view class="rates2">
-		<u-rate size=40 :count="count" v-model="score3"></u-rate>
-	</view>
-</view>
-
 
-<view class="yijian">
-	<u-button type="primary" text="提交意见"></u-button>
-</view>
-	</view>
 </template>
 
 <script>
@@ -57,8 +60,8 @@ score3:3,
 
 <style>
 	.Commentssuggestions {
-		width: 690rpx;
-		padding: 30rpx;	
+		
+		padding: 20rpx;
 	}
 	.ssuggestion{
 		font-size: 30rpx;

pages/my/Mydistribution/Mydistribution.vue

@@ -1,23 +1,25 @@
 <template>
 	<view class="OutermostLayer">		
-		<view class="addllayer">
-				<u-button type="primary" text="添加" @click="addnewdata"></u-button>
-		</view>
-			<u-cell-group>				
-				 <u-cell title="电力维修" label="B栋13楼电力设备出现问题" @click="distributiondetil"  :isLink="true">
-					 <u-icon slot="icon" size="45" name="order"></u-icon>
-				 </u-cell>
-				 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"   :isLink="true">
-				 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-				 </u-cell>
-				 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
-				 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-				 </u-cell>
-				 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
-				 					 <u-icon slot="icon" size="45" name="order"></u-icon>
-				 </u-cell>
-			</u-cell-group>
-			
+		
+			<view class="paifa">
+				<view class="addllayer">
+						<u-button type="primary" text="添加" @click="addnewdata"></u-button>
+				</view>
+					<u-cell-group>				
+						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题" @click="distributiondetil"  :isLink="true">
+							 <u-icon slot="icon" size="45" name="order"></u-icon>
+						 </u-cell>
+						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"   :isLink="true">
+						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
+						 </u-cell>
+						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
+						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
+						 </u-cell>
+						 <u-cell title="电力维修" label="B栋13楼电力设备出现问题"  @click="distributiondetil"  :isLink="true">
+						 					 <u-icon slot="icon" size="45" name="order"></u-icon>
+						 </u-cell>
+					</u-cell-group>
+			</view>
 			
 		</view>
 </template>
@@ -49,4 +51,7 @@
 .addllayer{
 	margin-bottom: 20rpx;
 }
+.paifa{
+	padding: 20rpx;
+}
 </style>

pages/my/Mydistribution/distributiondetil/distributiondetil.vue

@@ -78,6 +78,7 @@
 		justify-content: space-between;
 		align-items: center;
 		margin-top: 40rpx;
+		padding: 30rpx;
 	}
 	
 	.queding {

pages/my/Mydistribution/distributionedit/distributionedit.vue

@@ -1,48 +1,51 @@
 <template>
 	<view class="OutermostLayer">
-		<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-		<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
-			<u-form-item labelWidth='180' label="任务名称:" prop="userInfo.name" borderBottom ref="item1">
-				<u--input v-model="model1.userInfo.name" border="none"></u--input>
-			</u-form-item>
-			<u-form-item labelWidth='180' label="办结日期:" prop="userInfo.mydays" borderBottom @click="showPicker = true;"
-				ref="item1">
-				<u--input v-model="model1.userInfo.mydays" disabled disabledColor="#ffffff" placeholder="请选择办结日期"
-					border="none"></u--input>
-
-				<u-icon slot="right" name="arrow-right"></u-icon>
-			</u-form-item>
-
-			<u-form-item labelWidth='180' label="任务类型:" prop="userInfo.tasktype" borderBottom @click="showSex = true;"
-				ref="item1">
-				<u--input v-model="model1.userInfo.tasktype" disabled disabledColor="#ffffff" placeholder="请选择任务类型"
-					border="none"></u--input>
-				<u-icon slot="right" name="arrow-right"></u-icon>
-			</u-form-item>
-
-			<u-form-item labelWidth='180' label="紧急程度:" prop="userInfo.taskdegree" borderBottom
-				@click="showtaskdegree = true;" ref="item1">
-				<u--input v-model="model1.userInfo.taskdegree" disabled disabledColor="#ffffff" placeholder="请选择紧急程度"
-					border="none"></u--input>
-				<u-icon slot="right" name="arrow-right"></u-icon>
-			</u-form-item>
-
-			<u-form-item labelWidth='180' label="办理人员:" prop="userInfo.taskdegree" borderBottom
-				@click="showtaskpeople = true;" ref="item1">
-				<u--input v-model="model1.userInfo.taskpeople" disabled disabledColor="#ffffff" placeholder="请选择办理人员"
-					border="none"></u--input>
-				<u-icon slot="right" name="arrow-right"></u-icon>
-			</u-form-item>
-		</u--form>
-
-		<view class="guidang">
-			<view class="queding">
-				<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
-			</view>
-			<view class="queding">
-				<u-button type="primary" text="确定" @click="editdata"></u-button>
-			</view>
+		
+<view class="wfgz">
+	<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+	<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
+		<u-form-item labelWidth='180' label="任务名称:" prop="userInfo.name" borderBottom ref="item1">
+			<u--input v-model="model1.userInfo.name" border="none"></u--input>
+		</u-form-item>
+		<u-form-item labelWidth='180' label="办结日期:" prop="userInfo.mydays" borderBottom @click="showPicker = true;"
+			ref="item1">
+			<u--input v-model="model1.userInfo.mydays" disabled disabledColor="#ffffff" placeholder="请选择办结日期"
+				border="none"></u--input>
+	
+			<u-icon slot="right" name="arrow-right"></u-icon>
+		</u-form-item>
+	
+		<u-form-item labelWidth='180' label="任务类型:" prop="userInfo.tasktype" borderBottom @click="showSex = true;"
+			ref="item1">
+			<u--input v-model="model1.userInfo.tasktype" disabled disabledColor="#ffffff" placeholder="请选择任务类型"
+				border="none"></u--input>
+			<u-icon slot="right" name="arrow-right"></u-icon>
+		</u-form-item>
+	
+		<u-form-item labelWidth='180' label="紧急程度:" prop="userInfo.taskdegree" borderBottom
+			@click="showtaskdegree = true;" ref="item1">
+			<u--input v-model="model1.userInfo.taskdegree" disabled disabledColor="#ffffff" placeholder="请选择紧急程度"
+				border="none"></u--input>
+			<u-icon slot="right" name="arrow-right"></u-icon>
+		</u-form-item>
+	
+		<u-form-item labelWidth='180' label="办理人员:" prop="userInfo.taskdegree" borderBottom
+			@click="showtaskpeople = true;" ref="item1">
+			<u--input v-model="model1.userInfo.taskpeople" disabled disabledColor="#ffffff" placeholder="请选择办理人员"
+				border="none"></u--input>
+			<u-icon slot="right" name="arrow-right"></u-icon>
+		</u-form-item>
+	</u--form>
+	
+	<view class="guidang">
+		<view class="queding">
+			<u-button type="primary" :plain="true" text="返回" @click="returndata"></u-button>
 		</view>
+		<view class="queding">
+			<u-button type="primary" text="确定" @click="editdata"></u-button>
+		</view>
+	</view>
+</view>
 
 
 		<u-picker @cancel='showtaskpeople = false' @confirm='peopleconfirm' :show="showtaskpeople"
@@ -228,4 +231,7 @@ uni.navigateBack({
 	.queding {
 		width: 40%;
 	}
+	.wfgz{
+		padding: 20rpx;
+	}
 </style>

pages/my/Mytask/Taskdetails/Taskdetails.vue

@@ -1,65 +1,67 @@
 <template>
 	<view class="OutermostLayer">
-		<view class="tasktime">
-			任务需在5月15号之前完成，当前剩余49天
-		</view>
-		<u-divider text="分割线" :dot="true"></u-divider>
-		<view class="tasktop">
-			<view class="tasktop1">
-				<view class="taskdetals1">
-					<u-icon name="man-add-fill" color="#2979ff" size="35"></u-icon>
+		<view class="renwu">
+			<view class="tasktime">
+				任务需在5月15号之前完成，当前剩余49天
+			</view>
+			<u-divider text="分割线" :dot="true"></u-divider>
+			<view class="tasktop">
+				<view class="tasktop1">
+					<view class="taskdetals1">
+						<u-icon name="man-add-fill" color="#2979ff" size="35"></u-icon>
+					</view>
+					<view class="taskdetals2">
+						发布人：李伟
+					</view>
 				</view>
-				<view class="taskdetals2">
-					发布人：李伟
+				<view class="tasktop1">
+					<view class="taskdetals1">
+						<u-icon name="calendar-fill" color="#2979ff" size="35"></u-icon>
+					</view>
+					<view class="taskdetals2">
+						办结日期：2023-05-15
+					</view>
 				</view>
-			</view>
-			<view class="tasktop1">
-				<view class="taskdetals1">
-					<u-icon name="calendar-fill" color="#2979ff" size="35"></u-icon>
+				<view class="tasktop1">
+					<view class="taskdetals1">
+						<u-icon name="bell-fill" color="#2979ff" size="35"></u-icon>
+					</view>
+					<view class="taskdetals2">
+						紧急程度：一般
+					</view>
 				</view>
-				<view class="taskdetals2">
-					办结日期：2023-05-15
+				<view class="tasktop1">
+					<view class="taskdetals1">
+						<u-icon name="tags-fill" color="#2979ff" size="35"></u-icon>
+					</view>
+					<view class="taskdetals2">
+						任务类型：日常性工作
+					</view>
 				</view>
 			</view>
-			<view class="tasktop1">
+			<view class="description">
 				<view class="taskdetals1">
-					<u-icon name="bell-fill" color="#2979ff" size="35"></u-icon>
+					<u-icon name="file-text-fill" color="#2979ff" size="35"></u-icon>
 				</view>
 				<view class="taskdetals2">
-					紧急程度：一般
+					请在5月15号之前，把B栋所有楼层的灯光设备检查完毕，并详细记录每层楼道的灯光寿命情况，把损坏的灯泡上报维修部。				
 				</view>
 			</view>
-			<view class="tasktop1">
-				<view class="taskdetals1">
-					<u-icon name="tags-fill" color="#2979ff" size="35"></u-icon>
+			<u-divider text="分割线" :dot="true"></u-divider>
+			<u--textarea v-model="opinion" placeholder="请详细描述反馈" count></u--textarea>
+			
+			<view class="guidang">
+				<view class="queding">
+					<u-button type="primary" text="归档" @click="guidang"></u-button>
 				</view>
-				<view class="taskdetals2">
-					任务类型：日常性工作
+				<view class="queding">
+					<u-button type="primary" :plain="true" text="转办" @click="zhuanban"></u-button>
 				</view>
 			</view>
+			
+			<u-picker :show="show" title='转办人' @cancel='closezb' @confirm="confirm" :columns="columns" keyName="label">
+			</u-picker>
 		</view>
-		<view class="description">
-			<view class="taskdetals1">
-				<u-icon name="file-text-fill" color="#2979ff" size="35"></u-icon>
-			</view>
-			<view class="taskdetals2">
-				请在5月15号之前，把B栋所有楼层的灯光设备检查完毕，并详细记录每层楼道的灯光寿命情况，把损坏的灯泡上报维修部。				
-			</view>
-		</view>
-		<u-divider text="分割线" :dot="true"></u-divider>
-		<u--textarea v-model="opinion" placeholder="请详细描述反馈" count></u--textarea>
-
-		<view class="guidang">
-			<view class="queding">
-				<u-button type="primary" text="归档" @click="guidang"></u-button>
-			</view>
-			<view class="queding">
-				<u-button type="primary" :plain="true" text="转办" @click="zhuanban"></u-button>
-			</view>
-		</view>
-
-		<u-picker :show="show" title='转办人' @cancel='closezb' @confirm="confirm" :columns="columns" keyName="label">
-		</u-picker>
 	</view>
 </template>
 
@@ -110,6 +112,9 @@
 
 
 <style>
+	.renwu{
+		padding: 20rpx;
+	}
 	.guidang {
 		display: flex;
 		justify-content: space-between;

pages/my/Personalinformation/Informationmodification/Informationmodification.vue

@@ -1,4 +1,5 @@
 <template>
+	<view class="OutermostLayer">
 	<view class="Personalinformationedit">
 
 				<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
@@ -118,7 +119,7 @@
 				<view class="submitdata">
 					<u-button  type="primary" @click="submit">提交</u-button>
 				</view>
-			
+			</view>	
 	</view>
 </template>
 
@@ -229,7 +230,6 @@
 
 <style lang="scss">
 .Personalinformationedit{
-	width: 690rpx;
 	padding: 30rpx;
 	
 }

pages/my/Personalinformation/Personalinformation.vue

@@ -1,4 +1,5 @@
 <template>
+	<view class="OutermostLayer">
 	<view class="Personalinformation">
 		<u-cell-group>
 			<u-cell
@@ -46,6 +47,7 @@
 		></u-cell>	
 		</u-cell-group>
 	</view>
+		</view>
 </template>
 
 <script>
@@ -71,7 +73,6 @@
 
 <style lang="scss">
 .Personalinformation{
-	width: 690rpx;
 	padding: 30rpx;
 }
 

uni.scss

@@ -15,7 +15,9 @@
 
 .OutermostLayer {
 		width: 690rpx;
-		padding: 30rpx;	
+		margin: 0rpx auto;	
+		background-color: #fff;
+		border-radius: 9rpx;
 	}
 
 

utils/index.js

@@ -26,6 +26,7 @@ export function isEmpty(v) {
  * @param dictType  字典类型
  */
 export function getDictDataList(dictType, subtype) {
+	
     const type = window.SITE_CONFIG['dictList'].find((element) => (element.dictType === dictType))
     if (type) {
         if (dictType == 'PeopleType') {