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 @@ - - @@ -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 0000000..4d5b6ba Binary files /dev/null and b/static/img/DD.png differ diff --git a/static/img/HJ.png b/static/img/HJ.png new file mode 100644 index 0000000..3c1c288 Binary files /dev/null and b/static/img/HJ.png differ diff --git a/static/img/PH.png b/static/img/PH.png new file mode 100644 index 0000000..4b65200 Binary files /dev/null and b/static/img/PH.png differ diff --git a/static/img/QY.png b/static/img/QY.png new file mode 100644 index 0000000..a9635ec Binary files /dev/null and b/static/img/QY.png differ diff --git a/static/img/hl.png b/static/img/hl.png new file mode 100644 index 0000000..af82fef Binary files /dev/null and b/static/img/hl.png differ