样式更改

App.vue

@@ -41,11 +41,35 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import "@/uni_modules/uview-ui/index.scss";
+	*{box-sizing: border-box;}
 	  uni-page-body,html,body{  
 	        height: 100%; 
 			 width: 750rpx;
 			 background: #F6F6F6;
 	    }  
+		.u-button--primary{background-color: #5776E6;}
+		.uni-input-placeholder{text-align: right;}
+		.ml5{margin-left:10rpx;}
+		
+		.contain{
+			height: 100%;
+			padding-bottom: 120rpx;
+			padding-top: 24rpx;
+			.main{
+				padding: 0 32rpx;
+				background-color: #fff;
+			}
+			.tijiao {
+				position: fixed;
+				width: 100%;
+				bottom: 0;
+				left: 0;
+				background-color: #fff;
+				padding: 16rpx 32rpx;
+				box-sizing: border-box;
+			}
+			
+		}
 		
 </style>
 

pages.json

@@ -67,8 +67,9 @@
             "path" : "pages/my/Personalinformation/Personalinformation",
             "style" :
             {
-                "navigationBarTitleText": "个人信息",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": "账号中心",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "white"
             }
 
         }
@@ -387,10 +388,9 @@
         }
     ],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"navigationBarBackgroundColor": "white",
+		"navigationBarTextStyle": "black"
 	},
 
 	// "tabBar": {

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -1,318 +1,198 @@
 <template>
-  <view class="billall">
-    <view class="u-listdata">
-      <view style="padding: 10rpx 0 0 30rpx">
-        共有 <span style="color: red">{{ totalnumber }}</span
-        >条记录
-      </view>
-
-      <u-list @scrolltolower="scrolltolower" :pagingEnabled="true">
-        <u-list-item v-for="(item, index) in indexList" :key="index">
-          <view class="companylist">
-			  <view class="outstanding" @click="kaimen(item)">
-			    开门记录
-			  </view>
-            <view class="outstanding" @click="Remotedooropening(item)">
-              远程开门
-            </view>
-            <view class="outstanding1" @click="setPwd(item.deviceId)">
-              临时密码
-            </view>
-            <view class="outstanding2" @click="seedetail(item)">
-              查看租户
-            </view>
-            <h3>{{ item.name }}</h3>
-            <view class="Currentamount"> 设备编号:{{ item.deviceId }} </view>
-          </view>
-        </u-list-item>
-      </u-list>
-    </view>
-    <!-- 门锁信息 -->
-    <u-modal
-      :show="showms"
-      @confirm="confirmPwd"
-      title="临时密码设置"
-      :showCancelButton="true"
-      @cancel="showms = false"
-    >
-      <view class="slot-content">
-        <u--input placeholder="请输入临时密码" v-model="lsmima"></u--input>
-      </view>
-    </u-modal>
-    <u-notify ref="uNotify" message=""></u-notify>
-  </view>
+	<view class="billall">
+		<view class="u-listdata">
+			<view style="padding: 16rpx 0 16rpx 32rpx">
+				共有 <span style="color: red">{{ totalnumber }}</span>条记录
+			</view>
+
+			<u-list @scrolltolower="scrolltolower" :pagingEnabled="true">
+				<u-list-item v-for="(item, index) in indexList" :key="index">
+					<view class="companylist">
+						<h3>{{ item.name }}</h3>
+						<view class="Currentamount"> 设备编号:{{ item.deviceId }} </view>
+						<view class="Callfee">
+							<span @click="kaimen(item)">开门记录</span>
+							<span @click="Remotedooropening(item)">远程开门</span>
+							<span @click="confirmPwd(item.deviceId)">临时密码</span>
+							<span @click="seedetail(item)">查看租户</span>
+						</view>
+					</view>
+				</u-list-item>
+			</u-list>
+		</view>
+		<!-- 门锁信息 -->
+		<!-- <u-modal :show="showms" @confirm="confirmPwd" title="临时密码设置" :showCancelButton="true" @cancel="showms = false">
+			<view class="slot-content">
+				<u--input placeholder="请输入临时密码" v-model="lsmima"></u--input>
+			</view>
+		</u-modal> -->
+		<u-notify ref="uNotify" message=""></u-notify>
+	</view>
 </template>
 
 <script>
-export default {
-  components: {},
-  data() {
-    return {
-      showms: false,
-      totalnumber: 0,
-      setyesno: true,
-      lsmima: "",
-      indexList: [],
-      dataList: [],
-      dataForm: {
-        currentPage: 1,
-        deviceId: "",
-        pageSize: 10,
-        roomId: "",
-        tempPwd: "",
-        tenantsId: "",
-        userName: "",
-      },
-      showtype: false,
-      showdct: false,
-      mytitle: "",
-      alldata: [],
-      showfloor: false,
-      loading: false,
-      columns: [],
-      pd: true,
-      columnData: [],
-      myday: "",
-      mytype: "全部",
-      showPicker: false,
-    };
-  },
-  //监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-  onLoad() {
-    this.getalldata();
-  },
-  //监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
-  onReady() {
-    // 微信小程序需要用此写法
-  },
-  //监听页面隐藏
-  onHide() {},
-  //监听窗口尺寸变化
-  onResize() {},
-  //监听页面卸载
-  onUnload() {},
-  //监听用户下拉动作，一般用于下拉刷新
-  onPullDownRefresh() {},
-
-  methods: {
-    Remotedooropening(e) {
-      let postdata = {
-        cmdType: "RemoteOpenDoor",
-        roomId: e.roomid,
-      };
-      this.$api.post("/lock/issuedCmd", postdata).then((res) => {
-        if (res.data.code == 0) {
-          this.$refs.uNotify.success(res.data.data);
-        } else {
-          this.$refs.uNotify.error(res.data.msg);
-        }
-      });
-    },
-
-    seedetail(e) {
-      uni.navigateTo({
-        url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`,
-      });
-    },
-    kaimen(e) {
-      uni.navigateTo({
-        url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`,
-      });
-    },
-    setPwd(deviceId) {
-      this.showms = true;
-      this.dataForm.deviceId = deviceId;
-    },
-    confirmPwd() {
-      this.$api
-        .post("/lock/getTempPwd", {
-          tempPwd: this.lsmima,
-          deviceId: this.dataForm.deviceId,
-        })
-        .then((res) => {
-          if (res.data.code == 0) {
-            this.showms = false;
-            this.$refs.uNotify.success(res.data.msg);
-          } else {
-            this.$refs.uNotify.error(res.data.msg);
-          }
-        });
-    },
-    closems() {
-      this.showms = false;
-    },
-    scrolltolower() {
-      if (this.pd) {
-        this.getalldata();
-      } else {
-        return;
-      }
-    },
-    getalldata() {
-      this.$api.post("/lock/page", this.dataForm).then((res) => {
-        this.totalnumber = res.data.data.total;
-        if (res.data.data.list.length != 0) {
-          this.indexList.push(...res.data.data.list);
-          this.dataForm.currentPage = this.dataForm.currentPage + 1;
-          this.pd = true;
-        } else {
-          uni.showToast({
-            title: "暂无更多数据了",
-            icon: "none",
-            duration: 1500,
-          });
-          this.pd = false;
-        }
-      });
-    },
-  },
-};
+	export default {
+		components: {},
+		data() {
+			return {
+				showms: false,
+				totalnumber: 0,
+				setyesno: true,
+				lsmima: "",
+				indexList: [],
+				dataList: [],
+				dataForm: {
+					currentPage: 1,
+					deviceId: "",
+					pageSize: 10,
+					roomId: "",
+					tempPwd: "",
+					tenantsId: "",
+					userName: "",
+				},
+				showtype: false,
+				showdct: false,
+				mytitle: "",
+				alldata: [],
+				showfloor: false,
+				loading: false,
+				columns: [],
+				pd: true,
+				columnData: [],
+				myday: "",
+				mytype: "全部",
+				showPicker: false,
+			};
+		},
+		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+		onLoad() {
+			this.getalldata();
+		},
+		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+		onReady() {
+			// 微信小程序需要用此写法
+		},
+		//监听页面隐藏
+		onHide() {},
+		//监听窗口尺寸变化
+		onResize() {},
+		//监听页面卸载
+		onUnload() {},
+		//监听用户下拉动作，一般用于下拉刷新
+		onPullDownRefresh() {},
+
+		methods: {
+			Remotedooropening(e) {
+				let postdata = {
+					cmdType: "RemoteOpenDoor",
+					roomId: e.roomid,
+				};
+				this.$api.post("/lock/issuedCmd", postdata).then((res) => {
+					if (res.data.code == 0) {
+						this.$refs.uNotify.success(res.data.data);
+					} else {
+						this.$refs.uNotify.error(res.data.msg);
+					}
+				});
+			},
+
+			seedetail(e) {
+				uni.navigateTo({
+					url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`,
+				});
+			},
+			kaimen(e) {
+				uni.navigateTo({
+					url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`,
+				});
+			},
+			// setPwd(deviceId) {
+			// 	this.showms = true;
+			// 	this.dataForm.deviceId = deviceId;
+			// },
+			confirmPwd(deviceId) {
+				this.$api
+					.post("/lock/getTempPwd", {
+						tempPwd: '123456',
+						deviceId: deviceId,
+					})
+					.then((res) => {
+						if (res.data.code == 0) {
+							this.showms = false;
+							this.$refs.uNotify.success(res.data.msg);
+						} else {
+							this.$refs.uNotify.error(res.data.msg);
+						}
+					});
+			},
+			closems() {
+				this.showms = false;
+			},
+			scrolltolower() {
+				if (this.pd) {
+					this.getalldata();
+				} else {
+					return;
+				}
+			},
+			getalldata() {
+				this.$api.post("/lock/page", this.dataForm).then((res) => {
+					this.totalnumber = res.data.data.total;
+					if (res.data.data.list.length != 0) {
+						this.indexList.push(...res.data.data.list);
+						this.dataForm.currentPage = this.dataForm.currentPage + 1;
+						this.pd = true;
+					} else {
+						uni.showToast({
+							title: "暂无更多数据了",
+							icon: "none",
+							duration: 1500,
+						});
+						this.pd = false;
+					}
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-.mensuoxx {
-  width: 750rpx;
-  height: 300rpx;
-
-  h3 {
-    width: 100%;
-    height: 80rpx;
-    text-align: center;
-    line-height: 80rpx;
-    margin-bottom: 50rpx;
-  }
-}
-.mjkg {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  height: 120rpx;
-  border-top: 2px solid #f6f6f6;
-  margin-top: 20rpx;
-}
-.anniu {
-  width: 120rpx;
-  margin-left: 30rpx;
-}
-
-.Currentamount {
-  padding-left: 30rpx;
-  min-height: 50rpx;
-  line-height: 50rpx;
-  color: #bcb3a7;
-
-  span {
-    color: #fa5555;
-    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;
-}
-
-.companylist {
-  margin: 20rpx 30rpx;
-  background: #fff;
-  min-height: 380rpx;
-  border-radius: 10px;
-  position: relative;
-
-  h3 {
-    height: 70rpx;
-    line-height: 70rpx;
-    padding-left: 30rpx;
-  }
-}
-
-.settled {
-  background-color: #2b60de;
-  width: 120rpx;
-  height: 60rpx;
-  text-align: center;
-  line-height: 60rpx;
-  color: #fff;
-  font-size: 14rpx;
-  position: absolute;
-  top: 0px;
-  right: 0px;
-  border-top-right-radius: 10rpx;
-  border-bottom-left-radius: 10rpx;
-}
-
-.outstanding {
-  background-color: #09c700;
-  width: 120rpx;
-  height: 60rpx;
-  text-align: center;
-  line-height: 60rpx;
-  color: #fff;
-  font-size: 14rpx;
-  position: absolute;
-  top: 110rpx;
-  right: 0px;
-  border-top-left-radius: 10rpx;
-  border-bottom-left-radius: 10rpx;
-}
-
-.outstanding1 {
-  background-color: #3090c7;
-  width: 120rpx;
-  height: 60rpx;
-  text-align: center;
-  line-height: 60rpx;
-  color: #fff;
-  font-size: 14rpx;
-  position: absolute;
-  top: 56%;
-  right: 0px;
-  border-top-left-radius: 10rpx;
-  border-bottom-left-radius: 10rpx;
-}
-
-.outstanding2 {
-  background-color: #4e8975;
-  width: 120rpx;
-  height: 60rpx;
-  text-align: center;
-  line-height: 60rpx;
-  color: #fff;
-  font-size: 14rpx;
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  border-top-left-radius: 10rpx;
-  border-bottom-right-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;
-}
+	.Callfee{
+		width: 100%;
+		border-top: 1px solid #eee;
+		padding: 20rpx 0;
+		margin-top: 24rpx;
+		display: flex;
+		justify-content: flex-end;
+		span{
+			padding: 10rpx 16rpx;
+			border: 1px solid #2E69EB;
+			border-radius: 8rpx;
+			font-size: 24rpx;
+			color: #2E69EB;
+			margin-right: 24rpx;
+		}
+	}
+
+	.companylist {
+		margin: 24rpx 32rpx 0;
+		background: #fff;
+		padding: 24rpx 32rpx 0;
+		border-radius: 8rpx;
+		position: relative;
+
+		h3 {
+			margin-bottom: 24rpx;
+		}
+
+		.Currentamount {
+			margin-bottom: 4rpx;
+			color: #999;
+
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
+	}
 </style>

pages/index/EquipmentException/EquipmentException.vue

@@ -1,21 +1,18 @@
 <template>
 	<view class="billall">
 		<u-cell-group class="toptemplate">
-			<u-cell :title="mytitle"  @click="floorchange">
+			<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>
 			</u-cell>
 		</u-cell-group>
-
-
 		<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-item v-for="(item, index) in indexList" :key="index">
-					<view class="companylist" >
+					<view class="companylist">
 						<h3>{{item.deviceName}}</h3>
 						<view class="Currentamount">
 							空间信息:跨境电商大厦-{{ item.positionInfo }}
@@ -34,14 +31,9 @@
 
 				</u-list-item>
 			</u-list>
-
 		</view>
-
-
-		<u-picker :itemHeight="80" :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
-				  :columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
-
-
+		<u-picker :itemHeight="80" :show="showfloor" 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>
@@ -62,8 +54,8 @@
 				dataForm: {
 					buildingId: "",
 					storeyId: "",
-				//	page: 1,
-				//	limit: 10,
+					//	page: 1,
+					//	limit: 10,
 				},
 				pd: true,
 				showtype: false,
@@ -129,66 +121,66 @@
 
 			getalldata() {
 				this.$api.get('/home/actualAlertList', this.dataForm)
-						.then(res => {
+					.then(res => {
 						//	this.totalnumber = res.data.data.total;
-							if(res.data.code==0){
-								console.log('111111111111111111',res.data.data)
-								if(res.data.data==null){
-									this.totalnumber=0;
-									this.indexList=[];
-								}else{
-									this.totalnumber=res.data.data.length;
-									this.indexList=res.data.data;
-								}
-							}else{
-								uni.showToast({
-											title: res.data.msg,
-											icon: 'none',
-											duration: 1500
-										})
+						if (res.data.code == 0) {
+							console.log('111111111111111111', res.data.data)
+							if (res.data.data == null) {
+								this.totalnumber = 0;
+								this.indexList = [];
+							} else {
+								this.totalnumber = res.data.data.length;
+								this.indexList = res.data.data;
 							}
-							// 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: '暂无更多数据了',
-							// 		icon: 'none',
-							// 		duration: 1500
-							// 	})
-							// 	this.pd = false;
-							// }
-						})
+						} else {
+							uni.showToast({
+								title: res.data.msg,
+								icon: 'none',
+								duration: 1500
+							})
+						}
+						// 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: '暂无更多数据了',
+						// 		icon: 'none',
+						// 		duration: 1500
+						// 	})
+						// 	this.pd = false;
+						// }
+					})
 			},
 
 
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree/', {})
-						.then(res => {
+					.then(res => {
 
-							if (res.data.code == 0) {
+						if (res.data.code == 0) {
 							//	this.dataForm.projectId = res.data.data[0].orgId;
 
-								this.mytitle = res.data.data[0].orgName;
-								this.alldata = res.data.data[0].childrenList;
-								//console.log('111111111111111111',  res.data.data[0].childrenList)
-								this.columns = [
-									res.data.data[0].childrenList,
-									res.data.data[0].childrenList[0].childrenList
-								]
-								let allfloor = [];
-								for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
-									allfloor.push(res.data.data[0].childrenList[i].childrenList)
-								}
-								//  console.log('111111111111111111',allfloor)
-								this.columnData = allfloor;
-							//	this.dataForm.page = 1;
-								this.getalldata();
-							} else {
-								this.showdct = true
+							this.mytitle = res.data.data[0].orgName;
+							this.alldata = res.data.data[0].childrenList;
+							//console.log('111111111111111111',  res.data.data[0].childrenList)
+							this.columns = [
+								res.data.data[0].childrenList,
+								res.data.data[0].childrenList[0].childrenList
+							]
+							let allfloor = [];
+							for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
+								allfloor.push(res.data.data[0].childrenList[i].childrenList)
 							}
-						})
+							//  console.log('111111111111111111',allfloor)
+							this.columnData = allfloor;
+							//	this.dataForm.page = 1;
+							this.getalldata();
+						} else {
+							this.showdct = true
+						}
+					})
 			},
 
 			floorchange() {
@@ -206,7 +198,7 @@
 					picker.setColumnValues(1, this.columnData[index])
 					this.loading = false
 				}
-			//	this.getalldata();
+				//	this.getalldata();
 			},
 			confirmfloor(e) {
 				console.log('222222', e.value)
@@ -224,97 +216,61 @@
 		}
 	}
 </script>
-
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			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;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 24rpx 32rpx 0;
 		background: #fff;
-		height: 280rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		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: #30D3A2;
-		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 {
+			margin-bottom: 4rpx;
+			color: #999;
 
+			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 ;
+			}
+		}
 
-
-	.billall {}
-
+	}
 	.topbill {
 		display: flex;
-		justify-content: center;
+		justify-content:center;
 		align-items: center;
 		height: 100rpx;
-		background-color: #e6e6e6;
-	}
+		background-color: #fff;
 
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
+		.topbilledit {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
 
-	.changetime1 {
-		padding-right: 10rpx;
+			.changetime1 {
+				padding-right: 10rpx;
+			}
+		}
 	}
-</style>
+</style>

pages/index/Immediatecollection/Immediatecollection.vue

@@ -1,10 +1,5 @@
 <template>
 	<view class="billall">
-		<!-- 	<u-cell-group>
-			<u-cell :title="mytitle" value="修改" :isLink="true" @click="floorchange">
-				<u-icon slot="icon" size="40" name="map"></u-icon>
-			</u-cell>
-		</u-cell-group> -->
 		<view class="topbill">
 			<view class="topbilledit">
 				<view class="changetime1">
@@ -13,7 +8,7 @@
 					</picker>
 				</view>
 				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 				</view>
 			</view>
 			<view class="topbilledit" @click="typechange">
@@ -21,7 +16,7 @@
 					{{mytype}}
 				</view>
 				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 				</view>
 			</view>
 			<view class="topbilledit" @click="typechanges">
@@ -29,13 +24,13 @@
 					{{mytypes}}
 				</view>
 				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 				</view>
 			</view>
 		</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>
 
@@ -44,17 +39,16 @@
 
 					<view class="companylist" @click="seedetail(item)">
 
-						<view class="settled" :style="{
+						<view class="outstanding" :style="{
 						                'background-color': item.isExpedit == 1 ? '#09C700' : '#FA5555',
 						              }">
 							{{ item.isExpedit == 1 ? "已催费" : "未催费" }}
 						</view>
-	<view class="outstanding" :style="{
+						<!-- <view class="outstanding" :style="{
 						                'background-color': item.isSettled == 1 ? '#09C700' : '#FA5555',
 						              }">
 							{{ item.isSettled == 1 ? "已结清" : "未结清" }}
-						</view>
-
+						</view> -->
 						<h3>{{item.tenantName}}</h3>
 						<view class="Currentamount">
 							欠费金额: <span>￥{{item.amount}}</span>
@@ -71,26 +65,22 @@
 						<view class="Currentamount">
 							联系电话: {{item.phone}}
 						</view>
-						<view class="Callfee" v-if="item.isSettled == 0"  @click.stop="handleClick(item.id)">
-							催费
+						<view class="Callfee">
+							<span v-if="item.isSettled == 0" @click.stop="handleClick(item.id)">催费</span>
 						</view>
 					</view>
-
 				</u-list-item>
 			</u-list>
 
 		</view>
-
-
-
-
-		<u-picker :itemHeight="80" :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :itemHeight="80" :show="showtype" :columns="columnstype" keyName="label" @confirm="confirmtype"
+			@cancel='canceltype'>
 		</u-picker>
 		<u-picker :itemHeight="80" :show="showtypes" :columns="columnstypes" keyName="dictLabel" @confirm="confirmtypes"
 			@cancel='canceltypes'>
 		</u-picker>
 
-		<u-notify ref="uNotify" message="" ></u-notify>
+		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
@@ -132,10 +122,10 @@
 				pd: true,
 				columnData: [],
 				myday: '',
-				mytype: '全部',
-				mytypes: "全部",
+				mytype: '欠费类型',
+				mytypes: "欠费天数",
 				showPicker: false,
-				PayTypedata:[],
+				PayTypedata: [],
 				myday: currentDate,
 				columnstype: [
 					[{
@@ -156,8 +146,6 @@
 					]
 				],
 				columnstypes: [],
-
-
 			}
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
@@ -170,11 +158,9 @@
 				}
 				if (getDictDataList[i].dictType == 'PayType') {
 					this.PayTypedata = getDictDataList[i].dataList;
-
 				}
 
 			}
-
 			this.getalldata();
 			//	this.loadmore();
 		},
@@ -214,24 +200,24 @@
 							// 	icon: 'none',
 							// 	duration: 1500
 							// })
-							this.$refs.uNotify.success('催费成功')	
-							
+							this.$refs.uNotify.success('催费成功')
+
 						} else {
 							// uni.showToast({
 							// 	title: res.data.msg,
 							// 	icon: 'none',
 							// 	duration: 1500
 							// })
-							this.$refs.uNotify.error(res.data.msg)	
+							this.$refs.uNotify.error(res.data.msg)
 						}
-						 let that=this;
-						  setTimeout(function(){
-							  that.dataForm.page = 1;
-						that.indexList = [];
-						that.getalldata();
-						},1000);
-						
-						
+						let that = this;
+						setTimeout(function() {
+							that.dataForm.page = 1;
+							that.indexList = [];
+							that.getalldata();
+						}, 1000);
+
+
 					})
 			},
 			scrolltolower() {
@@ -245,14 +231,13 @@
 				this.showtypes = true;
 			},
 			getalldata() {
-
 				this.$api.get('/expeditrecord/apppage', this.dataForm)
 					.then(res => {
 						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							function transform(a, b) {
 								loop: for (let i = 0; i < a.length; i++) {
-							  for (let j = 0; j < b.length; j++) {
+									for (let j = 0; j < b.length; j++) {
 										if (a[i].billType == b[j].dictValue) {
 											a[i].billType = b[j].dictLabel;
 											continue loop;
@@ -289,27 +274,27 @@
 				this.mytype = e.value[0].label;
 				this.dataForm.billType = e.value[0].id;
 				this.dataForm.page = 1;
-				this.indexList=[];
+				this.indexList = [];
 				this.getalldata();
 			},
 			confirmtypes(e) {
-				 console.log('22222', e.value[0])
-				 if(e.value[0].dictValue=='all'){
-					 
-					 this.showtypes = false;
-					 this.mytypes = e.value[0].dictLabel;
-					 this.dataForm.arrearDay = '';
-					 this.dataForm.page = 1;
-					 this.indexList=[];
-					 this.getalldata();
-				 }else{
-					 this.showtypes = false;
-					 this.mytypes = e.value[0].dictLabel;
-					 this.dataForm.arrearDay = e.value[0].dictValue;
-					 this.dataForm.page = 1;
-					 this.indexList=[];
-					 this.getalldata();
-				 }
+				console.log('22222', e.value[0])
+				if (e.value[0].dictValue == 'all') {
+
+					this.showtypes = false;
+					this.mytypes = e.value[0].dictLabel;
+					this.dataForm.arrearDay = '';
+					this.dataForm.page = 1;
+					this.indexList = [];
+					this.getalldata();
+				} else {
+					this.showtypes = false;
+					this.mytypes = e.value[0].dictLabel;
+					this.dataForm.arrearDay = e.value[0].dictValue;
+					this.dataForm.page = 1;
+					this.indexList = [];
+					this.getalldata();
+				}
 			},
 			canceltypes() {
 				this.showtypes = false;
@@ -318,11 +303,10 @@
 				this.showtype = true;
 			},
 			dateChange(e) {
-				//  console.log('3333',e)
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
 				this.dataForm.page = 1;
-				this.indexList=[];
+				this.indexList = [];
 				this.getalldata();
 			},
 			getDate(type) {
@@ -349,95 +333,77 @@
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			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;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 24rpx 32rpx 0;
 		background: #fff;
-		height: 340rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx 0;
+		border-radius: 8rpx;
 		position: relative;
-
+	
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 24rpx;
 		}
+	
+		.Currentamount {
+			line-height: 40rpx;
+			margin-bottom: 6rpx;
+			color: #999;
+			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 ;
+			}
+		}
+	
 	}
-
-	.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: 90rpx;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
+	.Callfee{
+		width: 100%;
+		border-top: 1px solid #eee;
+		padding: 20rpx 0;
+		margin-top: 24rpx;
+		display: flex;
+		justify-content: flex-end;
+		span{
+			padding: 16rpx 24rpx;
+			border: 1px solid #2E69EB;
+			border-radius: 8rpx;
+			font-size: 24rpx;
+			color: #2E69EB;
+		}
 	}
-
-
-
-	.billall {}
-
 	.topbill {
 		display: flex;
-		justify-content: space-around;
+		justify-content:center;
 		align-items: center;
 		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
+		background-color: #fff;
+	
+		.topbilledit {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			width: 110px;
+			flex: 1;
+			padding: 0 40rpx;
+			.changetime1 {
+				padding-right: 10rpx;
+			}
+		}
 	}
-</style>
+</style>

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -12,7 +12,7 @@
 					{{xjlx}}
 				</view>
 				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 				</view>
 			</view>
 			<view class="topbilledit" @click="typechange">
@@ -24,30 +24,10 @@
 				</view>
 			</view>
 		</view>
-		<!-- 列表 -->
-		<!-- <t-table>
-			<t-tr>
-				<t-th>序号</t-th>
-				<t-th>姓名</t-th>
-				<t-th>年龄</t-th>
-				<t-th>爱好</t-th>
-				<t-th>操作</t-th>
-			</t-tr>
-			<t-tr v-for="item in tableList" :key="item.id">
-				<t-td>{{ item.id + 1 }}</t-td>
-				<t-td>{{ item.name }}</t-td>
-				<t-td>{{ item.age }}</t-td>
-				<t-td>{{ item.hobby }}</t-td>
-				  <t-td align="left"> <u-button @click="edit(item)"  size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
-
-			</t-tr>
-		</t-table> -->
-
 		<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-item v-for="(item, index) in indexList" :key="index">
 					<view class="companylist">
@@ -70,36 +50,22 @@
 			</u-list>
 
 		</view>
-
-
-		<u-picker :show="showtypexunjian" :itemHeight="80" :columns="columnstypexunjian" keyName="dictLabel" @confirm="confirmxunjian"
-			@cancel='cancelxunjian'>
+		<u-picker :show="showtypexunjian" :itemHeight="80" :columns="columnstypexunjian" keyName="dictLabel"
+			@confirm="confirmxunjian" @cancel='cancelxunjian'>
 		</u-picker>
-
-		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="realName" @confirm="confirmtype" @cancel='canceltype'>
+		<u-picker :show="showtype" :itemHeight="80" :columns="columnstype" keyName="realName" @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-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>
 
 <script>
-	// import tTable from '@/components/t-table/t-table.vue';
-	// import tTh from '@/components/t-table/t-th.vue';
-	// import tTr from '@/components/t-table/t-tr.vue';
-
 	import cellGroup from '../../../uni_modules/uview-ui/libs/config/props/cellGroup';
-
-	// import tTd from '@/components/t-table/t-td.vue';
 	export default {
-		components: {
-			// tTable,
-			// tTh,
-			// tTr,
-			// tTd
-		},
+		components: {},
 		data() {
 			const currentDate = this.getDate({
 				format: 'yyyy-mm'
@@ -108,29 +74,14 @@
 				totalnumber: 0,
 				showtypexunjian: false,
 				setyesno: true,
-				// tableList: [{
-				// 		id: 0,
-				// 		name: '张三',
-				// 		age: '19',
-				// 		hobby: '游泳'
-				// 	},
-				// 	{
-				// 		id: 1,
-				// 		name: '李四',
-				// 		age: '21',
-				// 		hobby: '绘画'
-				// 	},
-				// ],
 				indexList: [],
 				xjlx: '巡检类型',
-
 				dataList: [],
 				dataForm: {
-					//projectId: "",
 					buildingId: "",
 					storeyId: "",
 					circuitType: "",
-					circuitPersonId: "",			
+					circuitPersonId: "",
 					page: 1,
 					limit: 10,
 				},
@@ -158,8 +109,6 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-			console.log('111111111111111111', getDictDataList)
-
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'ReviewType') {
 					let pushdata = {
@@ -193,12 +142,18 @@
 
 		methods: {
 			getUserList() {
-				this.$api.get('/user/list',{ page: 1,
-					limit: 999999,})
-						.then(res=>{
-							//	console.log('111111111111111111',res.data.data)
-							this.columnstype=[res.data.data]
-						})
+				this.$api.get('/user/list', {
+						page: 1,
+						limit: 999,
+					})
+					.then(res => {
+						let pushdata = {
+							realName: "全部",
+							id: "",
+						};
+						this.columnstype = [res.data.data];
+						this.columnstype[0].unshift(pushdata)
+					})
 			},
 			scrolltolower() {
 				if (this.pd) {
@@ -214,10 +169,9 @@
 				this.showtypexunjian = false;
 			},
 			confirmxunjian(e) {
-				  console.log('111111111111111111',e)
-				this.xjry = e.value[0].dictLabel;
-				 this.dataForm.circuitType = e.value[0].dictValue;
-				this.indexList=[];
+				this.xjlx = e.value[0].dictLabel;
+				this.dataForm.circuitType = e.value[0].dictValue;
+				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
 				this.showtypexunjian = false;
@@ -226,9 +180,7 @@
 			getalldata() {
 				this.$api.get('/circuitrecord/page', this.dataForm)
 					.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.dataForm.page = this.dataForm.page + 1;
@@ -241,7 +193,6 @@
 								duration: 1500
 							})
 							this.pd = false;
-							//this.jfnodata=true
 						}
 
 
@@ -252,18 +203,17 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				  console.log('111111111111111111',e)
 				this.showtype = false;
 				this.xjry = e.value[0].realName;
 				this.dataForm.circuitPersonId = e.value[0].id;
-				this.indexList=[];
+				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
 			typechange() {
 				this.showtype = true;
 			},
-			
+
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
@@ -274,19 +224,14 @@
 					year = year + 2;
 				}
 				month = month > 9 ? month : '0' + month;
-				// day = day > 9 ? day : '0' + day;
 				return `${year}-${month}`;
 			},
 			getfloor() {
 				this.$api.get('/control/getOrgStructureTree/', {})
 					.then(res => {
-
 						if (res.data.code == 0) {
-							//this.dataForm.projectId = res.data.data[0].orgId;
-
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;
-							//console.log('111111111111111111',  res.data.data[0].childrenList)
 							this.columns = [
 								res.data.data[0].childrenList,
 								res.data.data[0].childrenList[0].childrenList
@@ -295,9 +240,8 @@
 							for (let i = 0; i < res.data.data[0].childrenList.length; i++) {
 								allfloor.push(res.data.data[0].childrenList[i].childrenList)
 							}
-							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
-							this.indexList=[];
+							this.indexList = [];
 							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
@@ -321,15 +265,14 @@
 					picker.setColumnValues(1, this.columnData[index])
 					this.loading = false
 				}
-			//	this.getalldata();
+				//	this.getalldata();
 			},
 			confirmfloor(e) {
-				console.log('222222', e.value)
 				this.mytitle = e.value[0].orgName + e.value[1].orgName;
 				this.dataForm.buildingId = e.value[0].orgId;
 				this.dataForm.storeyId = e.value[1].orgId;
 				this.showfloor = false;
-				this.indexList=[];
+				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
@@ -343,95 +286,44 @@
 </script>
 
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			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;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 24rpx 32rpx 0;
 		background: #fff;
-		height: 280rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		border-radius: 8rpx;
 		position: relative;
 
 		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
+			margin-bottom: 16rpx;
 		}
-	}
-
-	.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;
-	}
 
+		.Currentamount {
+			margin-bottom: 8rpx;
+			color: #999;
 
+			span {
+				color: #FA5555;
+				padding-left: 9rpx;
+			}
+		}
 
-	.billall {}
+	}
 
 	.topbill {
 		display: flex;
 		justify-content: space-around;
 		align-items: center;
 		height: 100rpx;
-		background-color: #e6e6e6;
-	}
+		background-color: #fff;
 
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
+		.topbilledit {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
 
-	.changetime1 {
-		padding-right: 10rpx;
+			.changetime1 {
+				padding-right: 10rpx;
+			}
+		}
 	}
-</style>
+</style>

pages/index/Onlinewarranty/Onlinewarranty.vue

@@ -1,55 +1,58 @@
 <template>
-	<view class="OutermostLayer">
-
-		<view class="wfgz">
+	<view class="contain">
+		<view class="main">
 			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-			<u--form labelPosition="left" :model="model1" :rules="rules"  ref="form1">
+			<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1">
 				<!-- <u-form-item labelWidth='180' label="任务名称:" prop="userInfo.contactPerson" borderBottom ref="item1">
                     <u--input v-model="model1.userInfo.contactPerson" border="none"></u--input>
                 </u-form-item> -->
 
-				<u-form-item labelWidth='180'  label="报修位置:" prop="userInfo.repairPositionName" borderBottom
+				<u-form-item labelWidth='180' label="报修位置:" prop="userInfo.repairPositionName" borderBottom
 					@click="showfloor = true;" ref="item1" :required=true>
 
-					<u--input  v-model="model1.userInfo.repairPositionName" disabled disabledColor="#ffffff"
+					<u--input v-model="model1.userInfo.repairPositionName" disabled disabledColor="#ffffff"
 						placeholder="请选择报修位置" border="none"></u--input>
-					<u-icon slot="right" contactPerson="arrow-right"></u-icon>
+					<u-icon name="arrow-right" class="ml5"></u-icon>
 				</u-form-item>
 				<u-form-item labelWidth='180' label="报修区域:" prop="userInfo.repairRegionName" borderBottom
 					@click="showSex = true;" ref="item1" :required=true>
 					<u--input v-model="model1.userInfo.repairRegionName" disabled disabledColor="#ffffff"
 						placeholder="请选择报修区域" border="none"></u--input>
-					<u-icon slot="right" contactPerson="arrow-right"></u-icon>
+					<u-icon name="arrow-right" class="ml5"></u-icon>
 				</u-form-item>
 
 				<u-form-item labelWidth='180' label="报修类型:" prop="userInfo.repairTypeName" borderBottom
 					@click="showtaskdegree = true;" ref="item1" :required=true>
 					<u--input v-model="model1.userInfo.repairTypeName" disabled disabledColor="#ffffff"
 						placeholder="请选择报修类型" border="none"></u--input>
-					<u-icon slot="right" contactPerson="arrow-right"></u-icon>
+					<u-icon name="arrow-right" class="ml5"></u-icon>
 				</u-form-item>
 				<u-form-item labelWidth='180' label="联系人:" prop="userInfo.contactPerson" borderBottom ref="item1"
-				:required=true>
-					<u--input v-model="model1.userInfo.contactPerson" border="none"></u--input>
+					:required=true>
+					<u--input v-model="model1.userInfo.contactPerson" border="none" placeholder="请输入"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth='180' label="联系电话:" prop="userInfo.contactPhone" borderBottom ref="item1"
+					:required=true>
+					<u--input v-model="model1.userInfo.contactPhone" border="none" placeholder="请输入"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth='180' label="联系电话:" prop="userInfo.contactPhone" borderBottom
-					ref="item1" :required=true>
-					<u--input v-model="model1.userInfo.contactPhone" border="none"></u--input>
+				<u-form-item labelWidth='180' label="故障描述:" prop="userInfo.faultDes" ref="item1" :required=true>
 				</u-form-item>
-				<u-form-item labelWidth='180' label="故障描述:" prop="userInfo.faultDes" borderBottom ref="item1"
-				:required=true>
-					<u--input v-model="model1.userInfo.faultDes" border="none"></u--input>
+				<u-form-item labelWidth='180' borderBottom style="padding: 0;">
+					<u-textarea v-model="model1.userInfo.faultDes" border="none" placeholder="请输入" height="140"
+						style="padding: 0 20rpx;"></u-textarea>
 				</u-form-item>
-				<u-form-item labelWidth='180' label="上传照片:" prop="userInfo.faultPics" borderBottom ref="item1">
+				<u-form-item labelWidth='180' label="上传照片:" prop="userInfo.faultPics" ref="item1" :required=true>
+				</u-form-item>
+				<u-form-item labelWidth='180' borderBottom>
 					<view class="uploadPart">
-						<view class="allimg"  v-for="img in fileList1">
-							<image :src="img" mode="heightFix" class="newimg" >
-
-							</image>
-							<u-icon @click="deletePic(img)" class="mytrash" name="trash" color="red" size="38"></u-icon>
+						<view class="allimg" v-for="img in fileList1">
+							<image :src="img" mode="aspectFill" class="newimg"></image>
+							<u-icon @click="deletePic(img)" class="mytrash" name="close-circle" color="#999"
+								size="30"></u-icon>
 						</view>
 
-						<span @click="uploadImg" class="uploadBox"  v-if="fileList1.length<4"><u-icon name="plus"></u-icon></span>
+						<span @click="uploadImg" class="uploadBtn" v-if="fileList1.length<3"><u-icon color="#5c8fff"
+								size="30px" name="camera-fill"></u-icon></span>
 					</view>
 				</u-form-item>
 
@@ -57,30 +60,19 @@
 			</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>
-
 
+		</view>
+		<view class="tijiao">
+			<u-button type="primary" text="提交" @click="editdata"></u-button>
+		</view>
 		<u-picker @cancel='showtaskdegree = false' :itemHeight="80" @confirm='degreeconfirm' :show="showtaskdegree"
 			:columns="columnshowtaskdegree" keyName="label">
 		</u-picker>
-
-		<u-picker @cancel='showSex = false' :itemHeight="80" @confirm='typeconfirm' :show="showSex" :columns="columnsquyu"
-			keyName="label">
+		<u-picker @cancel='showSex = false' :itemHeight="80" @confirm='typeconfirm' :show="showSex"
+			:columns="columnsquyu" keyName="label">
 		</u-picker>
-
-		<u-picker :show="showfloor" ref="uPicker" :itemHeight="80" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
-			keyName="orgName" :columns="columns" @change="changeHandler"></u-picker>
-
-
-
+		<u-picker :show="showfloor" ref="uPicker" :itemHeight="80" :loading="loading" @confirm="confirmfloor"
+			@cancel='cancelfloor' keyName="orgName" :columns="columns" @change="changeHandler"></u-picker>
 
 	</view>
 </template>
@@ -91,7 +83,7 @@
 		components: {},
 		data() {
 			return {
-				uploadUrl:BaseApi.BaseApi + '/uploadFile',
+				uploadUrl: BaseApi.BaseApi + '/uploadFile',
 				loading: false,
 				fileList1: [],
 				xiangji: require('@/static/index/xj.png'),
@@ -221,19 +213,19 @@
 		methods: {
 
 			// 删除图片
-						deletePic(event) {
-							this.fileList1.splice(event.index, 1)
-						},
+			deletePic(event) {
+				this.fileList1.splice(event.index, 1)
+			},
 
 			// 新增图片
 			uploadImg() {
 				uni.chooseImage({
-					count:4,
+					count: 3,
 					success: (chooseImageRes) => {
 						const tempFilePaths = chooseImageRes.tempFilePaths;
-						for(let i=0;i<tempFilePaths.length;i++) {
+						for (let i = 0; i < tempFilePaths.length; i++) {
 							uni.uploadFile({
-									url:  BaseApi.BaseApi + '/uploadFile',
+								url: BaseApi.BaseApi + '/uploadFile',
 								filePath: tempFilePaths[i],
 								name: 'file',
 								formData: {
@@ -243,7 +235,7 @@
 									//console.log(uploadFileRes);
 									this.fileList1.push(JSON.parse(uploadFileRes.data).data)
 									console.log(this.fileList1);
-									this.model1.userInfo.faultPics=this.fileList1.join(',')
+									this.model1.userInfo.faultPics = this.fileList1.join(',')
 								}
 							});
 						}
@@ -262,7 +254,7 @@
 					indexs,
 					picker = this.$refs.uPicker
 				} = e
-			//	console.log('999999', columnIndex, index, indexs)
+				//	console.log('999999', columnIndex, index, indexs)
 				if (columnIndex == 0) {
 					//	this.loading = true
 
@@ -271,13 +263,13 @@
 						//console.log('66666', )
 						picker.setColumnValues(2, [])
 					} else {
-					//	console.log('00000000', )
+						//	console.log('00000000', )
 						picker.setColumnValues(2, this.alldata[indexs[0]].childrenList[0].childrenList)
 					}
 
 				} else if (columnIndex == 1) {
 					// picker为选择器this实例，变化第三列对应的选项
-				//	console.log('2222222',this.alldata[indexs[0]].childrenList[indexs[1]])
+					//	console.log('2222222',this.alldata[indexs[0]].childrenList[indexs[1]])
 
 					if (this.alldata[indexs[0]].childrenList[indexs[1]].childrenList == null) {
 						picker.setColumnValues(2, [])
@@ -290,15 +282,16 @@
 
 			},
 			confirmfloor(e) {
-				if(e.value[2]==undefined){
-					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName ;
+				if (e.value[2] == undefined) {
+					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName;
 
 					this.model1.userInfo.buildingId = e.value[0].orgId;
 					this.model1.userInfo.storeyId = e.value[1].orgId;
 					this.model1.userInfo.houseId = e.value[1].orgId;
-					this.model1.userInfo.repairPosition =e.value[1].orgId;
-				}else{
-					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName + '/' + e.value[2].orgName;
+					this.model1.userInfo.repairPosition = e.value[1].orgId;
+				} else {
+					this.model1.userInfo.repairPositionName = e.value[0].orgName + '/' + e.value[1].orgName + '/' + e
+						.value[2].orgName;
 					this.model1.userInfo.buildingId = e.value[0].orgId;
 					this.model1.userInfo.storeyId = e.value[1].orgId;
 					this.model1.userInfo.houseId = e.value[2].orgId;
@@ -320,15 +313,21 @@
 
 							//	this.model1.userInfo.myposition = res.data.data[0].orgcontactPerson;
 							this.alldata = res.data.data[0].childrenList;
-							for(let pi=0;pi<this.alldata.length;pi++){
-							for(let i=0;i<this.alldata[pi].childrenList.length;i++){
-								if(!this.alldata[pi].childrenList[i].childrenList){
-									this.alldata[pi].childrenList[i].childrenList=[{orgName:'公共区域',orgId:''}];
-								}else{
-									this.alldata[pi].childrenList[i].childrenList.unshift({orgName:'公共区域',orgId:''})
+							for (let pi = 0; pi < this.alldata.length; pi++) {
+								for (let i = 0; i < this.alldata[pi].childrenList.length; i++) {
+									if (!this.alldata[pi].childrenList[i].childrenList) {
+										this.alldata[pi].childrenList[i].childrenList = [{
+											orgName: '公共区域',
+											orgId: ''
+										}];
+									} else {
+										this.alldata[pi].childrenList[i].childrenList.unshift({
+											orgName: '公共区域',
+											orgId: ''
+										})
+									}
 								}
 							}
-							}
 							this.columns = [
 								this.alldata,
 								this.alldata[0].childrenList,
@@ -355,13 +354,13 @@
 			editdata() {
 				//console.log('111111111111111111', this.model1.userInfo)
 				this.$refs.form1.validate().then(res => {
-				//	uni.$u.toast('校验通过')
-					this.$api.post('/repairorder',this.model1.userInfo)
-					.then(res=>{
-					uni.navigateBack({
-					    delta: 1
-					});
-					})
+					//	uni.$u.toast('校验通过')
+					this.$api.post('/repairorder', this.model1.userInfo)
+						.then(res => {
+							uni.navigateBack({
+								delta: 1
+							});
+						})
 
 
 				}).catch(errors => {
@@ -372,23 +371,18 @@
 			},
 
 			typeconfirm(e) {
-
-				//  console.log('111111111111111111', e.value[0])
 				this.model1.userInfo.repairRegion = e.value[0].id;
 				this.model1.userInfo.repairRegionName = e.value[0].label;
 
 				this.showSex = false;
-				// this.model1.userInfo.sex = e.contactPerson
 				this.$refs.form1.validateField('userInfo.repairRegionName')
 			},
 
 			degreeconfirm(e) {
-				//console.log('111111111111111111', e.value[0].label)
 				this.model1.userInfo.repairType = e.value[0].id;
 				this.model1.userInfo.repairTypeName = e.value[0].label;
 
 				this.showtaskdegree = false;
-				// this.model1.userInfo.sex = e.contactPerson
 				this.$refs.form1.validateField('userInfo.repairTypeName')
 			},
 
@@ -402,46 +396,36 @@
 	};
 </script>
 
-<style>
-	.guidang {
+<style lang="scss">
+	.uploadPart {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 40rpx;
-	}
-
-	.queding {
-		width: 40%;
-	}
-
-	.wfgz {
-		margin: 20rpx;
-		margin-top: 0px;
-	}
-.uploadBox{
-	    width: 50px;
-	    height: 50px;
-	    line-height: 50px;
-	    text-align: center;
-	    border: 1px solid #ddd;
-	    display: flex;
-	    justify-content: center;
-	    align-items: center;
-	    border-radius: 3px;
-}
-.uploadPart{display: flex;
-	align-items: center;
-}
-	.newimg{
-		width:120rpx;height:120rpx;margin-right: 10rpx;
-	}
-	.allimg{
-		width:140rpx;height:140rpx;
-		position: relative;
+		justify-content: center;
+		width: 100%;
+
+		.uploadBtn {
+			width: 160rpx;
+			height: 160rpx;
+			background-color: #ECF0FF;
+			text-align: center;
+			border-radius: 4rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+
+		.allimg {
+			position: relative;
+		}
+
+		.newimg {
+			width: 160rpx;
+			height: 160rpx;
+			margin-right: 10rpx;
+		}
+		.mytrash {
+			position: absolute;
+			top: 2px;
+			right: 10px;
+		}
 	}
-.mytrash{
-	position: absolute;
-	top: 2px;
-	right: 10px;
-}
-</style>
+</style>

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -7,36 +7,24 @@
 			</u-cell>
 		</u-cell-group>
 		<view class="topbill">
-			<view class="topbilledit">
-				<!-- <view class="changetime1">
-					<picker mode="date" :value="myday" fields="month" @change="dateChange">
-						<view class="selestDate">{{myday}}</view>
-					</picker>
-				</view>
-				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
-				</view> -->
-			</view>
 			<view class="topbilledit" @click="typechange">
 				<view class="changetime1">
 					{{mytype}}
 				</view>
 				<view class="changetime2">
-					<u-icon name="arrow-down-fill" color="#666666" size="20"></u-icon>
+					<u-icon name="arrow-down-fill" color="#999" size="20"></u-icon>
 				</view>
 			</view>
 		</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-item v-for="(item, index) in indexList" :key="index">
-
 					<view class="companylist" @click="seedetail(item)">
-
 						<view class="outstanding">
 							{{item.type}}
 						</view>
@@ -123,16 +111,12 @@
 		onLoad() {
 
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-			// console.log('111111111111111111', getDictDataList)
-
 			for (let i = 0; i < getDictDataList.length; i++) {
 				if (getDictDataList[i].dictType == 'PayType') {
 					this.columnstype = [getDictDataList[i].dataList]
 					this.feiyongtype=getDictDataList[i].dataList;
 				}
 			}
-			console.log('111111111111111111',this.columnstype)
-
 			this.getfloor();
 			//	this.loadmore();
 		},
@@ -153,10 +137,6 @@
 
 
 		methods: {
-			seedetail(e) {
-				console.log('222', e)
-			},
-
 			scrolltolower() {
 				if (this.pd) {
 					this.getalldata();
@@ -164,15 +144,10 @@
 					return
 				}
 			},
-
 			getalldata() {
 				this.$api.get('/payrecord/page', this.dataForm)
 					.then(res => {
-						// this.totalnumber=res.data.data.total;
-						// this.indexList = [];
-						// this.indexList = res.data.data.list;
 						this.totalnumber = res.data.data.total;
-
 						function transform(a, b) {
 							loop: for (let i = 0; i < a.length; i++) {
 								for (let j = 0; j < b.length; j++) {
@@ -207,7 +182,6 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				if (e.value[0].dictValue == 'all') {
 					this.mytype = e.value[0].dictLabel;
@@ -293,97 +267,61 @@
 		}
 	}
 </script>
-
 <style lang="scss">
-	.Currentamount {
-		padding-left: 30rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			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;
-	}
-
 	.companylist {
-		margin: 20rpx 30rpx;
+		margin: 24rpx 32rpx 0;
 		background: #fff;
-		height: 280rpx;
-		border-radius: 10px;
+		padding: 24rpx 32rpx;
+		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: #30D3A2;
-		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 {
+			margin-bottom: 4rpx;
+			color: #999;
 
+			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 ;
+			}
+		}
 
-	.billall {}
-
+	}
 	.topbill {
 		display: flex;
-		justify-content: center;
+		justify-content:center;
 		align-items: center;
 		height: 100rpx;
-		background-color: #e6e6e6;
-	}
+		background-color: #fff;
 
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
+		.topbilledit {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
 
-	.changetime1 {
-		padding-right: 10rpx;
+			.changetime1 {
+				padding-right: 10rpx;
+			}
+		}
 	}
-</style>
+</style>

pages/index/index.vue

@@ -4,7 +4,7 @@
 			<view style="height: 20px;"></view>
 			<u-cell title="电商园四期—B座" :border="false">
 				<u-icon slot="icon" size="40" color="#fff" name="map"></u-icon>
-				<u-icon slot="right-icon" size="40" color="#fff" name="account"></u-icon>
+				<u-icon slot="right-icon" size="40" color="#fff" name="account" @click="toUser()"></u-icon>
 			</u-cell>
 		</u-cell-group>
 		<view class="Homepage_suspension"
@@ -324,7 +324,11 @@
 					url: '/pages/my/my'
 				})
 			},
-
+			toUser(){
+				uni.navigateTo({
+					url:'/pages/my/Personalinformation/Personalinformation'
+				})
+			},
 			getalldata() {
 				this.$api.get('/home/homedata', {})
 					.then(res => {
@@ -578,7 +582,7 @@
 		z-index: 3;
 	}
 	.tableBox{
-		padding:0 32rpx 20rpx 32rpx;
+		// padding:0 32rpx 20rpx 32rpx;
 		background-color: #fff;
 		border-radius: 8rpx;
 		.table{

pages/login/login.vue

@@ -331,14 +331,17 @@
 		margin-top: 60rpx;
 		display: flex;
 		align-items: center;
-		justify-content: flex-start;
+		justify-content: flex-end;
+		font-size: 12px;
 	}
 	
 	.Userprotocols{
-		margin-top: 30rpx;
+		margin-top: -30rpx;
+		margin-right:-70rpx;
 		display: flex;
 		align-items: center;
-		justify-content: flex-start;
+		justify-content: flex-end;
+		transform: scale(.75);
 	}
 	.Userprotocoltext{
 		color: #5C8FFF;
@@ -380,7 +383,7 @@
 			display: flex;
 			    align-items: center;
 			    justify-content: center;
-			    margin-top: 100rpx;
+			    margin-top: 140rpx;
 		}
 		.login-btn {
 			margin-top: 20rpx;

pages/my/Changepassword/Changepassword.vue

@@ -1,22 +1,23 @@
 <template>
-		<view class="xgmy">
-			<u--form labelPosition="left" labelWidth='180' :model="model1" :rules="rules" ref="form1">
-				<u-form-item label="旧登录密码" prop="userInfo.password" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.password" border="surround" clearable></u--input>
-				</u-form-item>
-				<u-form-item label="新登录密码" prop="userInfo.newPassword" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.newPassword" border="surround" clearable></u--input>
-				</u-form-item>
-				</u-form-item>
-				<u-form-item label="请再次输入" prop="userInfo.confirmPassword" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.confirmPassword" border="surround" clearable></u--input>
-				</u-form-item>
-			
-			</u--form>
-			<view class="tijiao">
-				<u-button type="primary" @click="submit">确定修改</u-button>
-			</view>
-		<u-notify ref="uNotify" message="" ></u-notify>
+	<view class="main">
+		<u--form labelPosition="left" labelWidth='180' :model="model1" :rules="rules" ref="form1">
+			<u-form-item label="旧登录密码" prop="userInfo.password" borderBottom ref="item1" required>
+				<u--input v-model="model1.userInfo.password" border="none" clearable placeholder="请输入"></u--input>
+			</u-form-item>
+			<u-form-item label="新登录密码" prop="userInfo.newPassword" borderBottom ref="item1" required>
+				<u--input v-model="model1.userInfo.newPassword" border="none" clearable placeholder="请输入"></u--input>
+			</u-form-item>
+			</u-form-item>
+			<u-form-item label="请再次输入" prop="userInfo.confirmPassword" borderBottom ref="item1" required>
+				<u--input v-model="model1.userInfo.confirmPassword" border="none" clearable
+					placeholder="请输入"></u--input>
+			</u-form-item>
+
+		</u--form>
+		<view class="tijiao">
+			<u-button type="primary" @click="submit">确定修改</u-button>
+		</view>
+		<u-notify ref="uNotify" message=""></u-notify>
 	</view>
 </template>
 
@@ -24,12 +25,12 @@
 	export default {
 		data() {
 			return {
-				 dataForm: {
-				        password: "",
-				        newPassword: "",
-				        confirmPassword: "",
-				      },
-				
+				dataForm: {
+					password: "",
+					newPassword: "",
+					confirmPassword: "",
+				},
+
 				model1: {
 					userInfo: {
 						password: '',
@@ -69,29 +70,29 @@
 		methods: {
 			submit() {
 				this.$refs.form1.validate().then(res => {
-					if(this.model1.userInfo.newPassword!=this.model1.userInfo.confirmPassword){
+					if (this.model1.userInfo.newPassword != this.model1.userInfo.confirmPassword) {
 						uni.$u.toast('您的新密码不一致，请重新输入')
-					}else{
+					} else {
 						//uni.$u.toast('校验通过')
 						//  console.log('111111111111111111',this.model1.userInfo)
-						  let postdata={
-							  "newPassword":this.model1.userInfo.newPassword,
-							    "password": this.model1.userInfo.password
-						  }
-						  
-						this.$api.put('/user/password',postdata)
-						.then(res=>{
-						if(res.data.code==0){
-							uni.navigateTo({
-								url: '/pages/login/login'
+						let postdata = {
+							"newPassword": this.model1.userInfo.newPassword,
+							"password": this.model1.userInfo.password
+						}
+
+						this.$api.put('/user/password', postdata)
+							.then(res => {
+								if (res.data.code == 0) {
+									uni.navigateTo({
+										url: '/pages/login/login'
+									})
+								} else {
+									this.$refs.uNotify.error(res.data.msg)
+								}
+
 							})
-						}else{
-							this.$refs.uNotify.error(res.data.msg)	
-						}						
-						
-						})
 					}
-					
+
 				}).catch(errors => {
 					uni.$u.toast('校验失败')
 				})
@@ -101,19 +102,3 @@
 
 	}
 </script>
-
-<style lang="scss">
-	.tijiao {
-		margin-top: 50rpx;
-		padding-bottom: 30rpx;
-	}
-.xgmy{
-	padding: 20rpx;
-}
-	.OutermostLayer h4 {
-		font-size: 35rpx;
-		margin-bottom: 10rpx;
-		padding-top: 20rpx;
-		text-align: center;
-	}
-</style>

pages/my/Personalinformation/Personalinformation.vue

@@ -24,7 +24,7 @@
 		methods: {
 			editdata() {
 				uni.navigateTo({
-					url: '/pages/my/Personalinformation/Changepassword/Changepassword'
+					url: '/pages/my/Changepassword/Changepassword'
 				})
 			},
 		}