cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
Gaoxs
2020-09-15 15:42:56 +08:00
parent e041a76e0c
commit 90cb82c1c5
1 changed files with 95 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pages/Loading/index.vue
View File

@ -7,15 +7,28 @@
</template> </template>
<script> <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", name: "Loading",
data() { data() {
return {}; return {};
@ -23,7 +36,7 @@ export default {
onShow() { onShow() {
var url = handleQrCode(); var url = handleQrCode();
if(!url){ if (!url) {
url = handleUrlParam(getCurrentPageUrl()) url = handleUrlParam(getCurrentPageUrl())
} }
// 判断是否是分销 // 判断是否是分销
@ -39,26 +52,7 @@ export default {
this.toLaunch(); this.toLaunch();
return; 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") { if (this.$deviceType == "app" || this.$deviceType == "h5") {
// this.toLaunch();
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index" path: "/pages/home/index"
}); });
@ -69,6 +63,7 @@ export default {
path: "/pages/home/index" path: "/pages/home/index"
}); });
}); });
}
}, },
methods: { methods: {
...mapActions(["changeAuthorization", "setUserInfo"]), ...mapActions(["changeAuthorization", "setUserInfo"]),