wh 1 年之前
父节点
当前提交
10e7cf9310

+ 3 - 0
pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -9,6 +9,9 @@
       <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>

+ 2 - 1
pages/Workorder/Remotecontrol/Remotecontrol.vue

@@ -12,7 +12,7 @@
 		</view> -->
 
 		<u-cell-group class="toptemplate">
-			<u-cell :title="mytitle" @click="floorchange">
+			<u-cell :title="mytitle" @click="floorchange"  :border="false">
 				<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>
@@ -455,6 +455,7 @@
 							}).then((res) => {
 								uni.hideLoading()
 								if (res.data.code == 0) {
+									this.dataForm.page=1;
 									that.getDataList();
 									uni.showLoading({
 										title: "操作成功",

+ 150 - 107
pages/index/index.vue

@@ -1,18 +1,17 @@
 <template>
 	<view class="content">
-<view class="topnames" >
-			首页
-		</view>
-		<!--<view class="Homepage_header">-->
-
-		<!--</view>-->
-
+		<u-cell-group class="toptemplate">
+			<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-cell>
+		</u-cell-group>
 		<view class="Homepage_suspension"
 			v-if="$has('app:InspectionRecord')||$has('app:OnlineReport')||$has('app:WithholdingRecord')">
 			<view class="Suspension">
 				<view class="online" @click="Onlinewarranty" v-if="$has('app:OnlineReport')">
 					<view>
-						<!-- <img :src="srcxianshang1" alt="" style="margin-left: 5rpx;"> -->
 						<u--image mode="widthFix" :src="srcxianshang1" width="80rpx" height="80rpx"></u--image>
 					</view>
 					<view style="font-size: 28rpx;color: #697081;">线上报修</view>
@@ -38,25 +37,25 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;font-weight: bold;">实时巡检</span>
+						<span>实时巡检</span>
+						<text class="bootomBg"></text>
 					</view>
 					<view class="processing" v-if="$has('app:ImmediateInspection')">
 						<view class="immediately" @click="Immediateinspection">
 							<span style="font-size: 25rpx; color: #5c8fff; ">立即巡检</span>
 							<u-icon name="arrow-right" color="#5c8fff" size="16rpx"></u-icon>
 						</view>
-
 					</view>
 				</view>
 				<view class="wait">
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">今日待巡检</view>
+						<view style="font-size: 24rpx;color: #697081;">今日待巡检</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
 							{{inspectionInfoList.todayTotalNum}}
 						</view>
 					</view>
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">今日已巡检</view>
+						<view style="font-size: 24rpx;color: #697081;">今日已巡检</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
 							{{inspectionInfoList.todayNum}}
 						</view>
@@ -70,7 +69,8 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;font-weight: bold;">工单待办</span>
+						<span>工单待办</span>
+						<text class="bootomBg"></text>
 					</view>
 					<view class="processing" v-if="$has('app:WorkorderTobeDone')">
 						<view class="immediately" @click="Workordertodone">
@@ -82,19 +82,19 @@
 				</view>
 				<view class="wait">
 					<view v-if="$has('app:Tobeassigned')">
-						<view style="font-size: 26rpx;color: #697081;">待指派</view>
+						<view style="font-size: 24rpx;color: #697081;">待指派</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
 							{{workList[1]}}
 						</view>
 					</view>
 					<view v-if="$has('app:Toberepaired')">
-						<view style="font-size: 26rpx;color: #697081;">待维修</view>
+						<view style="font-size: 24rpx;color: #697081;">待维修</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
 							{{workList[2]}}
 						</view>
 					</view>
 					<view v-if="$has('app:hasrepaired')">
-						<view style="font-size: 26rpx;color: #697081;">已维修</view>
+						<view style="font-size: 24rpx;color: #697081;">已维修</view>
 						<view style="text-align: center;font-size: 32rpx;color: #0C1935;padding-top: 15rpx;">
 							{{workList[3]}}
 						</view>
@@ -107,7 +107,8 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;font-weight: bold;">设备异常</span>
+						<span>设备异常</span>
+						<text class="bootomBg"></text>
 					</view>
 					<view class="processing" v-if="$has('app:LookatImmediately')">
 						<view class="immediately" @click="EquipmentException">
@@ -119,25 +120,25 @@
 				</view>
 				<view class="wait">
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">异常总数</view>
+						<view style="font-size: 24rpx;color: #697081;">异常总数</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
 							{{abnormalNum}}
 						</view>
 					</view>
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">空调异常</view>
+						<view style="font-size: 24rpx;color: #697081;">空调异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
 							{{deviceArr.AirConditioner}}
 						</view>
 					</view>
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">水表异常</view>
+						<view style="font-size: 24rpx;color: #697081;">水表异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
 							{{deviceArr.WaterMeter}}
 						</view>
 					</view>
 					<view>
-						<view style="font-size: 26rpx;color: #697081;">电表异常</view>
+						<view style="font-size: 24rpx;color: #697081;">电表异常</view>
 						<view style="text-align: center;font-size: 32rpx;color: #FA5555;padding-top: 15rpx;">
 							{{deviceArr.Relay}}
 						</view>
@@ -150,7 +151,8 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;font-weight: bold;">欠费待收</span>
+						<span>欠费待收</span>
+						<text class="bootomBg"></text>
 					</view>
 					<view class="processing" v-if="$has('app:ImmediateCollection')">
 						<view class="immediately" @click="Immediatecollection">
@@ -159,12 +161,35 @@
 						</view>
 					</view>
 				</view>
+				<view class="tableBox">
+				<u-row class="table">
+					<u-col span="4">
+						<text>欠费类型</text>
+					</u-col>
+					<u-col span="4">
+						<text>欠费租户数</text>
+					</u-col>
+					<u-col span="4">
+						<text>累计欠费(元)</text>
+					</u-col>
+				</u-row>
+				<u-row v-for="item in tableList" :key="item.name" class="table t1">
+					<u-col span="4">
+						<text>{{item.name}}</text>
+					</u-col>
+					<u-col span="4">
+						<text>{{item.tenant}}</text>
+					</u-col>
+					<u-col span="4">
+						<text>{{item.tenant}}</text>
+					</u-col>
+				</u-row>
+			</view>
 
-
-				<t-table style="background-color: #fff;margin-top: 10rpx;">
+				<!-- <t-table style="background-color: #fff;margin-top: 10rpx;">
 					<t-tr>
 						<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.name">
@@ -172,7 +197,7 @@
 						<t-td>{{ item.tenant }}</t-td>
 						<t-td>{{ item.arrears }}</t-td>
 					</t-tr>
-				</t-table>
+				</t-table> -->
 			</view>
 		</view>
 		<!-- 	租户界面 -->
@@ -180,7 +205,8 @@
 			<view class="pending_middle">
 				<view class="all">
 					<view class="work">
-						<span style="font-size: 30rpx;font-weight: bold;">账单待缴</span>
+						<span>账单待缴</span>
+						<text class="bootomBg"></text>
 					</view>
 					<view class="processing" v-if="$has('app:ImmediatePayment')">
 						<view class="immediately" @click="BillPending">
@@ -189,18 +215,30 @@
 						</view>
 					</view>
 				</view>
-				<t-table style="background-color: #fff;margin-top: 10rpx;">
-					<t-tr>
-						<t-th>欠费类型</t-th>
-						<t-th>本期待缴金额(元)</t-th>
-						<t-th>累计待缴金额(元)</t-th>
-					</t-tr>
-					<t-tr v-for="item in tableList" :key="item.name">
-						<t-td>{{ item.name }}</t-td>
-						<t-td>{{ item.currentAmount }}</t-td>
-						<t-td>{{ item.cumulativeAmount }}</t-td>
-					</t-tr>
-				</t-table>
+				<view class="tableBox">
+					<u-row class="table">
+						<u-col span="4">
+							<text>欠费类型</text>
+						</u-col>
+						<u-col span="4">
+							<text>本期待缴金额(元)</text>
+						</u-col>
+						<u-col span="4">
+							<text>累计待缴金额(元)</text>
+						</u-col>
+					</u-row>
+					<u-row v-for="item in tableList" :key="item.name" class="table t1">
+						<u-col span="4">
+							<text>{{item.name}}</text>
+						</u-col>
+						<u-col span="4">
+							<text>{{item.currentAmount}}</text>
+						</u-col>
+						<u-col span="4">
+							<text>{{item.cumulativeAmount}}</text>
+						</u-col>
+					</u-row>
+				</view>
 			</view>
 		</view>
 
@@ -216,38 +254,29 @@
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg4"></image>
 
 			</u-tabbar-item>
-			<u-tabbar-item text="我的"  @click="click3">
+			<u-tabbar-item text="我的" @click="click3">
 				<image class="u-page__item__slot-icon" slot="active-icon" :src="tabimg5"></image>
 				<image class="u-page__item__slot-icon" slot="inactive-icon" :src="tabimg6"></image>
 
 			</u-tabbar-item>
 		</u-tabbar>
-		
-	<!-- 水印 -->	
-<!-- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas> -->
+
+		<!-- 水印 -->
+		<!-- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas> -->
 	</view>
 </template>
 
 <script>
-	  import watermark from '@/js_sdk/ly-watermark/commons/watermark.js'
-	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 tTd from '@/components/t-table/t-td.vue';
+	import watermark from '@/js_sdk/ly-watermark/commons/watermark.js'
 	export default {
 		//  mixins: [watermark],  // 水印
 		components: {
-			tTable,
-			tTh,
-			tTr,
-			tTd
 		},
 		data() {
 			return {
-				abnormalNum:0,
-				 canvasText: '',
+				abnormalNum: 0,
+				canvasText: '',
 				value1: 0,
-
 				tabimg1: require('@/static/tab/h2.png'),
 				tabimg2: require('@/static/tab/h1.png'),
 				tabimg3: require('@/static/tab/w2.png'),
@@ -270,18 +299,15 @@
 		onLoad() {
 			this.getalldata();
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-			this.canvasText=this.getuserInfo.realName;
-			 
+			this.canvasText = this.getuserInfo.realName;
+
 		},
 		mounted() {
- //     this.initWatermark(); // 可以在水印内容准备好后执行初始化
-				        },
+		},
 		onPullDownRefresh() {
-			//	console.log('我下拉刷新页面了!!!!!!!!!!!!!!!', )
 			this.getalldata();
 
 		},
-
 		methods: {
 			click1() {
 				uni.navigateTo({
@@ -303,9 +329,8 @@
 				this.$api.get('/home/homedata', {})
 					.then(res => {
 						uni.stopPullDownRefresh() //刷新数据之后停止刷新效果
-						//console.log('111111111111111111', res.data.data)
 						this.workList = res.data.data.workOrder;
-						this.abnormalNum=res.data.data.equip.abnormalNum;
+						this.abnormalNum = res.data.data.equip.abnormalNum;
 						this.deviceArr = res.data.data.equip.maps;
 						this.inspectionInfoList = res.data.data.inspectionInfo;
 
@@ -330,7 +355,6 @@
 					})
 			},
 			BillPending() {
-				// console.log('111111111111111111',this.getuserInfo)
 				uni.navigateTo({
 					url: '/pages/index/BillPending/BillPending?info=' + encodeURIComponent(JSON.stringify(this
 						.getuserInfo))
@@ -371,38 +395,58 @@
 					url: '/pages/index/Withholdingrecord/Withholdingrecord'
 				})
 			},
-
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
+	.toptemplate {
+		height: 280rpx;
+		border-radius: 0 0 32rpx 32rpx;
+	}
+
 	* {
 		margin: 0;
 		padding: 0;
 		list-style: none;
 		text-decoration: none;
 	}
- .watermarkCans {
-	        width: 250rpx;
-	        height: 250rpx;
-	        position: absolute;
-	        z-index: -1;
-	    }
-	// .u-tabbar__content{
-	// 	.u-tabbar-item__icon{
-	// 		.u-tabbar-item__icon{
-	// 			font-size: 19px!important;
-	// 		}		
-	// 	}
-	// }
+
+	.watermarkCans {
+		width: 250rpx;
+		height: 250rpx;
+		position: absolute;
+		z-index: -1;
+	}
+
 	.u-page__item__slot-icon {
 		width: 40rpx;
 		height: 40rpx;
 	}
 
+	.work {
+		position: relative;
+		margin-bottom: 20rpx;
+
+		span {
+			font-size: 28rpx;
+			position: relative;
+			z-index: 2;
+		}
+
+		.bootomBg {
+			display: inline-block;
+			background: linear-gradient(to right, #FFD263, #ffffff);
+			height: 8px;
+			width: 56px;
+			position: absolute;
+			left: 0;
+			bottom: -4px;
+			border-radius: 5px;
+			z-index: 0;
+		}
+	}
+
 	.online {
 		display: flex;
 		flex-direction: column;
@@ -428,7 +472,7 @@
 	.Homepage_suspension {
 		width: 690rpx;
 		height: 200rpx;
-		margin: 0 auto;
+		margin: -120rpx auto 28rpx;
 		background-color: #fff;
 		display: flex;
 		align-items: center;
@@ -444,25 +488,14 @@
 		justify-content: space-around;
 	}
 
-	.pending1 {
-		width: 750rpx;
-		height: 220rpx;
-		// background-color: #ccc;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		margin-top: 120rpx;
-	}
-
 	.pending {
 		width: 750rpx;
-		height: 260rpx;
 		// background-color: #ccc;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		position: relative;
+		margin-bottom: 28rpx;
 	}
 
 	.pending_middle {
@@ -478,21 +511,14 @@
 		justify-content: space-between;
 	}
 
-	.work {
-		// padding-left: 20rpx;
-		// padding-top: 2rpx;
-	}
-
 	.wait {
 		width: 690rpx;
 		display: flex;
 		align-items: center;
 		background-color: #fff;
 		justify-content: space-around;
-		padding-top: 30rpx;
 		text-align: center;
-		height: 140rpx;
-		margin-top: 10rpx;
+		height: 150rpx;
 		border-radius: 10rpx;
 	}
 
@@ -503,12 +529,11 @@
 
 	.equipment {
 		width: 750rpx;
-		// height: 200rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		position: relative;
-		top: 20rpx;
+		margin-bottom: 28rpx;
 	}
 
 	.arrears {
@@ -519,7 +544,7 @@
 		align-items: center;
 		justify-content: center;
 		position: relative;
-		top: 50rpx;
+		margin-bottom: 28rpx;
 	}
 
 	.arrears1 {
@@ -530,8 +555,7 @@
 		align-items: center;
 		justify-content: center;
 		position: relative;
-		top: 80rpx;
-		margin-bottom: 100rpx;
+		margin-bottom: 28rpx;
 	}
 
 
@@ -548,4 +572,23 @@
 	tr {
 		background-color: #fff;
 	}
-</style>
+
+	.tabberall {
+		position: relative;
+		z-index: 3;
+	}
+	.tableBox{
+		padding:0 32rpx 20rpx 32rpx;
+		background-color: #fff;
+		border-radius: 8rpx;
+		.table{
+			height: 80rpx;
+			&.t1{
+				border-top:1px solid #eee;
+				height:90rpx
+			}
+			*{text-align: center;}
+		}
+	}
+	
+</style>

+ 12 - 8
pages/login/login.vue

@@ -23,14 +23,13 @@
 			</view>
 			<view class="Userprotocol">
 				<view class="Userprotocolchecked">
-					<checkbox :checked="isChecked" @click="isChecked=!isChecked" />
+					<checkbox :checked="isChecked" @click="isChecked=!isChecked" style="transform: scale(0.7);"></checkbox>
 				</view>
 				<view class="Userprotocoltext" @click="Userprotocol">我已阅读并同意用户协议和隐私政策</view>
 			</view>
 			<view class="login-btn" @click="loginbtn">登录</view>
 		</view>
 		<u-toast ref="uToast" />
-		
 	</view>
 </template>
 
@@ -62,13 +61,14 @@
 						type: "error",
 						message: "请输入账号",
 					});
+					return false
 				} else if (this.password == "") {
 					this.$refs.uToast.show({
 						type: "error",
 						message: "请输入密码",
 					});
+					return false
 				}
-
 				let formData = {
 					username: this.account,
 					password: this.password,
@@ -97,7 +97,6 @@
 				});
 			},
 			getpermissions() {
-				console.log("权限功能");
 				//获取用户权限功能
 				return new Promise((resolve, reject) => {
 					this.$api
@@ -181,7 +180,7 @@
 	.form-box {
 		width: 91%;
 		background: #fff;
-		margin: -130rpx auto 0;
+		margin: -148rpx auto 0;
 		position: relative;
 		z-index: 3;
 		padding: 60rpx 40rpx 100rpx;
@@ -211,9 +210,14 @@
 				flex: 1;
 			}
 		}
-
+		.Userprotocol{
+			display: flex;
+			    align-items: center;
+			    justify-content: center;
+			    margin-top: 100rpx;
+		}
 		.login-btn {
-			margin-top: 50px;
+			margin-top: 20rpx;
 			font-size: 16px;
 			letter-spacing: 7px;
 			color: #ffffff;
@@ -255,7 +259,7 @@
 	}
 
 	.info_bg {
-		padding-top: 40rpx;
+		padding-top: 60rpx;
 		width: 100%;
 		height: 400rpx;
 		background: #5c8fff;

+ 0 - 4
pages/my/Changepassword/Changepassword.vue

@@ -1,6 +1,4 @@
 <template>
-	<view class="OutermostLayer">
-		<h4>登录密码修改</h4>
 		<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">
@@ -18,8 +16,6 @@
 			<view class="tijiao">
 				<u-button type="primary" @click="submit">确定修改</u-button>
 			</view>
-		</view>
-		
 		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>

+ 28 - 72
pages/my/Personalinformation/Personalinformation.vue

@@ -1,94 +1,50 @@
 <template>
-	<view class="OutermostLayer">
-	<view class="Personalinformation">
-		<u-cell-group>
-			<u-cell
-			    size="large"
-			    title="用户名"
-			    :value="getuserInfo.realName"
-			></u-cell>
-			<u-cell
-			    size="large"
-			    title="手机"
-				:value="getuserInfo.mobile"
-			></u-cell>
-			<u-cell
-			    size="large"
-			    title="邮箱"
-				:value="getuserInfo.email"
-			></u-cell>
-			<u-cell
-			    size="large"
-			    title="性别"
-				:value="getuserInfo.gender==0?'男':'女'"
-			></u-cell>
-			<!--<u-cell-->
-			    <!--size="large"-->
-			    <!--title="地址"-->
-			    <!--value="安徽省合肥市"-->
-			<!--&gt;</u-cell>-->
-			<u-cell
-			    size="large"
-			    title="部门"
-			    value="合肥传秀科技技术部"
-			></u-cell>
-			<!--<u-cell-->
-			    <!--size="large"-->
-			    <!--title="职位"-->
-			    <!--value="前端工程师"-->
-			<!--&gt;</u-cell>-->
-
-		<u-cell
-		    size="large"
-		    title="个人信息"
-		    value="修改"
-		    isLink
-			@click="editdata"
-		></u-cell>
-		</u-cell-group>
-	</view>
+	<view>
+		<view class="Personalinformation">
+			<u-cell-group>
+				<u-cell size="large" title="账户名称" :value="getuserInfo.realName"></u-cell>
+				<u-cell size="large" title="手机号码" :value="getuserInfo.mobile"></u-cell>
+				<u-cell size="large" title="账号密码" value="******" isLink @click="editdata"></u-cell>
+			</u-cell-group>
 		</view>
+		<view class="edit">注销登录</view>
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				getuserInfo:{},
-
+				getuserInfo: {},
 			};
 		},
 		onLoad() {
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-		//	console.log('111111111111111111', this.getuserInfo)
-		//	this.getappuserdata();
 		},
 		methods: {
-			// getappuserdata(){
-			// 	this.$api.get('/user/'+this.getuserInfo.id,{})
-			// 			.then(res=>{
-			// 				console.log('111111111111111111',res)
-			//
-			// 			})
-			// },
-
-			editdata(){
+			editdata() {
 				uni.navigateTo({
-					url: '/pages/my/Personalinformation/Informationmodification/Informationmodification'
+					url: '/pages/my/Personalinformation/Changepassword/Changepassword'
 				})
 			},
-
-
-				}
-
-
+		}
 	}
 </script>
 
 <style lang="scss">
-.Personalinformation{
-	padding: 30rpx;
-}
-
+	.Personalinformation {
+		padding: 0 32rpx;
+		background: #fff;
+		margin-top: 24rpx;
+	}
 
-</style>
+	.edit {
+		margin-top: 80rpx;
+		height: 88rpx;
+		font-size: 32rpx;
+		line-height: 88rpx;
+		color: #2E69EB;
+		text-align: center;
+		background: #fff;
+	}
+</style>