diff --git a/apis/modules/oauth.js b/apis/modules/oauth.js index fda517a..83cbe82 100644 --- a/apis/modules/oauth.js +++ b/apis/modules/oauth.js @@ -27,6 +27,10 @@ export default { getfbgl(data){ return request.get("/funeral/related/list",data) }, + // 获取殡葬文化、普法、办事、详情 + getfbgldata(data){ + return request.get("/funeral/related/"+data) + }, // 获取殡葬服务机构列表 getjg(){ return request.get('/funeral/agencies/list?pageNum=1&pageSize=10'); diff --git a/pages/funeralculture/funeralculture.vue b/pages/funeralculture/funeralculture.vue index 4407499..69134d6 100644 --- a/pages/funeralculture/funeralculture.vue +++ b/pages/funeralculture/funeralculture.vue @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/funeralguide/funeralguide.vue b/pages/funeralguide/funeralguide.vue index 4a210d9..7b7fa09 100644 --- a/pages/funeralguide/funeralguide.vue +++ b/pages/funeralguide/funeralguide.vue @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/funerallaw/funerallaw.vue b/pages/funerallaw/funerallaw.vue index 30b3d88..c89d535 100644 --- a/pages/funerallaw/funerallaw.vue +++ b/pages/funerallaw/funerallaw.vue @@ -9,7 +9,7 @@ {{item.title}} - + @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { @@ -71,7 +71,7 @@ tzdetail(item){ console.log("ress",item); uni.navigateTo({ - url:'/pages/xxdetail/xxdetail?info=' + JSON.stringify(item) + url:'/pages/xxdetail/xxdetail?info=' + item }) } }, diff --git a/pages/funeralproblem/funeralproblem.vue b/pages/funeralproblem/funeralproblem.vue index c7c20e5..2c4db3b 100644 --- a/pages/funeralproblem/funeralproblem.vue +++ b/pages/funeralproblem/funeralproblem.vue @@ -48,7 +48,7 @@ computed:{ pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight} }, - onShow() { + onLoad() { this.getfbgl(); }, methods: { diff --git a/pages/my/my.vue b/pages/my/my.vue index ef96792..88d532a 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -10,7 +10,7 @@ - + diff --git a/pages/mydeathdetail/mydeathdetail.vue b/pages/mydeathdetail/mydeathdetail.vue index 36bb739..098a971 100644 --- a/pages/mydeathdetail/mydeathdetail.vue +++ b/pages/mydeathdetail/mydeathdetail.vue @@ -7,10 +7,11 @@ - 联系电话 + 联系电话 - + + @@ -137,6 +138,14 @@ longitude: 116.39742, iconPath: '../../../static/location.png' }], + + polyline: [{ + points: [], + color: "#31c27c", + width: 10, + arrowLine: true, + borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 + }] }; }, onPageScroll(e) {this.$refs.nv.pageScroll(e)}, @@ -150,6 +159,20 @@ // this.OrderType = params.type; }, methods:{ + lxdh(){ + uni.showModal({ + title: '联系电话', + content: '028-36241643', + success: function(res) { + if (res.confirm) { + console.log('点击了确认') + } else { + console.log('点击了取消') + } + } + }) + + }, /** * 返回点击 */ @@ -182,7 +205,11 @@ this.API.getbsdetail(id).then(res=>{ console.log(11111); console.log("用户订单",res); - this.getGps(res.data.vehicleNumber); + if(res.data.vehicleNumber != null){ + this.getGps(res.data.vehicleNumber); + }else{ + this.mapshow = false + } this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber this.price = res.data.funeralOrderDetailsInfoPo.unitPrice this.API.getspjcxx(res.data.funeralOrderDetailsInfoPo.productId).then(res1=>{ @@ -209,6 +236,17 @@ "EndTime":"20231010150000", "MinSpeed":"1", "NeedAddress":"0", + + // "Action":"GetVehicleGpsInfo", + // "UserId":"user", + // "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", + // "Vehicles":[ + // { + // "PlateNum":vehicleNumber, + // "ColorCode":"1" + // } + // ], + // "NeedAddress":0 } } info.request.BeginTime = BeginTime; @@ -224,6 +262,23 @@ this.longitude = res.Data[len].Longitude this.covers[0].latitude = res.Data[len].Latitude this.covers[0].longitude = res.Data[len].Longitude + + // this.latitude = data[0][1] + // this.longitude = data[0][0] + let points = [] + res.Data.forEach(item => { + points.push({ + latitude: item.Latitude, + longitude: item.Longitude + }) + }) + this.polyline = [{ + points: points, + color: "#31c27c", + width: 4, + arrowLine: true, + // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 + }] } }) diff --git a/pages/myinfo/myinfo.vue b/pages/myinfo/myinfo.vue index 1f48c86..bca63d7 100644 --- a/pages/myinfo/myinfo.vue +++ b/pages/myinfo/myinfo.vue @@ -96,7 +96,7 @@ var info = { userId:uni.getStorageSync("USERS_KEY").userId, nickName:this.nickName, - avtar:this.fileList[0].url + avatar:this.fileList[0].url } this.API.xguserinfo(info).then(res=>{ console.log("修改用户信息",res); diff --git a/pages/myreservationdetail/myreservationdetail.vue b/pages/myreservationdetail/myreservationdetail.vue index 9643267..877b0b7 100644 --- a/pages/myreservationdetail/myreservationdetail.vue +++ b/pages/myreservationdetail/myreservationdetail.vue @@ -5,12 +5,14 @@ + + - 联系电话 + 联系电话 - - + + @@ -135,6 +137,14 @@ longitude: 116.39742, iconPath: '../../../static/location.png' }], + + polyline: [{ + points: [], + color: "#31c27c", + width: 10, + arrowLine: true, + borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 + }] }; }, onPageScroll(e) {this.$refs.nv.pageScroll(e)}, @@ -147,6 +157,20 @@ // this.OrderType = params.type; }, methods:{ + lxdh(){ + uni.showModal({ + title: '联系电话', + content: '028-36241643', + success: function(res) { + if (res.confirm) { + console.log('点击了确认') + } else { + console.log('点击了取消') + } + } + }) + + }, /** * 返回点击 */ @@ -179,12 +203,18 @@ this.API.getbsdetail(id).then(res=>{ console.log(11111); console.log("用户订单",res); - this.getGps(res.data.vehicleNumber); + // this.getGps(res.data.vehicleNumber); + if(res.data.vehicleNumber != ''){ + this.getGps(res.data.vehicleNumber); + }else{ + this.mapshow = false + } this.info = res.data - this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber - this.price = res.data.funeralOrderDetailsInfoPo.unitPrice + // this.number = res.data.funeralOrderDetailsInfoPo.quantityNumber + // this.price = res.data.funeralOrderDetailsInfoPo.unitPrice this.hhtime = res.data.funeralCremationScheduledInfoPo.scheduledCremationTime this.hhdate = res.data.funeralCremationScheduledInfoPo.scheduledCremationDate + console.log("火化时间日期",this.hhtime,this.hhdate); }) }, // 获取gps定位 @@ -199,12 +229,24 @@ "Action":"GetVehicleTrackData", "UserId":"user", "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", + // "PlateNum":"川ZVN180", "PlateNum":vehicleNumber, "ColorCode":"0", "BeginTime":"20231010090000", "EndTime":"20231010150000", "MinSpeed":"1", "NeedAddress":"0", + + // "Action":"GetVehicleGpsInfo", + // "UserId":"user", + // "Pwd":"6B18CFA67F76F079B0BFFBD773DC4494", + // "Vehicles":[ + // { + // "PlateNum":vehicleNumber, + // "ColorCode":"1" + // } + // ], + // "NeedAddress":0 } } info.request.BeginTime = BeginTime; @@ -220,6 +262,21 @@ this.longitude = res.Data[len].Longitude this.covers[0].latitude = res.Data[len].Latitude this.covers[0].longitude = res.Data[len].Longitude + + let points = [] + res.Data.forEach(item => { + points.push({ + latitude: item.Latitude, + longitude: item.Longitude + }) + }) + this.polyline = [{ + points: points, + color: "#31c27c", + width: 4, + arrowLine: true, + // borderWidth: 2 //线的边框宽度，还有很多参数，请看文档 + }] } }) diff --git a/pages/xxdetail/xxdetail.vue b/pages/xxdetail/xxdetail.vue index fc9edec..b92f6e5 100644 --- a/pages/xxdetail/xxdetail.vue +++ b/pages/xxdetail/xxdetail.vue @@ -49,11 +49,20 @@ }, onLoad(item) { console.log("res",item); - this.info = JSON.parse(item.info) - this.nvConfig.title = this.info.title + "详情页" + + this.gain(item.info) + // this.info = JSON.parse(item.info) + // this.nvConfig.title = this.info.title + "详情页" }, methods: { - + gain(e) { + this.API.getfbgldata(e).then(res => { + console.log(res); + this.info = res.data + // this.info = JSON.parse(item.info) + this.nvConfig.title = this.info.title + "详情页" + }) + }, } }