diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js index 7a5558c9a76c86a896022c9820978d7718207397..a4d79df74b24c2ded8f132baf6cc024918009ac0 100644 --- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js +++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js @@ -99,6 +99,7 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) { 'process.env.UNI_APP_ID': JSON.stringify(process.env.UNI_APP_ID), 'process.env.UNI_APP_NAME': JSON.stringify(process.env.UNI_APP_NAME), 'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM), + 'process.env.UNI_SUB_PLATFORM': JSON.stringify(process.env.UNI_SUB_PLATFORM), 'process.env.UNI_CLOUD_PROVIDER': process.env.UNI_CLOUD_PROVIDER, 'process.env.UNICLOUD_DEBUG': process.env.UNICLOUD_DEBUG, 'process.env.RUN_BY_HBUILDERX': process.env.RUN_BY_HBUILDERX, diff --git a/src/platforms/mp-weixin/helpers/enhance-system-info.js b/src/platforms/mp-weixin/helpers/enhance-system-info.js index 4fdaa674330d413065bf843920f2d75cf0b18437..b7acd8cf33a749c1da3b0effb3c79e3663b6acc7 100644 --- a/src/platforms/mp-weixin/helpers/enhance-system-info.js +++ b/src/platforms/mp-weixin/helpers/enhance-system-info.js @@ -27,7 +27,8 @@ export function addSafeAreaInsets (result) { } export function populateParameters (result) { - const { brand, model, system, language, theme, version, hostName, platform } = result + const { brand, model, system, language, theme, version, hostName = '', platform } = result + const isQuickApp = __PLATFORM__.indexOf('quickapp-webview') !== -1 // osName osVersion let osName = '' @@ -66,7 +67,7 @@ export function populateParameters (result) { // deviceModel let deviceBrand = model.split(' ')[0].toLocaleLowerCase() - if (__PLATFORM__ === 'mp-toutiao' || __PLATFORM__ === 'mp-lark') { + if (__PLATFORM__ === 'mp-toutiao' || __PLATFORM__ === 'mp-lark' || isQuickApp) { deviceBrand = brand.toLocaleLowerCase() } else { deviceBrand = getDeviceBrand(deviceBrand) @@ -89,7 +90,7 @@ export function populateParameters (result) { appVersionCode: process.env.UNI_APP_VERSION_CODE, uniCompileVersion: process.env.UNI_COMPILER_VERSION, uniRuntimeVersion: process.env.UNI_COMPILER_VERSION, - uniPlatform: process.env.UNI_PLATFORM, + uniPlatform: process.env.UNI_SUB_PLATFORM || process.env.UNI_PLATFORM, deviceBrand, deviceModel: model, deviceType, diff --git a/src/platforms/quickapp-webview/runtime/api/protocols.js b/src/platforms/quickapp-webview/runtime/api/protocols.js index 3c28c70f9e1de0c32a7bb5e454ca403d0cfd03a0..c4fcebe846c8bf16f78c7f2983b0a82c36dd466b 100644 --- a/src/platforms/quickapp-webview/runtime/api/protocols.js +++ b/src/platforms/quickapp-webview/runtime/api/protocols.js @@ -1,11 +1,14 @@ import navigateTo from 'uni-helpers/navigate-to' import redirectTo from '../../../mp-weixin/helpers/redirect-to' import previewImage from '../../../mp-weixin/helpers/normalize-preview-image' +import getSystemInfo from '../../../mp-weixin/helpers/system-info' export const protocols = { navigateTo, redirectTo, - previewImage + previewImage, + getSystemInfo, + getSystemInfoSync: getSystemInfo, } export const todos = [ 'preloadPage',