diff --git a/common/request.js b/common/request.js index 62b81ef..61b2d92 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'){ return( process.env.NODE_ENV === 'development'?{ - default:`http://m3df6f.natappfree.cc${suffix}` + default:`http://jtsfcq.natappfree.cc${suffix}` }:{ default:`http://qv6mj8.natappfree.cc${suffix}` } diff --git a/components/form.vue b/components/form.vue index b297672..d3113f8 100644 --- a/components/form.vue +++ b/components/form.vue @@ -194,6 +194,7 @@ :insert="false" lunar @confirm="$emit('input',$event.fulldate)"/> + @@ -301,7 +302,7 @@ import request,{host} from '@/common/request' this.imgList=this.imgList.filter(v=>!v==e.file[i]) } } - this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type])) + this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type]).join(',')) }, delImg({file}){ if(file.type=='unsaved'){ @@ -309,7 +310,7 @@ import request,{host} from '@/common/request' }else{ this.$emit("input",this.value.filter(v=>v.index!=file.index).map(v=>v.url)) } - this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type])) + this.$emit('imgs',this.imgs.map(v=>({saved:v.url,unsaved:v.tempUrl})[v.type]).join(',')) }, }, } diff --git a/pages/home/login.vue b/pages/home/login.vue index e69be8d..af6d11f 100644 --- a/pages/home/login.vue +++ b/pages/home/login.vue @@ -85,7 +85,7 @@ export default { }) if(res.statu){ this.$store.commit("setUserInfo",res.data) - this.$u.route({type:'switchTab',url:'pages/home/index'}) + uni.switchTab({url:'/pages/home/index'}) }else{ uni.showModal({ title:"提示", diff --git a/pages/massif/index.vue b/pages/massif/index.vue index 31ce817..c5ce94b 100644 --- a/pages/massif/index.vue +++ b/pages/massif/index.vue @@ -77,7 +77,7 @@