From 4b72ed472bc92564a0cef622454393351f3f7117 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Tue, 19 Nov 2024 14:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BD=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=9F=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                |  18 ---
 manifest.json                          |   3 +-
 pages/login/login.vue                  |   1 -
 pages/order/location.vue               | 206 ++++++++++++++-----------
 static/images/position/destination.png | Bin 0 -> 993 bytes
 static/images/position/weixiu.png      | Bin 0 -> 661 bytes
 store/index.js                         |   3 +
 7 files changed, 125 insertions(+), 106 deletions(-)
 create mode 100644 static/images/position/destination.png
 create mode 100644 static/images/position/weixiu.png

diff --git a/App.vue b/App.vue
index a26b517..0644e96 100644
--- a/App.vue
+++ b/App.vue
@@ -2,23 +2,6 @@
 export default {
   onReady() {
 
-    
-    // this.$common.getStorage("user").then((res) => {
-    // 	if (res == null || res == "") {
-    // 		uni.redirectTo({
-    // 			url: "/pages/login/login"
-    // 		});
-    // 	}
-    // });
-
-    const _self = this;
-    // const _handlePush = function(message) {
-    // 	uni.navigateTo({
-    // 		url: "/pages/task/index"
-    // 	});
-    // };
-    // plus.push.addEventListener('click', _handlePush);
-    // plus.push.addEventListener('receive', _handlePush);
   },
   onShow: function () {
     console.log("App Show");
@@ -35,7 +18,6 @@ export default {
     if (userInfo) {
       // 处理用户数据
       this.$store.dispatch("changeTabbar", userInfo.role_id);
-
     }
 
   },
diff --git a/manifest.json b/manifest.json
index 7c985b4..0aae32b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,7 +33,8 @@
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.LOCATION\"/>"
                 ],
                 "minSdkVersion" : 19,
                 "targetSdkVersion" : 28
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ccf0565..20e7eb7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -26,7 +26,6 @@
 <script>
 import { getTopUrl, bjectToQueryString } from "@/utils/util";
 import md5 from "@/uni_modules/md5/md5.min.js";
-import tabBar from "@/utils/tabbar.js"; // 引入刚刚创建的tabBar.js
 
 export default {
   data() {
diff --git a/pages/order/location.vue b/pages/order/location.vue
index a96b251..5010503 100644
--- a/pages/order/location.vue
+++ b/pages/order/location.vue
@@ -1,97 +1,131 @@
 <template>
 	<view style="width: 100%;height: 100vh;">
-		<map :scale="scale" style="width: 100%; height: 100%;" :show-compass="true"
-			:enable-overlooking="false" :enable-satellite="false" :enable-traffic="true" :show-location="true"
-			:latitude="latitude" :longitude="longitude" :markers="markers" >
+		<!-- 
+			show-compass   是否显示指南针
+			enable-overlooking  是否开启俯视
+			enable-satellite  是否开启卫星图
+			enable-traffic    是否开启实时路况
+			show-location    显示带有方向的当前定位点
+			latitude   经度
+			longitude  纬度
+			markers    标记点
+		-->
+		<map :scale="scale" style="width: 100%; height: 100%;" :show-compass="true" :enable-overlooking="false"
+			:enable-satellite="false" :enable-traffic="true" :show-location="true" :latitude="latitude"
+			:longitude="longitude" :markers="markers">
 		</map>
 	</view>
 </template>
- 
+
 <script>
-	export default {
-		data() {
-			return {
-				scale: 12,//地图的缩放 5-18取值
-				latitude: 30.64525,//蓝色点的位置---自己当前的位置   纬度
-				longitude: 114.17240,  //自己当 前位置的经度
-				markers: [{
-					id: 1,
-					latitude: 30.51242,//门店图片点的 纬度
-					longitude: 114.18055,//经度
-					height: 80,//图片的宽高
-					width: 80,
-					callout: {
-						color: '#007AFF', // 文本颜色
-						bgColor: '#fff', // 背景色
-						display: "ALWAYS", // 'BYCLICK':点击显示; 'ALWAYS':常显
-						fontSize: 15,
-						textAlign: 'left', // 文本对齐方式。有效值: left, right, center
-						padding: 10, // 文本边缘留白
-						borderRadius: 5,
-						content: '距离5km',
-					},
- 
-					iconPath: 'https://zpkoss.oss-cn-shenzhen.aliyuncs.com/newsys/dms_app/logo/house.jpg'//图
-				}, ]
-			};
-		},
-		methods: {
-			//计算距离的方法实现
-			rad(d) {
-				return d * Math.PI / 180.0;
+/*
+	markers   获取维修人员的位置信息
+	latitude和longitude   显示目的地的位置
+*/ 
+export default {
+	data() {
+		return {
+			scale: 16,//地图的缩放 5-18取值
+			latitude: 36.146504,//蓝色点的位置---自己当前的位置   纬度
+			longitude: 120.486065,  //自己当 前位置的经度
+			markers: [{
+				id: 1,
+				latitude: 36.146504,//门店图片点的 纬度
+				longitude: 120.486065,//经度
+				height: 160,//图片的宽高
+				width: 160,
+				callout: {
+					color: '#007AFF', // 文本颜色
+					bgColor: '#fff', // 背景色
+					display: "ALWAYS", // 'BYCLICK':点击显示; 'ALWAYS':常显
+					fontSize: 15,
+					textAlign: 'left', // 文本对齐方式。有效值: left, right, center
+					padding: 10, // 文本边缘留白
+					borderRadius: 5,
+					content: '距离5km',
+				},
+
+				iconPath: '/static/images/position/destination.png'//图
 			},
-			// 根据经纬度计算距离，参数分别为第一点的纬度，经度；第二点的纬度，经度
-			getDistances(lat1, lng1, lat2, lng2) {
-				var radLat1 = this.rad(lat1);
-				var radLat2 = this.rad(lat2);
-				var a = radLat1 - radLat2;
-				var b = this.rad(lng1) - this.rad(lng2);
-				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
-					Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
-				s = s * 6378.137; 
-				s = Math.round(s * 10000) / 10000;
- 
-				var distance = s;
-				var distance_str = "";
- 
-				if (parseInt(distance) >= 1) {
-					distance_str = distance.toFixed(2) + "km";
-				} else {
-					distance_str = (distance * 1000).toFixed(2) + "m";
-				}
-				let objData = {
-					distance: distance,
-					distance_str: distance_str
-				}
-				this.markers[0].callout.content = '距离您' + objData.distance_str
+			{
+				id:2,
+				latitude: 35.146504,//门店图片点的 纬度
+				longitude: 116.486065,//经度
+				height: 160,//图片的宽高
+				width: 160,
+				callout: {
+					color: '#007AFF', // 文本颜色
+					bgColor: '#fff', // 背景色
+					display: "ALWAYS", // 'BYCLICK':点击显示; 'ALWAYS':常显
+					fontSize: 15,
+					textAlign: 'left', // 文本对齐方式。有效值: left, right, center
+					padding: 10, // 文本边缘留白
+					borderRadius: 5,
+					content: '距离5km',
+				},
+
+				iconPath: '/static/images/position/weixiu.png'//图
+			}]
+		};
+	},
+	methods: {
+		//计算距离的方法实现
+		rad(d) {
+			return d * Math.PI / 180.0;
+		},
+		// 根据经纬度计算距离，参数分别为第一点的纬度，经度；第二点的纬度，经度
+		getDistances(lat1, lng1, lat2, lng2) {
+			console.log('计算距离',lat1, lng1, lat2, lng2)
+
+			var radLat1 = this.rad(lat1);
+			var radLat2 = this.rad(lat2);
+			var a = radLat1 - radLat2;
+			var b = this.rad(lng1) - this.rad(lng2);
+			var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+				Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+			s = s * 6378.137;
+			s = Math.round(s * 10000) / 10000;
+
+			var distance = s;
+			var distance_str = "";
+
+			if (parseInt(distance) >= 1) {
+				distance_str = distance.toFixed(2) + "km";
+			} else {
+				distance_str = (distance * 1000).toFixed(2) + "m";
+			}
+			let objData = {
+				distance: distance,
+				distance_str: distance_str
 			}
+			this.markers[0].callout.content = '距离您' + objData.distance_str
 		},
-		mounted() {
-			let that = this
-			//获取当前位置
-			uni.getLocation({
-				type: 'wgs84',
-				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
-				success: function(res) {
-					console.log(res)
-					that.latitude = res.latitude//当前位置
-					that.longitude = res.longitude
-					that.markers[0].latitude = 30.51242//配送员位置  可调接口实时获取并且赋值
-					that.markers[0].longitude = 114.18055
-				},
-				fail: function() {
-					uni.showToast({
-						title: '获取地址失败，将导致部分功能不可用',
-						icon: 'none'
-					});
-				}
-			});
-			//调用计算距离方法
-			this.getDistances(30.64525, 114.17240, 30.51242, 114.18055)
+		// 获取当前经纬度
+		getLocation() {
+			// uni.getLocation({
+			// 	type: 'wgs84',
+			// 	success: (res) => {
+			// 		this.latitude = res.latitude//当前位置
+			// 		this.longitude = res.longitude
+					this.markers[1].latitude =  this.latitude+20//配送员位置  可调接口实时获取并且赋值
+					this.markers[1].longitude = this.longitude+20
+			// 		console.log('定位成功:', res,this.markers);
+					this.getDistances(this.markers[1].latitude, this.markers[1].longitude,this.markers[0].latitude,  this.markers[0].longitude)
+			// 	},
+			// 	fail: (err) => {
+			// 		this.error = err;
+			// 		console.error('定位失败:', err);
+			// 	}
+			// });
 		},
-	};
+	},
+	onload() {
+
+	},
+	mounted() {
+		this.getLocation()
+	},
+};
 </script>
- 
-<style scoped>
- 
-</style>
\ No newline at end of file
+
+<style scoped></style>
\ No newline at end of file
diff --git a/static/images/position/destination.png b/static/images/position/destination.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0e6b9883ab761a8bd3f74c95479ee4ac0a03230
GIT binary patch
literal 993
zcmV<710MW|P)<h;3K|Lk000e1NJLTq002Dz002D*1^@s69%5nX00001b5ch_0Itp)
z=>Px&n@L1LRA@u(nO$z$KoEduEOL$pa)eN+ZvoVM6i$-lBqaB!z<sM!a)f|;j!;jv
zb}0m}y)&~vAQ8X#Wp>x!{LdQU0w26UX83@<6svz&I)<e;qc7Lc+g_I?i~#5p5?)v5
zAk}Zef{+RT{G9<7{l%}R7~gTYXB0~t&@$Ujk>C!{z)Bt}j3N;6IhF!~LjQ*axR+qI
z%Thsr&o_(JLzw;QU4lWsPKFN{4E7i?EW9_gu`c0uE_Y*%?Wn-=YTVC%7Mj(&HD1u0
zufq|Qu=M!=`C5N)HS}qKcPjF8cNO$$f%o8;;jI6Cl}o)v3|+-=w%te%iX*RcbusjM
zJY1$pT3j_zF<89xxzgg2b$-A#Dgiy+EM8_@aJHq-BaYj#FoQ8SzS+>>tz7lnb^jgW
zA;<^I)tIvt3p#|AjSE&oMF#oKBGoWrp6t)4gz^pnr<{*&li^yM1?^{LD!8SkRxZue
z9>BCV4|*~rjRm9$#+>0dwD2;y6M8fGJS8yN7d}j_+jjNo=Q%F!gnpge&NZ>-I^2MD
z4G!uih@osJ^m=l;k;WJSJlba9+I8RV_ewN9G~`)%^=MOo&db~`&VZK3^I)-R?Au)d
z?8#1RZQJ>WVblq&JJhaecLmU{Yi0#3d;PA^>4sL!%eIWobyHg&a4X9K?dZ<Bp%s}M
z0cXb-dfcldTQ1<PedoSj&?-welNk5IZ3^Rh$@`dXDxM$H3TUvD3~n21_Y!%@bd}2_
ziHy~3wA5Ek$@EHO#wFH@7Svj@svDQLrM>32_vfL`XS;U|t!Yl|Lw)nlNB0FEHy0e|
zZ?8ICL94EZ_>)yzN6*az$Ll#mj<X}v9uDAc2fIcXowCg@o9@hQ&U8cj+<p?|NWGcl
zj|3~}b!f}w+AL_ji|@XSe=)DA$%p(L*JeZOUHssa2y#OB(YP-9_wO2kzDcLKV}rZu
z^G@FB-aA2Uj0vwE)Z$z#vn_1|brYAGLA;P_Wf8Oy*49lifpCGu%3^5W%qnEzi8HQ;
z8nMsYc`sGFd0RUv-OX1%(GR?Hif>6AAF7v~y^n3;TT^{)tOXXw^tpih0DD7MuCBOJ
z^0Bfna1iK};30s6L8kx@1soJQCU{8T;LtI^Ljy;F4hbFuI2v>a@L0f6p?$z(0!N3|
zfX4<-0xbbg0h|n)1D*;vDRdWjO5o(sHt^KICxJc$KLzl~pnayS5NrPek)w-TRHclI
P00000NkvXXu0mjfWNqEH

literal 0
HcmV?d00001

diff --git a/static/images/position/weixiu.png b/static/images/position/weixiu.png
new file mode 100644
index 0000000000000000000000000000000000000000..df091370b1dee22c578e03b526735b323effc5cc
GIT binary patch
literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq0027x0027(1^@s6#U=8y00001b5ch_0Itp)
z=>Px%Pf0{URA@u(nOjoAFcgOW@aCYx4#b_rm53`5RsycX?8GhsFN`nRIH91Zl(sn+
zBc#vGOuqA-{v-#3BYMmcu_D7Bs_j2BJG9R>6m{XwoK|uF40d2&?mbNL<oY)U4Lh_i
zV-GU}P&~T+<w3&+tAJUxu|avI)ynE^9KKbL-u;(N?;hRhm4;n)*lnvDKrOqfu)nQV
zxE`2m1eGf6E~{(1DnX?NTW3|XmDOO+?Q&*-aeWZU2bBu!(7uj5%7>=Jl@2Nu*k-Fb
zL8SsauuI=$RU@dxVcS~O2r6;d4p!H^azP~uJG9G*2X0%o@aJn%K_v>?-KuO*iNVHN
zl?*B|*nwS!-_=pq7M2Vu5!kKEc`R$V9<X2iL|~~_rR=i9@>rD#Dt1^ds}e!Q3d?C#
zqLo=;_gv1C2r4#M39H<8*<fX?@&*+PY}3f4p@$2=7k~)|kh((%%Z!QzHo|IQfV&d7
zFhCfVH=eXOE(c`Tj#gKYK<T~@%G=}@{X|8EZDTdeg?s2t7w)9kV1>C9P>wxt-NtNK
zN3~0WZLqqw*qd)d{&ZMDzuOAB`v0fyp$^kYur(u>739M8CvBQ@`<(z@qP*QRawP>-
zH0+M?Xkp-|3wJv23c1_%s>OdzIVi0h4ZE>wfGM!QRb%0If7kIr6%89E5izYA1OD^7
zj<p*N8?$MSH5K^VDCQ6Be+Nq`ScaukFXgq_Y|3^hd&_1i)k}G8Hk+~?%HFbBO7&7+
vo6V+dhqAY9mQuZx*JiUR+oA03sLXx<R`?-HTK#;j00000NkvXXu0mjfTbMFe

literal 0
HcmV?d00001

diff --git a/store/index.js b/store/index.js
index 09f6bcb..97c14d4 100644
--- a/store/index.js
+++ b/store/index.js
@@ -47,6 +47,9 @@ const store = new Vuex.Store({
         uni.reLaunch({
           url: "/pages/order/tasking",
         });
+
+        // 如果是维修人员登录   则实时更新当前维修人员的位置
+        
       }
 
     },