Просмотр исходного кода

导航。实况备注用户头像

baijunde 1 год назад
Родитель
Сommit
7a2ce1dde2

+ 10 - 10
manifest.json

@@ -2,8 +2,8 @@
     "name" : "掌柜生活商户版",
     "appid" : "__UNI__E0EA6E1",
     "description" : "",
-    "versionName" : "1.0.9.6",
-    "versionCode" : 1096,
+    "versionName" : "1.0.9.7",
+    "versionCode" : 1097,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -67,18 +67,18 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "apiKey" : "220880dab49e4a565afbf0bd989af006",
-                        "name" : "amap_15513573860CluPH7RHj",
-                        "appkey_ios" : "220880dab49e4a565afbf0bd989af006",
-                        "appkey_android" : "220880dab49e4a565afbf0bd989af006"
+                        "apiKey" : "6b8b0fd9f75da24fb1c13edf7b2d7daa",
+                        "name" : "amap_13141345053C5qRtPuC2",
+                        "appkey_ios" : "6b8b0fd9f75da24fb1c13edf7b2d7daa",
+                        "appkey_android" : "6b8b0fd9f75da24fb1c13edf7b2d7daa"
                     }
                 },
                 "geolocation" : {
                     "amap" : {
-                        "name" : "amap_15513573860CluPH7RHj",
+                        "name" : "amap_13141345053C5qRtPuC2",
                         "__platform__" : [ "android" ],
-                        "appkey_ios" : "220880dab49e4a565afbf0bd989af006",
-                        "appkey_android" : "220880dab49e4a565afbf0bd989af006"
+                        "appkey_ios" : "6b8b0fd9f75da24fb1c13edf7b2d7daa",
+                        "appkey_android" : "6b8b0fd9f75da24fb1c13edf7b2d7daa"
                     },
                     "system" : {
                         "__platform__" : [ "ios", "android" ]
@@ -146,7 +146,7 @@
         "sdkConfigs" : {
             "maps" : {
                 "amap" : {
-                    "key" : "220880dab49e4a565afbf0bd989af006",
+                    "key" : "6b8b0fd9f75da24fb1c13edf7b2d7daa",
                     "securityJsCode" : "",
                     "serviceHost" : ""
                 }

+ 1 - 1
pages/login/map.vue

@@ -208,7 +208,7 @@
 					} else {
 						const script = document.createElement('script');
 						script.src =
-						'https://webapi.amap.com/maps?v=1.4.15&key=220880dab49e4a565afbf0bd989af006'; //这里是自己申请的高德的key
+						'https://webapi.amap.com/maps?v=1.4.15&key=6b8b0fd9f75da24fb1c13edf7b2d7daa'; //这里是自己申请的高德的key
 						script.onload = () => {
 							this.initAmap(v);
 						}

+ 2 - 1
pages/order/serviceOrder/live.vue

@@ -26,7 +26,8 @@
 						<view class="top">
 							<view class="left">
 								<view class="img">
-									<image :src="item.logo" mode=""></image>
+									<image :src="item.logo" mode="" v-if="item.logo"></image>
+									<image :src="item.photo" mode="" v-if="item.photo"></image>
 								</view>
 								<view class="name">
 									{{item.merchantName}}<br />

+ 43 - 19
pages/order/serviceOrder/orderDetail.vue

@@ -35,8 +35,8 @@
 			<!-- 送车到站显示信息结束 -->
 			<!-- 上门取车显示信息开始 -->
 			<view class="car_data" v-if="form.checkType == 0">
-				<view class="car_id user_name">
-					<span>用户姓名:{{form.contactsName}}</span>
+				<view class="car_id user_name" >
+					<span style="display: block;padding: 0px;">用户姓名:{{form.contactsName}}</span>
 					<span class="call">
 						<image src="/static/order/call.png" mode=""></image> 联系客户
 					</span>
@@ -44,7 +44,7 @@
 				<view class="car_address">
 					<view class="address">
 						送/取车地址:{{form.carAddress}}
-						<image src="/static/order/address.png" mode=""></image>
+						<image src="/static/order/address.png" mode="" @click="navigation"></image>
 					</view>
 					<view class="car_license">
 						车牌号:{{form.licenseNo}}
@@ -118,13 +118,13 @@
 						</view>
 
 					</view>
-					<view class="item_child">
-						<span>车辆信息:</span>
+					<view class="item_child" v-if="form.checkType<20">
+						<span>车辆类型:</span>
 						<view class="center">
 							{{form.carType?form.carType:'小型轿车'}}
 						</view>
 					</view>
-					<view class="item_child">
+					<view class="item_child" v-if="form.checkType<20">
 						<span>品牌型号:</span>
 						<view class="center">
 							{{form.brandModel}}
@@ -204,7 +204,7 @@
 							{{form.orderTime}}
 						</view>
 					</view>
-					<view class="item_child">
+					<view class="item_child" v-if="form.payTime">
 						<span>付款时间:</span>
 						<view class="center">
 							{{form.payTime}}
@@ -227,7 +227,7 @@
 							{{item.date}}
 						</view>
 					</view>
-					<view class="item_child">
+					<view class="item_child" v-if="item.payTime">
 						<span>付款时间:</span>
 						<view class="center">
 							{{item.payTime}}
@@ -528,25 +528,21 @@
 				this.getDeatil()
 			},
 			//商户去取车
-			goGetCar(item) {
-				console.log(item)
+			goGetCar() {
 				let data = {
 					taskId: this.form.taskId,
 					checkType: this.form.checkType,
 					paramState: '05', //商户接单成功
 					serveType: '01'
 				}
-
-
 				let that = this
-				// uni.navigateTo({
-				// 		url: (window.location.href = `https://uri.amap.com/navigation?to=${item.userLongitude},${item.userLatitude},${item.carAddress}&mode=car&policy=1&src=https://gawl.gazhcs.com/wap/index.html&callnative=0`)
-				// })
-
+				console.log(this.form)
 				uni.openLocation({
-					longitude: Number(item.userLongitude),
-					latitude: Number(item.userLatitude),
-					name: item.carAddres, // 位置名称
+					// longitude: Number(this.form.userLongitude),
+					// latitude: Number(this.form.userLatitude),
+					longitude: Number(this.form.userLongitude),
+					latitude: Number(this.form.userLatitude),
+					name: this.form.carAddres, // 位置名称
 					// address: e.F_Address, // 位置地点
 					success: function(res) {
 						console.log('打开系统位置地图成功')
@@ -563,6 +559,34 @@
 					},
 				})
 			},
+			//导航
+			navigation(){
+				console.log(this.form)
+				// uni.openLocation({
+				// 	longitude: Number(this.form.userLongitude),
+				// 	latitude: Number(this.form.userLatitude),
+				// 	name: this.form.carAddres, // 位置名称
+				// 	// address: e.F_Address, // 位置地点
+				// 	success: function(res) {
+				// 		console.log('打开系统位置地图成功')
+				// 	},
+				// 	fail: function(error) {
+				// 		console.log(error)
+				// 	},
+				// })
+				uni.openLocation({
+					longitude: Number(this.form.userLongitude),
+					latitude: Number(this.form.userLatitude),
+					name: this.form.carAddress, // 位置名称
+					// address: e.F_Address, // 位置地点
+					success: function(res) {
+						console.log('打开系统位置地图成功')
+					},
+					fail: function(error) {
+						console.log(error)
+					},
+				})
+			},
 			goAlso() {
 				let data = {
 					taskId: this.form.taskId,

+ 2 - 1
pages/product/checkMap.vue

@@ -86,6 +86,7 @@
 				myAmapFun.getInputtips({
 					keywords: this.searchWords,
 					location: '',
+					city:this.city || '太原' ,
 					success: (data) => {
 
 						if (data && data.tips) {
@@ -186,7 +187,7 @@
 					} else {
 						const script = document.createElement('script');
 						script.src =
-							'https://webapi.amap.com/maps?v=1.4.15&key=220880dab49e4a565afbf0bd989af006'; //这里是自己申请的高德的key
+							'https://webapi.amap.com/maps?v=1.4.15&key=6b8b0fd9f75da24fb1c13edf7b2d7daa'; //这里是自己申请的高德的key
 						script.onload = () => {
 							this.initAmap(v);
 						}