From be68268fb50f231da30891b34812adab1536992c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 7 Dec 2023 11:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BB=A5=E5=8F=8A=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Login/resgier.vue |   7 +++++-
 pages/index/massif.vue  |  50 +++++++++++++++++++---------------------
 static/img/DD.png       | Bin 0 -> 507 bytes
 static/img/HJ.png       | Bin 0 -> 741 bytes
 static/img/PH.png       | Bin 0 -> 493 bytes
 static/img/QY.png       | Bin 0 -> 359 bytes
 static/img/hl.png       | Bin 0 -> 625 bytes
 7 files changed, 30 insertions(+), 27 deletions(-)
 create mode 100644 static/img/DD.png
 create mode 100644 static/img/HJ.png
 create mode 100644 static/img/PH.png
 create mode 100644 static/img/QY.png
 create mode 100644 static/img/hl.png

diff --git a/pages/Login/resgier.vue b/pages/Login/resgier.vue
index 2fcf980..11f3c21 100644
--- a/pages/Login/resgier.vue
+++ b/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'
+					})
+				}
 			}
 		})
 
diff --git a/pages/index/massif.vue b/pages/index/massif.vue
index 62e77ba..88476c0 100644
--- a/pages/index/massif.vue
+++ b/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()
diff --git a/static/img/DD.png b/static/img/DD.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5b6babc0501df8172fc03a2744326c46b817e0
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$wMj%lR7gw3l+jTFF%X6~*#_u9I&euExDx0<?BGhk4(LFhe6|Dd)tQT-0<{9M
zfMlJYNoEkdg9jMzEpy4Y|Ni?YhOYFPD{<-n!6Gtd=0(?a({s8!Te0_ksjA};LUS>2
zQTwi{4<Us4#lX(Fb%8BI2+NCrMWnIT&W$l!RsABOj{^Q2Dss|esLeT}eE`RRGIOh{
zambcIu!xAYc4dr-wf&URy|os_B*wVyv*ifvoP#>eIRm!A!5HJNeeXR$&ncx>B6=bs
zVdh&^9p#)~VvKbb#}@=DnHeol5ifX)>{j)q7zQ{izC%4k#QhF>6|3r6RX26Ba}J=#
zl+pwQbb!G!^9=-?qZlcG(gp|6dI(|RoLc}ELTHg|Yi*4k6vKjH#U)-%oj5GO3Ge+h
zrL;x|*i-#17R^v_e~?F30HCS@u!xM98Ole<EY^sewRQ(8H&Rp;LWaS$s&lS|9re*E
z>$|S&CfIYhK8#&&j;p%8LG9G`txtk+(~L1fL~lq25sk_qA!1wpt#I?oO~h;WopWvn
xb6hK9D1esruZa)+tLIO?73aKUf9<&%_y^qB5GLe|+r<C?002ovPDHLkV1m(8<%0kK

literal 0
HcmV?d00001

diff --git a/static/img/HJ.png b/static/img/HJ.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c1c288704da36266abef6d01149836e5f61e48a
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%pGibPR7gv;Rk3apK@gqUOBGqd6m&@V4>;~p!%<O1n9_0)R}m78QRrjSq9~z3
zN~%z~btLz8MC%=G(j^U{K#?erks_r?b_dPr_E;x&KuEsk)^~Gn-+S|RjIf{!7laFU
z0>^P&jiP7`05WF&hKN-FxCa1zYwe*i=4>9Z5?DZ#Qrn1FW9AV6pscO6JH{9j0>p8g
zDW&QFFmcZPP)a>;&V4k-OnhAloTlkM00_I!a<|sLF~)ql%c?kzKPaW%Nev<zt@V>z
zz)6w_%dgJ4w^0-gnfZW-I(Gr5Y1(Jzm%fIGN}}Z=Ns=}qZUcbGj;*!NjWHvU9YxV5
zGsm8pwYD3)6L9hUh=}r<yv{F*M!jd|pU%0y_?je12N5@Cv1aD3D3b30pr({+Ip;dw
z=a6v=5hq&fz5o?Whq7K@Ux&TDJ*ZSF&}cNE*XzN>#RYg(Qj?}>otdjdB)$5>SemD`
zZh3a%IU+uj-{bKZvMht$-Q65?Fc{=z%zQ{hng2#S*IG+j<^!i`D$x<|a^RDb6Cfhk
z+S)3eVde=D-4B3Ea#L{&8Q%mJrmL%~xfSQ<=N{{q)>=HyuTXUeT*{E5n^vr>tiZ;`
zhCGL6v-$5<BuOG&J(C#CYo2f9Xf%S;)6-eas}a%8&A3Tq+C<b28u-_^g*I4g+qdFY
z$nW?J2l<w{ARFZ2XJ%96btEbQ;L-K<_4lQvrHA23otkdNAnH5k>fu0{bwK>#Vdf)5
ze0+6v_4N4o_=~T-H8ulqku^2d!VQY%o{4;=l=P)PmvJCpMyPmQb<PcqF$W=NamrpJ
z;tOWpM?|sYl|Qvp&6_2+U|&bXeD?Ypnb((>m&4`d<t{VV3buI~=2|gpga3K9u>ZW@
XTb!3B0s&u~00000NkvXXu0mjfy`5m~

literal 0
HcmV?d00001

diff --git a/static/img/PH.png b/static/img/PH.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b65200cab4471a2337618eff69b7d0100dfac24
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$r%6OXR7gv`l;KgsFbstydx0=P!vq*-fQAja0qq8K0=fb11e6W30qp?snGG^R
z8Nd=J&hDil<&vYtzY?GG>FMRk2v=HoB`*9Q*cfB9)-SD2s=BT>X+MOp^xk`G?HmA%
zbMC3H>mQ1ZF{Re}9RS{#`GAOXW?mD~PWD3x58nHowRQynrE{(v1x|pXC@N;oh-h^Y
zFaUS}IEX4{UJy|eJ2?tu=KW~J(TWBUeO=d8vWS_NMC7&BVo^RCoUBOl68K^s4*^?i
z#kL6%-FxpF`KB)wnZ!su_TG!f-^&<tvTuyZ0U(Rf6U!#;F3%2#fVyCLj|HS^w`eX!
zl8|0-jM$xX?l!8Gp~+i6F_Y)tu7e{u27bcKTcy;EWY;;j?N~8YN*P2vgb?<kP&&|B
zKLWsvnH%Ta;>2SaQAB+G%caE3n>6AlRun}c3Z?q!#mpZ>R3`6Fz|xjdszSu+7;+cd
z8#mb$zY+0y2wd8id!(I`v*4J7Tqz}2;!HByDe?&bRS03-j#&H5po_jW9P(|GrfX2#
jhO|BA%pk>Mfa&ZPYmY1@ob21^00000NkvXXu0mjfJTcoX

literal 0
HcmV?d00001

diff --git a/static/img/QY.png b/static/img/QY.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9635ec4c20029a28643435aac77eb549f3e936a
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$AxT6*R7gwhl)+8IKoCV|ybVAFaO1k3DFAchgj|A42n|4>0+&Ds_zVX^0Xx|W
z5Ok0RydPO|B!`F`>?8-oo@d{V-u@Y;106mPm;M;odw=4bD?$j(P?@ThZQCwljH};N
z?o=Tnb7sB|A#BvC>Iy(@X7kBlRekCpA%sd*0pMXTU=dk#U^6TJ!P8W9KTbqd7cmie
zCZZcNb3?}>(h||DnO%GD3+LS1&*W^yO++FygNSMXj{rWF%jMM&oagxqGhZ<C9TCj{
zoSNDBFnU{H@4e5mtYPLe0PiWKD#rLJBC|dfbvHPD%_V@Zlu{XEj61>mT1v-RLhBJ8
z(=~uwGppBkH#+Y9mSeyvrDo{)I4Z_;I%>O3dFWs&z5!xA!xsfU0mT3S002ovPDHLk
FV1i41kN^Mx

literal 0
HcmV?d00001

diff --git a/static/img/hl.png b/static/img/hl.png
new file mode 100644
index 0000000000000000000000000000000000000000..af82fefd1c4d4024f8276d1bf932c3b47d5e7786
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%D@jB_R7gv`Rnc)8F%aFA_&4dm=|GXbGsYE|bU+6t9ne9p1YAMzO#VXyrzjPe
z4nhH}HuG+DH{#$tNoE}Va2(Rx_uf7&OmDRKjc{oa*g1D=t^KO1Pcg>kZwZ_MJLeWe
zbVw;3@NBL9PDD>_+phi@IE1hzqB#*QM8p+ve5M){1&uLxc$ag=&(GJ24vf9`hn(}$
zTDwuzU5pWh&Q=Ivhr+6wnE8ljBKjdBpHfQrKCBuTayQJJL}WGISgcu#$Qo*Z;GCNq
zWA->Rw(HgA8Dk!q*#SgVp=dXj?woVhTCjdsler4)y>FQLk%*ol8^FwbOGHZ|dMVO7
z)>t6~6_NXt(!PIp0bH866p>}Uv6pVGZB+Fk=lmWFVTZN$mxz3*8+``sy<ahNBO(iI
zf=p(<DOUXKrIse%v~7D2BC6_QjGbjy8GG*`8;RIpgZCcNV8MZz?|QlA^1Pf*r;oGQ
z>|0M{61aFZNGia46oT(WbgYVk#I`ha@cV*s&!TPHI)aFjsw$YTiRg2m@49I3|70pA
z7~|YN=e)0*IZ^}mxV5km1kQ)hgvXr~wSVIzgb<Dx1I8EtcTK!V1rdGeqlA>?oH3M!
ze3snqRCOL>#Fa*q;Xj_6-l~fnLn0zJz68}}zzjjoyGWi5lc~5>mjH(!RCUYD@E36d
zBg_-VuzC&j!itfPn8zzsMUJ~Hqd7U}?RY?4WBvdCnx?$_)AzptF=>G&s`!M~00000
LNkvXXu0mjf0Z=0`

literal 0
HcmV?d00001