2

李宇
1 parent bfe7b4fc
Showing 10 changed files with 145 additions and 20 deletions
apis/modules/oauth.js
pages/funeralculture/funeralculture.vue
pages/funeralguide/funeralguide.vue
pages/funerallaw/funerallaw.vue
pages/funeralproblem/funeralproblem.vue
pages/my/my.vue
pages/mydeathdetail/mydeathdetail.vue
pages/myinfo/myinfo.vue
pages/myreservationdetail/myreservationdetail.vue
pages/xxdetail/xxdetail.vue
@@ -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');
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -9,7 +9,7 @@
 					<view class="name">
 						<text>{{item.title}}</text>
 					</view>
-					<view class="edit" @click="tzdetail(item)">
+					<view class="edit" @click="tzdetail(item.id)">
 						<image src="../../static/right2.png"></image>
 					</view>
 				</view>
@@ -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
 				})
 			}
 		},
@@ -48,7 +48,7 @@
 		computed:{
 			pageTop(){return parseInt(88*uni.getSystemInfoSync().windowWidth/750) + uni.getSystemInfoSync().statusBarHeight}
 		},
-		onShow() {
+		onLoad() {
 			this.getfbgl();
 		},
 		methods: {
@@ -10,7 +10,7 @@
 			<view class="my-top">
 				<view class="user-info">
 					<view class="portrait" @click="tzmy">
-						<image :src="Baseapi + user.avatar"></image>
+						<image :src=" user.avatar"></image>
 					</view>
 					<view class="info">
 						<view class="nickname">
@@ -7,10 +7,11 @@
 		<view class="top">
 			<view class="topphone">
 				<view class="topphonebg"><image src="../../static/btn.png"></image></view>
-				<view class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
+				<view @click="lxdh" class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
 			</view>
 			<!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> -->
-			<map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers">
+			<!-- <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers"> -->
+			<map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" scale="18" :polyline="polyline">
 			</map>
 		</view>
@@ -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 //线的边框宽度，还有很多参数，请看文档 
+						}]
 					}
 				})
@@ -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);
@@ -5,12 +5,14 @@
 		<view class="content">
 		<view class="top">
+			<map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" scale="18" :polyline="polyline">
+			</map>
 			<view class="topphone">
 				<view class="topphonebg"><image src="../../static/btn.png"></image></view>
-				<view class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
+				<view @click="lxdh" class="topphonetext"><image src="../../static/phone1.png"></image>联系电话</view>
 			</view>
-			<map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers">
-			</map>
+			<!-- <map v-if="mapshow" style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers"> -->
+			
 			<!-- <view class="topimg"><image src="../../static/img/05.jpg" mode="widthFix"></image></view> -->
 		</view>
@@ -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 //线的边框宽度，还有很多参数，请看文档 
+						}]
 					}
 				})
@@ -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 + "详情页"
+				})
+			},
 		}
 	}
 </script>