From dd2922d3facbfba5add501f35de5649b80b6cf05 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:22:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
App.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/App.vue b/App.vue
index 796812d..f240031 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,7 @@
import storage from '@/plugins/storage.js'
export default {
- onLaunch: function(options) {
+ onLaunch: async function(options) {
var query = options.q && decodeURIComponent(options.q) || ''
var querydto = {}
if (query) {
@@ -21,9 +21,9 @@
}
try {
if (!querydto.partnerUserId) {
- if (options.query && options.query.scene) {
+ if (options.query && options.query.scene || options.scene) {
//说明是特殊小程序二维码扫码跳转的
- var keyvalues = decodeURIComponent(options.query.scene).split("&")
+ var keyvalues = decodeURIComponent(options.query&&options.query.scene || options.scene).split("&")
for (var item of keyvalues) {
var tarr = item.split("=")
querydto[tarr[0]] = tarr[1]
@@ -52,9 +52,9 @@
}
});
// #ifdef MP
- if (true && storage.getItem('token')) {
+ if (true && storage.getItem('token')) {
+ const res = await this.$store.dispatch('getCurrentInfo');
setTimeout(async () => {
- const res = await this.$store.dispatch('getCurrentInfo');
// #ifndef PUB_CUSTOMER
if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
if (this.currentInfo.type === 'admin') {
--
Gitblit v1.9.3