diff --git a/common/request.js b/common/request.js index 1ec414d..1d21435 100644 --- a/common/request.js +++ b/common/request.js @@ -3,7 +3,7 @@ import store from "@/store" export function host(host='default',suffix='/plant_manage'){ var url=process.env.NODE_ENV === 'development'?{ // default:`http://wmyrzw.natappfree.cc` //陈 - default:`http://b9uckg.natappfree.cc` //马 + default:`http://e6jad6.natappfree.cc` //马 }:{ default:`http://qv6mj8.natappfree.cc` } diff --git a/pages/home/index.vue b/pages/home/index.vue index da180b9..c9f48d4 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -359,9 +359,9 @@ import request from '@/common/request.js' return this.$store.getters.userInfo.roleCode=='companyAdmin' }, isEmpty(){ - if(!baseIndex)return (this.baseInfo.farmWork||[]).length+(baseInfo.farmingInput||[]).length<=0 - else if(baseIndex=='record')return (this.baseInfo.farmWork||[]).length<=0 - else return (baseInfo.farmingInput||[]).length<=0 + if(!this.baseIndex)return (this.baseInfo.farmWork||[]).length+(this.baseInfo.farmingInput||[]).length<=0 + else if(this.baseIndex=='record')return (this.baseInfo.farmWork||[]).length<=0 + else return (this.baseInfo.farmingInput||[]).length<=0 }, }, watch:{ @@ -410,7 +410,6 @@ import request from '@/common/request.js' } }, async getBaseInfo(plantBaseId){ - console.log('-------------getBaseInfo-----------------') var res=await request("/api/plantIndex/queryFarmWorkAndInput",{ params:{plantBaseId} })