3-22-18:21

pages/cb/bzy/equip-set/equip-set.vue

@@ -377,7 +377,9 @@
 </script>
 
 <style lang="scss">
-	page{padding:20rpx;
+	page{
+		padding:20rpx;
+		box-sizing: border-box;
 	.tit{
 		line-height:30rpx;
 		font-size:30rpx;
@@ -398,6 +400,7 @@
 		background:#F7F8FA;
 		padding:10rpx 40rpx;
 		font-size:28rpx;
+		box-sizing: border-box;
 		.arrow{
 			display:inline-block;
 			border-width:12rpx 8rpx ;

pages/cb/cbd/equip-set/equip-set.vue

@@ -537,6 +537,7 @@
 <style lang="scss">
 	page{
 		padding:20rpx;
+		box-sizing: border-box;
 		.tit{
 			line-height:30rpx;
 			font-size:30rpx;
@@ -557,6 +558,7 @@
 			background:#F7F8FA;
 			padding:10rpx 40rpx;
 			font-size:28rpx;
+			box-sizing: border-box;
 			.arrow{
 				display:inline-block;
 				border-width:12rpx 8rpx ;

pages/cb/index/index.vue

@@ -18,7 +18,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="" style="position: absolute;top: 170px;width: 100%;">
+			<view class="" style="position: absolute;top: 190px;width: 100%;">
 				<view class="content">
 					<template v-for="(item,index) in equipArr[active].list" >
 						<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">

pages/cb/xy/equip-set/equip-set.vue

@@ -214,6 +214,7 @@
 <style lang="scss">
 page{
 	padding:20rpx;
+	box-sizing: border-box;
 	.tit{
 		line-height:30rpx;
 		font-size:30rpx;

pages/login/login.vue

@@ -8,9 +8,8 @@
 			<view class="uni-form-item uni-column">
 				<view class="username">
 					<u-icon name="account" size="36" style="margin-right:30rpx;color: #72CD9C;"></u-icon>
-					<!-- <input class="uni-input" name="username" placeholder-class="icon iconfont icon-bianji1" placeholder="请输入用户名" /> -->
 					<u-input class="uni-input" name="username" v-model="formdata.username" placeholder-class="icon iconfont icon-bianji1"
-					 placeholder="请输入用户名" />
+					 placeholder="请输入用户名" @blur="blur"/>
 				</view>
 				<view class="passwold">
 					<u-icon name="lock" size="36" style="margin-right:30rpx;color: #72CD9C;"></u-icon>
@@ -56,6 +55,12 @@
 					}
 				}
 			})
+			uni.getStorage({
+				key: 'user_name',
+				success: (res) => {
+					this.formdata.username = res.data
+				}
+			})
 		},
 		methods: {
 			async formSubmit() {
@@ -97,6 +102,15 @@
 						}
 					})
 				}
+			},
+			blur(val){
+				uni.setStorage({
+					key: 'user_name',
+					data: val,
+					success: function() {
+						console.log('success');
+					}
+				})
 			}
 		}
 	}

pages/prevention/control.vue

@@ -71,20 +71,20 @@
 					</view>
 				</view>
 			</view>
-			<view class="ensure">
-				<view class="ensure_btn" @click="ensure">
-					确 定
-				</view>
+		</view>
+		<view class="ensure">
+			<view class="ensure_btn" @click="ensure">
+				确 定
 			</view>
-			<u-popup v-model="show2" mode="bottom" length="30%" class="pop-up">
-				<scroll-view scroll-y="true" class="sheet">
-					<view class="sheet-text" v-for="(item,index) in options2" :key="index">
-						<p @click="typesofroles(index)">{{item.text}}</p>
-					</view>
-				</scroll-view>
-				<button @click="show2 = false">取消</button>
-			</u-popup>
 		</view>
+		<u-popup v-model="show2" mode="bottom" length="30%" class="pop-up">
+			<scroll-view scroll-y="true" class="sheet">
+				<view class="sheet-text" v-for="(item,index) in options2" :key="index">
+					<p @click="typesofroles(index)">{{item.text}}</p>
+				</view>
+			</scroll-view>
+			<button @click="show2 = false">取消</button>
+		</u-popup>
 	</view>
 </template>
 
@@ -346,7 +346,7 @@
 	.ensure {
 		width: 100%;
 		position: absolute;
-		bottom: 30rpx;
+		bottom: 100rpx;
 
 		.ensure_btn {
 			width: 90%;