更新

pages/oaHome/oaHome.vue

@@ -7,7 +7,7 @@
       :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''"
     >
       <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0 0 30rpx 30rpx;">
-        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 440rpx;transform: scale(1.2);background-color: #033d94;"/>
+        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 440rpx;transform: scale(1.2);background-color: #0122c7;"/>
       </view>
       <!-- #ifdef APP-PLUS||H5 -->
       <view style="height: var(--status-bar-height)"></view>

pages/oaLogin/oaLogin.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login">
 		<!-- <image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image> -->
-    <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 100vh;transform: scale(1.3);background-color: #033d94;"/>
+    <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 100vh;transform: scale(1.3);background-color: #0122c7;"/>
 		<!-- #ifdef APP-PLUS||H5 -->
 		<!-- <view style="height: var(--status-bar-height)"></view> -->
 		<!-- #endif -->

pages/oaMy/oaMy.vue

@@ -3,7 +3,7 @@
 		<view class="head_box" style="position: relative;">
 			<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
       <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0;">
-        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #033d94;"/>
+        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #0122c7;"/>
       </view>
 			<!-- #ifdef APP-PLUS||H5 -->
 			<view style="height: var(--status-bar-height);"></view>
@@ -132,7 +132,7 @@
 		methods: {
 			...mapActions(['getWxLogin']),
 			login() {
-				uni.redirectTo({
+				uni.reLaunch({
 					url: '/pages/oaLogin/oaLogin'
 				})
 			},
@@ -142,7 +142,7 @@
 				//   content: '确定要退出登录吗',
 				//   success: (e) => {
 				//     if (e.confirm) {
-				uni.redirectTo({
+				uni.reLaunch({
 					url: '/pages/oaLogin/oaLogin?clear=' + true,
 					success() {
 						that.$store.commit('CLEAR');

store/modules/app.js

@@ -18,7 +18,7 @@ const mutations = {
     uni.showModal({
       content: '登录已过期,是否重新登录?',
       success(e) {
-        if(e.confirm)uni.redirectTo({
+        if(e.confirm) uni.reLaunch({
           url:'/pages/oaLogin/oaLogin'
         })
       }

subpkg/property/vehicle.vue

@@ -130,8 +130,8 @@
 		},
 		onLoad(options) {
 			this.task_id = options.task_id;
-			this.initPosition();
 			this.locationFn();
+			this.initPosition();
 		},
 		methods: {
 			// 获取位置
@@ -160,52 +160,26 @@
 			},
 			// 位置
 			locationFn() {
-				let that = this
+				let that = this;
-				//#ifdef APP
 				uni.getLocation({
 					type: 'gcj02',
 					geocode: true,
 					isHighAccuracy: true,
 					success: function async (res) {
-						that.markers[1].latitude = res.latitude
+						that.markers[1].latitude = res.latitude;
-						that.markers[1].longitude = res.longitude
+						that.markers[1].longitude = res.longitude;
-						that.getDriverLine()
+						that.getDriverLine();
-					}
+            that.$u.sleep(500).then(()=>{
+               uni.hideLoading();
+            })
+					},
+          fail() {
+            that.$u.sleep(1000).then(()=>{
+               uni.hideLoading();
+               Toast('获取位置失败');
+            })
+          }
 				});
-				//#endif
-			},
-
-			// 唤起高德
-			test() {
-				if (this.is_captain) return
-				var packageName = 'com.autonavi.minimap';
-				var main = plus.android.runtimeMainActivity();
-				var packageManager = main.getPackageManager();
-				var PackageManager = plus.android.importClass(packageManager)
-				var packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
-				if (packageInfo) {
-					var Uri = plus.android.importClass("android.net.Uri");
-					var url =
-						`amapuri://route/plan?sourceApplication=maxuslife+
-						&sid=A&slat=36.702558&slon=116.876678&sname=我的位置&did=B&dlat=${this.markers[0].latitude}&dlon=${this.markers[0].longitude}&dname=${this.goodsDetil.logistics.shop_name}&dev=0&t=0`;
-					var Intent = plus.android.importClass('android.content.Intent');
-					var intent = new Intent();
-					intent.setAction(Intent.ACTION_VIEW);
-					intent.addCategory(Intent.CATEGORY_DEFAULT);
-					var uri = Uri.parse(url);
-					//将功能Scheme以URI的方式传入data  
-					intent.setData(uri);
-					intent.setPackage("com.autonavi.minimap");
-					var main = plus.android.runtimeMainActivity();
-					main.startActivity(intent);
-				} else {
-					// alert('未安装' + packageName + '')
-					uni.showToast({
-						title: `只支持高德地图`,
-						icon: 'none'
-					})
-				}
-				console.log("唤醒高德线路规划")
 			},
 			showToast() {
 				this.$refs.uToast.show({