cmy %!s(int64=4) %!d(string=hai) anos
pai
achega
87bae85f22
Modificáronse 2 ficheiros con 17 adicións e 20 borrados
  1. 2 2
      pages/index/index.vue
  2. 15 18
      utils/wxAuthorized.js

+ 2 - 2
pages/index/index.vue

@@ -11,7 +11,7 @@
 					</view>
 				</view>
 				<view class="navBox-right">
-					<view class="navBox-item" @click="nav()">
+					<view class="navBox-item" @click="nav('./convert')">
 						<image src="../../static/img/index3.png" style="width: 385rpx; height: 216rpx; " mode="">
 						</image>
 					</view>
@@ -67,7 +67,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup v-model="show" mode="bottom" border-radius="40" height="868rpx" closeable = true close-icon="关闭">
+		<u-popup v-model="show" mode="bottom" border-radius="40" height="868rpx" :closeable ="true" close-icon="关闭">
 			<view>出淤泥而不染,濯清涟而不妖</view>
 		</u-popup>
 	</view>

+ 15 - 18
utils/wxAuthorized.js

@@ -223,25 +223,22 @@ function shareFun(config) {
 // 保存路由对象
 export function setRouter(route) {
 	return new Promise((ok, err) => {
-		if(route){
-			let router = getApp().$router;
-			console.log(router,'开始数据');
-			if (!router) {
-				const set = setInterval(() => {
-					router = getApp().$router;
-					console.log(router,'返回数据');
-					if (router) {
-						console.log(router,'结束');
-						clearInterval(set)
-						ok(router)
-					}
-				}, 100);
-			}else{
-				console.log(router,'成功');
-				ok(router)
-			}
+		router = getApp().$router;
+		console.log(router,'开始数据');
+		if (!router) {
+			const set = setInterval(() => {
+				router = getApp().$router;
+				console.log(router,'返回数据');
+				if (router) {
+					console.log(router,'结束');
+					clearInterval(set)
+					ok(router)
+				}
+			}, 100);
+		}else{
+			console.log(router,'成功');
+			ok(router)
 		}
-		
 	})
 }