From 9ea0383c303620cd019d0776ecbb47f52bcef805 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 28 六月 2023 14:17:25 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3版本开发' into develop
---
uniapp/App.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/uniapp/App.vue b/uniapp/App.vue
index a85e536..0838844 100644
--- a/uniapp/App.vue
+++ b/uniapp/App.vue
@@ -91,6 +91,7 @@
uni.getSystemInfo({
success: e => {
// #ifdef APP-PLUS
+ console.log(e)
if (e.platform == 'android') {
this.globalData.platform = 'android'
this.globalData.systemLevel = e.system
@@ -138,6 +139,7 @@
ifwt: 0,
hasinit:false,
hasbcinit:false,
+ isLaunch:false
},
onShow: function() {
@@ -150,12 +152,14 @@
content: '妫�娴嬪埌缃戠粶鏉冮檺鍙兘璁剧疆涓哄叧闂紝鎮ㄥ彲浠ュ湪鈥滆缃�濅腑妫�鏌ユ棤绾挎暟鎹強铚傜獫绉诲姩缃戠粶'
})
}else{
+ console.log("鏄惁璇锋眰杩囷細"+that.globalData.hasinit)
if(!that.globalData.hasinit)
{
that.getAppInfo();
}
if(!that.globalData.hasbcinit)
{
+ console.log("鍒濆鍖栫櫨宸濇彃浠�")
that.bcInit();
}
/* let appInfo = utils.getCacheSync('appInfo')
@@ -187,6 +191,7 @@
if (uni.getSystemInfoSync().platform == 'ios')
{
const plug = uni.requireNativePlugin('xiguazhu-baichuan');
+ console.log(plug)
plug.init({}, result => {
//console.log('1111111111111111111');
console.log(result); // code绛変簬0灏辨槸鍒濆鍖栨垚鍔�
@@ -196,12 +201,19 @@
}
});
}
+ else{
+ that.globalData.hasbcinit=true;
+ }
},
getAppInfo: function() {
var that = this;
+ that.globalData.hasinit=true;
this.$u.api.comminInt({}).then(e => {
- if (e.code != 0) return that.$alert(e.msg)
- that.globalData.hasinit=true;
+ if (e.code != 0)
+ {
+ that.globalData.hasinit=false;
+ return that.$alert(e.msg)
+ }
that.globalData.appinfo = e.data.basic
utils.setCache('appInfo', e.data.basic)
utils.setCache('baseUrl', this.$u.http.config.baseUrl)
@@ -220,7 +232,6 @@
that.globalData.ifwt = 0
}
}
- console.log(that.globalData.ifwt);
} else {
if (plus.runtime.isApplicationExist({pname:'com.tencent.mm',
action: 'weixin://'
@@ -233,8 +244,7 @@
}
}
// #endif
-
- }).catch(function(err) {})
+ }).catch(function(err) {that.globalData.hasinit=false;})
},
--
Gitblit v1.9.3