yshop3.1正式发布

pages/Loading/index.vue

@@ -18,7 +18,7 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import { wxappAuth, getUser } from "@/api/user";
 import dayjs from "dayjs";
 import cookie from "@/utils/store/cookie";
-import { parseQuery, login, handleQrCode } from "@/utils";
+import { parseQuery, login, handleQrCode ,getCurrentPageUrl,handleUrlParam} from "@/utils";
 
 export default {
   name: "Loading",
@@ -26,8 +26,11 @@ export default {
     return {};
   },
   onShow() {
-    
+
     var url = handleQrCode();
+    if(!url){
+      url =  handleUrlParam(getCurrentPageUrl())
+    }
     // 判断是否是分销
     if (url) {
       var spread = cookie.get("spread");
@@ -44,7 +47,7 @@ export default {
     }
     cookie.get("spread");
     // this.toLaunch();
-    if (this.$deviceType == "app") {
+    if (this.$deviceType == "app"||this.$deviceType == "h5") {
       // this.toLaunch();
       this.$yrouter.switchTab({
         path: "/pages/home/index"
@@ -52,9 +55,9 @@ export default {
       return;
     }
     login().finally(() => {
-      // this.$yrouter.switchTab({
-      //   path: "/pages/home/index"
-      // });
+      this.$yrouter.switchTab({
+        path: "/pages/home/index"
+      });
     });
   },
   methods: {