diff --git a/pages/home/index.vue b/pages/home/index.vue
index 0368807..543c6ba 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -399,6 +399,7 @@ import request,{host} from '@/common/request.js'
// index:0,
// pagePath:"/pages/home/rePassword"
// })
+ uni.setTabBarBadge({ index:2, text:'2' })//底部标签显示数字
this.getHeadImg()
if(this.isAdmin){
this.getPlantBase()
diff --git a/pages/home/my.vue b/pages/home/my.vue
index 0a4df33..5f8e944 100644
--- a/pages/home/my.vue
+++ b/pages/home/my.vue
@@ -70,6 +70,9 @@
领用记录
+
+ 系统消息
+
退出
@@ -85,12 +88,18 @@ import {host} from '@/common/request'
}
},
onLoad(options){
+ console.log('--my-----onLoad-----------')
this.$nextTick(()=>{
if(options.toPage){
uni.navigateTo({url:`/pages/purchase/${options.toPage}`})
}
})
},
+ onShow(){
+ console.log('------my-----onShow---------------')
+ // uni.setTabBarBadge({ index:2, text:'' })//底部标签显示数字
+ uni.hideTabBarRedDot({index:2})
+ },
methods:{
}
diff --git a/pages/massif/pestRecord.vue b/pages/massif/pestRecord.vue
index bbba991..0cce22c 100644
--- a/pages/massif/pestRecord.vue
+++ b/pages/massif/pestRecord.vue
@@ -32,6 +32,7 @@ export default {
pestSite:{label:"病虫害部位",type:"checkBox",value:[],columns:[{label:"根",value:"根"},{label:"茎",value:"茎"},{label:"叶",value:"叶"}]},
growthProcess:{label:"作物生长过程",type:"select-tab",dictCode:"growth_process"},
symptom:{label:"显著症状",type:"select-tab",dictCode:"symptom"},
+ type:{label:"害虫类型",type:"navigate",btnFun:()=>uni.navigateTo({url:"/pages/massif/pestType"})},
medicationArea:{label:"农资作用面积",type:"digit",suffix:"亩"},
pic:{label:"凭证",type:"upImg",value:""},
description:{label:"病虫害描述",type:"textarea"},
diff --git a/pages/massif/pestType.vue b/pages/massif/pestType.vue
new file mode 100644
index 0000000..5b7e84e
--- /dev/null
+++ b/pages/massif/pestType.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+ 玉米
+ 水稻
+
+ 害虫类型
+
+ 黄地老虎
+ 黄地老虎
+ 自定义+
+
+
+
+
\ No newline at end of file
diff --git a/router/massif.js b/router/massif.js
index 7f5663c..6051dba 100644
--- a/router/massif.js
+++ b/router/massif.js
@@ -134,4 +134,13 @@ module.exports=[
}
}
},
+ {
+ path:"pages/massif/pestType",
+ style:{
+ navigationBarTitleText:"害虫类型",
+ "app-plus":{
+ titleNView:false,
+ }
+ }
+ },
]
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index 5e7bfa0..4e15ff2 100644
--- a/uni.scss
+++ b/uni.scss
@@ -77,7 +77,7 @@ $uni-font-size-paragraph:15px;
@import '@/common/main.css';
@import 'uview-ui/theme.scss';
-@import url('https://at.alicdn.com/t/c/font_3852037_x0ytzgg6if.css');
+@import url('https://at.alicdn.com/t/c/font_3852037_8frcz777lb4.css');
[class*=plant-]{
font-family: "plantMana" !important;
font-size: 16px;
diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index f26940a..cdfd040 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -25,7 +25,7 @@
border-radius: 24rpx;
width:100%;
}
- .map{
+ .map,.navigate{
height:80rpx;
display:flex;
align-items: center;
@@ -61,6 +61,12 @@
transform: rotate(90deg);
color:rgb(48,49,51);
}
+ &.navigate{
+ &:before{
+ margin:0 0 0 14rpx;
+ transform: rotate(0deg);
+ }
+ }
}
.select-tab{
display:flex;
@@ -283,6 +289,7 @@
{{value.length>0?Object.values(value[0]).join():"选择经纬度"}}
{{pickerContent}}
+ {{value||placeholder||`请选择${label}`}}
{{v.label}}
自定义+