diff --git a/pages/home/news.vue b/pages/home/news.vue index f7103cc..6125399 100644 --- a/pages/home/news.vue +++ b/pages/home/news.vue @@ -190,7 +190,7 @@ - + diff --git a/pages/home/newsDetail.vue b/pages/home/newsDetail.vue index 9cbacec..adaea01 100644 --- a/pages/home/newsDetail.vue +++ b/pages/home/newsDetail.vue @@ -75,7 +75,14 @@ export default { data(){ return{ + eventChannel:null, } - } + }, + onLoad(options){ + this.eventChannel=this.getOpenerEventChannel() + uni.setNavigationBarTitle({ + title:({farming:"农事记录",news:"消息详情"})[options.intoPage] + }) + }, } \ No newline at end of file diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue index 99924c0..3943dd2 100644 --- a/pages/massif/add_farming.vue +++ b/pages/massif/add_farming.vue @@ -208,7 +208,7 @@ 操作 病虫害记录 - 过程:{{formData.farmPests.growthProcessLabel}},病虫害部位:{{formData.farmPests.pestSite}},症状:{{formData.farmPests.symptomLabel}}({{formData.farmPests.pestName}}) + 过程:{{formData.farmPests.growthProcessLabel}},病虫害部位:{{formData.farmPests.pestSite}},症状:{{formData.farmPests.symptomLabel}}({{formData.farmPests.pestName.map(v=>v.name).join(',')}}) @@ -355,7 +355,8 @@ export default { method:"post", body:{ ...this.formData, - images: this.fields.images.value + images: this.fields.images.value, + farmPests: Object.assign(this.formData.farmPests||{},{pestName:this.formData.farmPests?.pestName?.map?.(v=>v.id).join(",")||''}) } }) if(res.statu){ diff --git a/pages/massif/mana/farmRecord.vue b/pages/massif/mana/farmRecord.vue index bcfb4c3..2e3baa1 100644 --- a/pages/massif/mana/farmRecord.vue +++ b/pages/massif/mana/farmRecord.vue @@ -138,10 +138,10 @@ +添加农事 - +