注册以及首页界面优化

pages/Login/resgier.vue

@@ -88,11 +88,16 @@
 		logregister(formData).then((res) => {
 
 			if (res.code == 1) {
-				
 				uni.navigateBack({
 					delta: 1
 				})
 				uni.$u.toast('注册成功');
+			}else{
+				if(res.data&&res.data.has_register==1){
+					uni.redirectTo({
+						url:'/pages/Login/login'
+					})
+				}
 			}
 		})
 

pages/index/massif.vue

@@ -102,9 +102,7 @@
 
 				</view>
 				<!-- 土壤监测 -->
-
 				<view class="">
-
 					<view class="soil-monitor">
 						<view class="head">
 							<view class="tit">
@@ -286,45 +284,45 @@
 			name: "土壤温度",
 			num: 20,
 			unit: "℃",
-
+	
 		}, {
 			icon: "/static/img/SD.png",
 			name: "土壤湿度",
 			num: 20,
 			unit: "%RH",
-
+	
 		}, {
-			icon: "/static/img/sj.png",
+			icon: "/static/img/DD.png",
 			name: "土壤导电率",
 			num: 20,
 			unit: "μS/cm",
-
+	
 		}, {
-			icon: "/static/img/CTPH.png",
+			icon: "/static/img/PH.png",
 			name: "土壤PH值",
 			num: 20,
 			unit: "PH",
-
+	
 		}, {
 			icon: "/static/img/AHL.png",
 			name: "土壤含氮量",
 			num: 20,
 			unit: "mg/kg",
-
+	
 		}, {
-			icon: "/static/img/AQHL.png",
+			icon: "/static/img/Hl.png",
 			name: "土壤含磷量",
 			num: 20,
 			unit: "mg/kg",
-
+	
 		}, {
-			icon: "/static/img/AQHL.png",
+			icon: "/static/img/HJ.png",
 			name: "土壤含钾量",
 			num: 20,
 			unit: "mg/kg",
-
+	
 		},
-
+	
 	])
 	onLoad(() => {
 		// console.log(store.state.userInfo)
@@ -332,7 +330,7 @@
 			uni.redirectTo({
 				url: '/pages/Login/login'
 			})
-
+	
 		}
 	})
 	const dataobj = reactive({})
@@ -356,7 +354,7 @@
 			}
 		});
 	}
-
+	
 	const show = ref(false)
 	const showLoading = ref(false)
 	const columns = reactive([]);
@@ -366,51 +364,51 @@
 			name: "风速",
 			num: 20,
 			unit: "%",
-
+	
 		}, {
 			icon: "/static/img/FX.png",
 			name: "风向",
 			num: 20,
 			unit: "%",
-
+	
 		}, {
 			icon: "/static/img/CTWD.png",
 			name: "温度",
 			num: 20,
 			unit: "℃",
-
+	
 		}, {
 			icon: "/static/img/SD.png",
 			name: "湿度",
 			num: 20,
 			unit: "%RH",
-
+	
 		}, {
 			icon: '/static/img/CO2.png',
 			name: "二氧化碳",
 			num: 20,
 			unit: "ppm",
-
+	
 		}, {
-			icon: "/static/img/sj.png",
+			icon: "/static/img/QY.png",
 			name: "气压",
 			num: 20,
 			unit: "KPa",
-
+	
 		}, {
 			icon: "/static/img/JY.png",
 			name: "雨量",
 			num: 20,
 			unit: "mm",
-
+	
 		}, {
 			icon: "/static/img/GZ.png",
 			name: "光照量",
 			num: 20,
 			unit: "Lux",
-
+	
 		},
-
+	
 	])
 	onShow(() => {
 		getlist()