快递员端地图显示bug修复和登录默认存储用户名密码，密码加密处理

tianwu
1 parent b58940ac
Showing 4 changed files with 74 additions and 6 deletions
project-wl-kuaidiyuan-uniapp-vue3/package.json
project-wl-kuaidiyuan-uniapp-vue3/pages/login/user.vue
project-wl-kuaidiyuan-uniapp-vue3/pages/my/map.vue
project-wl-kuaidiyuan-uniapp-vue3/utils/crypto.js
 {
   "dependencies": {
+    "crypto-js": "^4.2.0",
     "esbuild": "^0.14.53",
     "esbuild-windows-64": "^0.14.53"
   }
@@ -51,14 +51,17 @@ import storage from &#39;@/utils/storage.js&#39;;
 import { userLogins } from '../api/user.js';
 // 导入接口
 import { getHomeInfo } from '@/pages/api/index.js';
+
+import { encrypt, decrypt } from '@/utils/crypto.js'
+
 // ------定义变量------
 const store = useStore(); //vuex获取储存数据
 let showPassword = ref(false); //控制密码右侧图标显示隐藏
 const customForm = ref(); //表单校验
 // 表单数据
 let fromInfo = reactive({
-	account: 'qykdy002', //账号
-	password: '123456' // 密码
+	account: '', //账号
+	password: '' // 密码
 });
 // 表单校验
 const customRules = reactive({
@@ -84,8 +87,17 @@ onMounted(() =&gt; {
 	// 进入登录页面配置默认的请求url
 	// uni.setStorageSync('baseUrl', 'http://slwl-geteway-t.itheima.net/courier');
 	// 处理定时上报位置的定时器
-	clearInterval(uni.getStorageSync('positions').timer);
-	uni.setStorageSync('positions', null);
+	if(uni.getStorageSync('positions')?.timer) {
+		clearInterval(uni.getStorageSync('positions').timer);
+		uni.setStorageSync('positions', null);
+	}
+	const accountHistory = uni.getStorageSync('accountHistory')
+	if(accountHistory) {
+		fromInfo.account = accountHistory.account
+		fromInfo.password = decrypt(accountHistory.password)
+		// console.log(accountHistory)
+	}
+	
 });
 // ------定义方法------
 // 登录
@@ -112,6 +124,10 @@ const handleSubmit = async () =&gt; {
 					// 存储token
 					uni.setStorageSync('token', res.data.token);
 					store.commit('user/setToken', res.data.token);
+					
+					//存储用户账号和密码，密码加密存储
+					const data = { account: fromInfo.account, password: encrypt(fromInfo.password) }
+					uni.setStorageSync('accountHistory', data)
 					// // 通过vuex获取用户信息
 					store.dispatch('user/GetUsersInfo');
 					await getHomeInfo().then(res => {
@@ -9,7 +9,8 @@
       :latitude="latitude"
       :longitude="longitude"
       :polygons="polygons"
-      scale="16"
+	  :enable-zoom="true"
+      scale="10"
     ></map
   ></view>
 </template>
@@ -66,14 +67,49 @@ onMounted(() =&gt; {
   getUserPolygon();
 });
 // ------定义方法------
+
+const getGeoCenter = (points) => {
+  let x = 0, y = 0, z = 0
+
+  points.forEach(p => {
+    const lat = p.latitude * Math.PI / 180
+    const lng = p.longitude * Math.PI / 180
+
+    x += Math.cos(lat) * Math.cos(lng)
+    y += Math.cos(lat) * Math.sin(lng)
+    z += Math.sin(lat)
+  })
+
+  const total = points.length
+  x /= total; y /= total; z /= total
+
+  const lng = Math.atan2(y, x)
+  const hyp = Math.sqrt(x * x + y * y)
+  const lat = Math.atan2(z, hyp)
+
+  return {
+    longitude: lng * 180 / Math.PI,
+    latitude: lat * 180 / Math.PI
+  }
+}
+
+
 // 获取作业范围
 const getUserPolygon = async () => {
   await getUserScope().then((res) => {
     if (res.code === 200) {
-		// TODO暂时保留
+	  // TODO暂时保留
       // polygons[0].points=res.data.polygon
       // latitude.value=polygons[0].points[0].latitude
       // longitude.value=polygons[0].points[0].longitude
+	  
+	  if(res.data.polygon) {
+		  const {longitude : lng, latitude: lat} = getGeoCenter(res.data.polygon)
+		  latitude.value = lat
+		  longitude.value = lng
+		  polygons[0].points=res.data.polygon
+		  
+	  }
     }
   });
 };
+import CryptoJS from 'crypto-js'
+
+// 一个固定密钥（自己换掉）
+const SECRET_KEY = 'dili-tms'
+
+// AES 加密
+export function encrypt(data) {
+  return CryptoJS.AES.encrypt(data, SECRET_KEY).toString()
+}
+
+// AES 解密
+export function decrypt(cipherText) {
+  const bytes = CryptoJS.AES.decrypt(cipherText, SECRET_KEY)
+  return bytes.toString(CryptoJS.enc.Utf8)
+}