注册以及首页界面优化

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">
@@ -294,13 +292,13 @@
 			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",
@@ -312,13 +310,13 @@
 			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",
@@ -392,7 +390,7 @@
 			unit: "ppm",
 	
 		}, {
-			icon: "/static/img/sj.png",
+			icon: "/static/img/QY.png",
 			name: "气压",
 			num: 20,
 			unit: "KPa",