diff --git a/App.vue b/App.vue index 55b8bf949c17e255b3ab02c813d83b1db4d4d8d5..4e324609e0c3fb8dcb2866d0bf422948da3d07d3 100644 --- a/App.vue +++ b/App.vue @@ -29,7 +29,7 @@ // checkIsAgree(); // 默认不开启。目前全球,仅欧盟国家有网页端同意隐私权限的需要。如果需要可以自己去掉注视后生效 // #endif - // #ifdef APP + // #ifdef APP-PLUS //idfa有需要的用户在应用首次启动时自己获取存储到storage中 /*var idfa = ''; var manager = plus.ios.invoke('ASIdentifierManager', 'sharedManager'); diff --git a/common/appInit.js b/common/appInit.js index 36506f9beb27bb5dc04e0a70621578e9ea282300..996b7a30a527158c0dcf2e5104b3418e7841b085 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -135,7 +135,7 @@ export default async function() { * // 初始化appVersion */ function initAppVersion() { - // #ifdef APP + // #ifdef APP-PLUS let appid = plus.runtime.appid; plus.runtime.getProperty(appid, (wgtInfo) => { let appVersion = plus.runtime; diff --git a/pages/list/list.nvue b/pages/list/list.nvue index 13476fc0ce650b1124c86a7757f1ae23deea0be6..d50fb1b56216723b311283a1c8ce06a44fefbc8a 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -125,7 +125,7 @@ let location = await gps.getLocation({ geocode: true }) - console.log(location); + // console.log(location); // #endif // if(location){ // uni.showToast({ diff --git a/pages/list/search/search.nvue b/pages/list/search/search.nvue index bcdea968665dff218035f31bf5d1ac591df23d8e..745173540629d850ac36cd32c3a006ee204cf4ea 100644 --- a/pages/list/search/search.nvue +++ b/pages/list/search/search.nvue @@ -3,7 +3,7 @@ - + @@ -163,7 +163,7 @@ } }, onLoad() { - //#ifdef APP-PLUS + //#ifdef APP this.statusBarHeight = `${uni.getSystemInfoSync().statusBarHeight}px`; //#endif }, @@ -376,7 +376,7 @@ flex-direction: row; } - /* #ifdef APP-PLUS */ + /* #ifdef APP */ /* #ifndef APP-NVUE || VUE3*/ ::v-deep /* #endif */ diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue index ad7d9914b68a5872908abf8a75dceb0753489176..baf01adbb26f407fc8e5142afd15797764ce6b8c 100644 --- a/pages/ucenter/settings/settings.vue +++ b/pages/ucenter/settings/settings.vue @@ -56,7 +56,7 @@ uni.setNavigationBarTitle({ title: this.$t('settings.navigationBarTitle') }) - // #ifdef APP-PLUS || MP-WEIXIN + // #ifdef APP || MP-WEIXIN || (APP-HARMONY && uniVersion > 4.31) uni.checkIsSupportSoterAuthentication({ success: (res) => { this.supportMode = res.supportMode diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue index 3e924468a82077a2d619ff4cbbb926127c5348d3..eb97d52e5971b9de5c8977949c45bffe9a29ba8b 100644 --- a/pages/ucenter/ucenter.vue +++ b/pages/ucenter/ucenter.vue @@ -78,7 +78,7 @@ ], ucenterList: [ [ - // #ifdef APP + // #ifdef APP-PLUS { "title": this.$t('mine.signInByAd'), "event": 'signInByAd', @@ -156,8 +156,7 @@ }) //#endif }, - onShow() { - }, + onShow() {}, computed: { userInfo() { return store.userInfo diff --git a/uni_modules/json-gps/js_sdk/gps.js b/uni_modules/json-gps/js_sdk/gps.js index eeb08ddce6376fa9dc3e00a77ce24389a78ae721..b90c9dd3efd67b814b124dea6c2488bb56ab78cd 100644 --- a/uni_modules/json-gps/js_sdk/gps.js +++ b/uni_modules/json-gps/js_sdk/gps.js @@ -1,4 +1,4 @@ -// #ifdef APP +// #ifdef APP-PLUS import permision from "./wa-permission/permission.js" // #endif class Gps { @@ -30,7 +30,7 @@ class Gps { console.error(JSON.stringify(err)) callback(false) - // #ifdef APP + // #ifdef APP-PLUS await this.checkGpsIsOpen() // #endif @@ -63,7 +63,7 @@ class Gps { }); }) } - // #ifdef APP + // #ifdef APP-PLUS async checkGpsIsOpen() { this.lock = true //加锁防止重复的请求 // console.log('检查定位设置开启问题', permision.checkSystemEnableLocation());