From 16eb38e3017b7d5d3371963003ed99e740a5c2f5 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 29 Oct 2024 10:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/tabbar.vue                       |  14 +-
 manifest.json                                    |  10 +-
 pages/index/center.vue                           |   2 +-
 pages_order/auth/wxLogin.vue                     |   2 +-
 pages_order/components/address/redactAddress.vue |   2 +-
 utils/position.js                                | 184 -----------------------
 6 files changed, 11 insertions(+), 203 deletions(-)
 delete mode 100644 utils/position.js

diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index cb3a24d..d6b77d4 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -50,13 +50,13 @@
 						"title": "活动",
 						icon : 'gift',
 					},
-					{
-						"selectedIconPath": "/static/image/tabbar/cart-a.png",
-						"iconPath": "/static/image/tabbar/cart.png",
-						"pagePath": "/pages/index/message",
-						"title": "消息",
-						icon : 'chat',
-					},
+					// {
+					// 	"selectedIconPath": "/static/image/tabbar/cart-a.png",
+					// 	"iconPath": "/static/image/tabbar/cart.png",
+					// 	"pagePath": "/pages/index/message",
+					// 	"title": "消息",
+					// 	icon : 'chat',
+					// },
 					{
 						"selectedIconPath": "/static/image/tabbar/center-a.png",
 						"iconPath": "/static/image/tabbar/center.png",
diff --git a/manifest.json b/manifest.json
index 2ef1a26..95a39b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -57,15 +57,7 @@
             "urlCheck" : false
         },
         "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            },
-            "scope.userFuzzyLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        },
-        "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ]
+        "permission" : {}
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 65f2705..3e5ce75 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -119,7 +119,7 @@
 			暂未开放
 		</view>
 
-		<tabber select="3" />
+		<tabber select="2" />
 	</view>
 </template>
 
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 06288e2..930f806 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -33,7 +33,7 @@
 						<uv-checkbox
 							size="40rpx"
 							icon-size="30rpx"
-							activeColor="#FD5100"
+							activeColor="#5baaff"
 							:name="1"
 						></uv-checkbox>
 						阅读并同意我们的<text @click="openConfigDetail('getPrivacyPolicy')">“服务协议与隐私条款”</text>
diff --git a/pages_order/components/address/redactAddress.vue b/pages_order/components/address/redactAddress.vue
index e11d971..3deb375 100644
--- a/pages_order/components/address/redactAddress.vue
+++ b/pages_order/components/address/redactAddress.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-	import Position from '@/utils/position.js'
+	// import Position from '@/utils/position.js'
 	export default {
 		data() {
 			return {
diff --git a/utils/position.js b/utils/position.js
deleted file mode 100644
index d831ca0..0000000
--- a/utils/position.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import config from '../config.js'
-
-/**
- * 计算两点之间的距离
- * @param {number} lat1 地点1精度
- * @param {number} lon1 地点1维度
- * @param {number} lat2 地点2精度
- * @param {number} lon2 地点2维度
- * @param {number} fixed 保留几位小数,默认0,单位km
- */
-function calculateDistance(lat1, lon1, lat2, lon2) { //计算两点距离
-	let distance = 0
-	if (!lat2 || !lon2) return distance
-	//先强制转换一下(后端给的字符串)
-	lat1 = parseFloat(lat1)
-	lon1 = parseFloat(lon1)
-	lat2 = parseFloat(lat2)
-	lon2 = parseFloat(lon2)
-	// 将角度转换为弧度
-	const R = 6371; // 地球半径，单位公里  
-	const dLat = (lat2 - lat1) * Math.PI / 180;
-	const dLon = (lon2 - lon1) * Math.PI / 180;
-	lat1 = lat1 * Math.PI / 180;
-	lat2 = lat2 * Math.PI / 180;
-	// Haversine公式  
-	const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-		Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
-	const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-	// 计算距离  
-	distance = R * c;
-	return distance.toFixed(0)
-}
-
-function getLocation(fn) { //获取用户经纬度
-	wxGetLocation() //此方法只用于提示用户打开gps
-	uni.getLocation({
-		type: 'gcj02',
-		isHighAccuracy: true,
-		highAccuracyExpireTime: 1000,
-		success: function(position) {
-			fn(position)
-		},
-		fail: function() { //使用ip获取定位
-			let key = config.mapKey; //腾讯地图key
-			getUserAddressByIp(key).then(res => {
-				fn(res.position) //返回经纬度
-			})
-		}
-	})
-}
-
-function getLocationDetail() { //获取用户详细地址
-	wxGetLocation()
-	return new Promise((resolve, reject) => {
-		let key = config.mapKey; //腾讯地图key
-		uni.getLocation({
-			type: 'gcj02',
-			isHighAccuracy: true,
-			highAccuracyExpireTime: 1000,
-			success: function(position) {
-				getUserAddress(position.latitude, position.longitude, key).then(res => {
-					resolve(res)
-				})
-			},
-			fail: function() { //使用ip获取定位
-				getUserAddressByIp(key).then(res => {
-					resolve(res)
-				})
-			}
-		})
-	})
-}
-
-function getUserAddress(latitude, longitude, key) { //通过经纬度获取用户详细地址
-	return new Promise((resolve, reject) => {
-		
-		let url = `/ws/geocoder/v1/?location=${latitude},${longitude}&key=${key}`
-		
-		// #ifndef H5
-			url = `https://apis.map.qq.com` + url
-		// #endif
-		
-		uni.request({
-			url,
-			success: (res) => {
-				let {
-					lat,
-					lng
-				} = res.data.result.ad_info.location;
-				let data = {
-					position: {
-						latitude: lat,
-						longitude: lng
-					},
-					addressDetail: res.data.result.ad_info
-				}
-				resolve(data)
-			},
-			fail(err) {
-				reject(err)
-			}
-		})
-	})
-}
-
-function getUserAddressByIp(key) { //根据IP获取当前用户位置
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: 'https://api.ipify.org?format=json',
-			success: (ipInfo) => {
-				
-				let url = `/ws/location/v1/ip?ip=${ipInfo.data.ip}&key=${key}`
-				
-				// #ifndef H5
-					url = `https://apis.map.qq.com` + url
-				// #endif
-				
-				uni.request({
-					url,
-					success: (res) => {
-						let {
-							lat,
-							lng
-						} = res.data.result.location;
-						let data = {
-							addressDetail: res.data.result.ad_info,
-							ip: res.data.result.ip,
-							position: {
-								latitude: lat,
-								longitude: lng
-							}
-						}
-						resolve(data)
-					},
-					fail(err) {
-						reject(err)
-					}
-				})
-			}
-		})
-	})
-}
-
-//打开地图让用户选择位置
-function selectAddress(longitude, latitude, successCallback) {
-	uni.chooseLocation({
-		longitude, //经度
-		latitude, //纬度
-		success: function(res) {
-			successCallback && successCallback(res)
-		}
-	});
-}
-
-//sdk自带获取位置方法(只支持微信环境),这里只当提示在用了(具体获取地址逻辑上面几个方法已完成)
-function wxGetLocation(successCallback, failCallback) {
-	// #ifdef MP-WEIXIN
-	
-	// #endif
-	console.log('wx.getLocation');
-	wx.getLocation({
-		type: 'gcj02',
-		isHighAccuracy: true,
-		highAccuracyExpireTime: 2000,
-		success(res) {},
-		fail(err) {
-			if(err.errMsg == 'getLocation:gps closed'){
-				uni.showToast({
-					title: '请打开GPS定位,否则定位不准确',
-					icon: 'none'
-				})
-			}
-		}
-	})
-}
-
-
-export default {
-	calculateDistance, //计算两点距离
-	getLocationDetail, //获取用户详细地址
-	getLocation, //获取用户经纬度
-	selectAddress, //打开地图让用户选择位置
-	wxGetLocation,
-}
\ No newline at end of file