diff --git a/common/request.js b/common/request.js index b292f9d..46b1ead 100644 --- a/common/request.js +++ b/common/request.js @@ -2,8 +2,8 @@ import store from "@/store" export function host(host='default',suffix='/plant_manage'){ var url=process.env.NODE_ENV === 'development'?{ - // default:`http://zrxsae.natappfree.cc` //陈 - default:`http://uq5pak.natappfree.cc` //马 + default:`http://zrxsae.natappfree.cc` //陈 + // default:`http://uq5pak.natappfree.cc` //马 }:{ default:`http://qv6mj8.natappfree.cc` } diff --git a/pages/massif/info.vue b/pages/massif/info.vue index 0c4a24a..5c6f995 100644 --- a/pages/massif/info.vue +++ b/pages/massif/info.vue @@ -73,7 +73,6 @@ import request from '@/common/request' } }, onLoad(options){ - window.the=this this.init() if(options.id)this.getDetail(options.id); this.eventChannel=this.getOpenerEventChannel() diff --git a/pages/purchase/specs.vue b/pages/purchase/specs.vue index 40b5d74..a576c11 100644 --- a/pages/purchase/specs.vue +++ b/pages/purchase/specs.vue @@ -263,20 +263,22 @@ export default{ }, async submit(){ if(this.check()){ - var res=await request("/purchaseMain/purchaseMain/addPlantPurchaseSub",{ - method:"post", - body: this.formData - }) - if(res.statu){ - uni.navigateBack() - this.eventChannel.emit("submit", this.formData) - }else{ - uni.showModal({ - title:"提示", - content:res.msg||"保存失败!", - showCancel:false, - }) - } + uni.navigateBack() + this.eventChannel.emit("submit", this.formData) + // var res=await request("/purchaseMain/purchaseMain/addPlantPurchaseSub",{ + // method:"post", + // body: this.formData + // }) + // if(res.statu){ + // uni.navigateBack() + // this.eventChannel.emit("submit", this.formData) + // }else{ + // uni.showModal({ + // title:"提示", + // content:res.msg||"保存失败!", + // showCancel:false, + // }) + // } } }, async searchGoods(){ 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 4bf7d5f..bf870ee 100644 --- a/uni_modules/d-form/components/d-form/d-form.vue +++ b/uni_modules/d-form/components/d-form/d-form.vue @@ -164,15 +164,14 @@ height:100%; z-index: -1; background:rgba(0, 0, 0, 0.4); - transition: all .5s; - opacity: 0; - transform: scale(0.8); &.show{ - opacity: 1; - transform: scale(1); z-index: 100; + map{ + top:0; + } } map{ + top:100%; width:100%; height:100%; } @@ -247,7 +246,7 @@ @confirm="$emit('input',$event.fulldate)"/> - + @@ -380,6 +379,38 @@ import {dataType} from 'black-knight/lib/config/tools' }) } }, + mounted(){ + /* #ifdef APP-PLUS */ + this.$nextTick(()=>{ + if(this.type=='amp'){ + var a=uni.createMapContext("amap",this) + + var maps=a.$getAppMap() + maps.setMapType(plus.maps.MapType.MAPTYPE_SATELLITE) + maps.onclick=(e)=>{ + console.log(e,'-------maps--click---------') + } + var polygon=new plus.maps.Polygon([ + new plus.maps.Point(116.39524,39.925301), + new plus.maps.Point(116.400444,39.925285), + new plus.maps.Point(116.400558,39.923282), + new plus.maps.Point(116.395502,39.923082), + ]) + polygon.setLineWidth(2) + polygon.setStrokeColor("#10C176") + polygon.setFillColor("#10C176") + polygon.setFillOpacity(0.3) + maps.addOverlay(polygon) + + var marker=new plus.maps.Marker(new plus.maps.Point(116.396137,39.924055)); + marker.setIcon("/static/tab_home.png"); + marker.bringToTop() + marker.setDraggable(true) + maps.addOverlay(marker); + } + }) + /* #endif */ + }, methods:{ async afterRead(e){ this.imgList=this.imgList.concat(e.file.map(v=>Object.assign(v,{