合并

pages/Loading/index.vue

@@ -7,15 +7,28 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapActions } from "vuex";
+	import {
-// 组件
+		mapState,
-// import request from "@//api/request";
+		mapMutations,
-import { wxappAuth, getUser } from "@/api/user";
+		mapActions
-import dayjs from "dayjs";
+	} from "vuex";
-import cookie from "@/utils/store/cookie";
+	// 组件
-import { parseQuery, login, handleQrCode ,getCurrentPageUrl,handleUrlParam} from "@/utils";
+	// import request from "@//api/request";
+	import {
+		wxappAuth,
+		getUser
+	} from "@/api/user";
+	import dayjs from "dayjs";
+	import cookie from "@/utils/store/cookie";
+	import {
+		parseQuery,
+		login,
+		handleQrCode,
+		getCurrentPageUrl,
+		handleUrlParam
+	} from "@/utils";
 
-export default {
+	export default {
 		name: "Loading",
 		data() {
 			return {};
@@ -23,7 +36,7 @@ export default {
 		onShow() {
 
 			var url = handleQrCode();
-    if(!url){
+			if (!url) {
 				url = handleUrlParam(getCurrentPageUrl())
 			}
 			// 判断是否是分销
@@ -39,26 +52,7 @@ export default {
 					this.toLaunch();
 					return;
 				}
-      // cookie.get("spread");
-      // if (this.$deviceType == "weixin") {
-      //   let path = parseQuery().path
-      //   console.log(this)
-      //   if (path) {
-      //     this.$yrouter.push({
-      //       path
-      //     });
-      //   } else {
-      //     this.$yrouter.switchTab({
-      //       path: "/pages/home/index"
-      //     });
-      //   }
-
-      //   return
-      // }
-      // this.toLaunch();
 				if (this.$deviceType == "app" || this.$deviceType == "h5") {
-        // this.toLaunch();
-
 					this.$yrouter.switchTab({
 						path: "/pages/home/index"
 					});
@@ -69,6 +63,7 @@ export default {
 						path: "/pages/home/index"
 					});
 				});
+			}
 		},
 		methods: {
 			...mapActions(["changeAuthorization", "setUserInfo"]),