图片 标题

pages/bus/busDetails.vue

@@ -564,7 +564,7 @@
 			openPicture() {
 				let imgObj = JSON.stringify(this.imgList);
 				uni.navigateTo({
-					url: "/pages/hotel/picture?imgObj=" + imgObj,
+					url: "/pages/hotel/picture?imgObj=" + imgObj+"&carType="+this.orderMsg.OrderType,
 				});
 			},
 			formatDate(str) {

pages/bus/components/address/airport.vue

@@ -150,28 +150,28 @@
 			currentData(item,items) {
 				this.busInfor.CountryId = item.Country
 				this.busInfor.CountryName = item.CountryName
-				this.busInfor.desCountryId = item.Country
-				this.busInfor.desCountryName = item.CountryName
-				this.busInfor.ThreeCode = item.ThreeCode
-
 				this.busInfor.CityId = items.City
 				this.busInfor.CityName = items.CityName
+				this.busInfor.oriLatitude = items.Lat
+				this.busInfor.oriLongitude = items.Lng
+
+				this.busInfor.desCountryId = item.Country
+				this.busInfor.desCountryName = item.CountryName
 				this.busInfor.desCityId = items.City
 				this.busInfor.desCityName = items.CityName
+
+				this.busInfor.ThreeCode = item.ThreeCode
+				
 				this.busInfor.AirportId = items.AirportId
 				this.busInfor.AirportName = items.AirportName
-				this.busInfor.oriLatitude = items.Lat
-				this.busInfor.oriLongitude = items.Lng
+				
 				if(this.busInfor.CarType==1){
 					this.busInfor.startaddress = `${item.CountryName} ${items.CityName} ${items.AirportName}`
 				}
 				if(this.busInfor.CarType==2){
 					this.busInfor.destination = `${item.CountryName} ${items.CityName} ${items.AirportName}`
 				}
-				
 				console.log(item)
-				// this.busInfor.CityId = items.CityId
-				// this.busInfor.CityName = items.CityName
 				this.$emit('change',this.busInfor)
 			},
 		}

pages/bus/index.vue

@@ -292,6 +292,19 @@
 		},
 		methods: {
             getAirport(msg,type){
+                console.log(msg,'---',type)
+                if(msg.CountryId!=this.busInfor.CountryId){
+                    if(msg.CarType==1){
+                        msg.destination = ''
+                        msg.desLatitude = ''
+                        msg.desLongitude = ''
+                    }
+                    if(msg.CarType==2){
+                    	msg.startaddress = ''
+                        msg.oriLatitude = ''
+                        msg.oriLongitude = ''
+                    }
+                }
                 this.busInfor = msg
                 if(type==2&&(msg.CountryId!=msg.desCountryId)){
                     this.busInfor.CountryId = null

pages/hotel/picture.vue

@@ -50,6 +50,16 @@
 				uni.setNavigationBarTitle({
 					title: "线路图片",
 				});		
+			}else if(options.imgObj&&options.carType){
+				this.imageList=JSON.parse(decodeURIComponent(options.imgObj))
+				this.isLine=0;
+				let text = '接机'
+				if(options.carType==2) text = '送机'
+				else if(options.carType==3) text = '包车'
+				this.getSeperate();
+				uni.setNavigationBarTitle({
+					title: text+"图片",
+				});		
 			}else{
 				this.imageList=JSON.parse(options.imgObj);
 				this.isLine=0;
@@ -86,7 +96,9 @@
 					current: src,
 					longPressActions: {
 						itemList: ["发送给朋友", "保存图片", "收藏"],
-						success: function(data) {},
+						success: function(data) {
+							
+						},
 						fail: function(err) {
 							console.log(err.errMsg);
 						},