Commit b982ab09 authored by 刘世达's avatar 刘世达

Merge branch 'feat-terminal-at-least-add-harmony' into 'master'

Feat terminal at least add harmony

See merge request !120
parents 66ca8eb2 9b9cd9de
// tslint:disable // tslint:disable
import { isAndroid, isIOS, isWxMp, isApp } from '@/service/utils.service'; import { isAndroid, isIOS, isWxMp, isApp, isHarmonyOS } from '@/service/utils.service';
import localStorage from '@/service/localStorage.service'; import localStorage from '@/service/localStorage.service';
import Toast from '@qg/cherry-ui/src/toast'; import Toast from '@qg/cherry-ui/src/toast';
...@@ -71,6 +71,9 @@ export default { ...@@ -71,6 +71,9 @@ export default {
let terminal = ''; let terminal = '';
if (isApp) { if (isApp) {
terminal = isAndroid ? 'ANDROID' : 'IOS'; terminal = isAndroid ? 'ANDROID' : 'IOS';
if (isHarmonyOS) {
terminal = 'HARMONY';
}
} else if (isWxMp) { } else if (isWxMp) {
terminal = 'MINI-APP'; terminal = 'MINI-APP';
} else if ( } else if (
......
...@@ -2367,9 +2367,9 @@ ...@@ -2367,9 +2367,9 @@
} }
}, },
"@qg/citrus-ui": { "@qg/citrus-ui": {
"version": "0.3.69", "version": "0.3.70",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.69.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.70.tgz",
"integrity": "sha512-sMA4cUQHkH3OiC2Ycf3IiV7AXeBrlnSlv1Ts43HGqgDVI0KyOwiUEPz1K4KTTo5HJBh2r2uTCanvQJ1EbgB6Yw==", "integrity": "sha512-B/zvelfqZ4xkx2rZHHXUfDlYF3zl/KqaQ+Vqc20whcNxzW1kgF2f4vNd2kOIEISAUQUxHm1JoXDRQY1ykk1jUQ==",
"requires": { "requires": {
"@better-scroll/core": "^2.1.1", "@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.23.9", "@qg/cherry-ui": "^2.23.9",
...@@ -2386,9 +2386,9 @@ ...@@ -2386,9 +2386,9 @@
}, },
"dependencies": { "dependencies": {
"nanoid": { "nanoid": {
"version": "3.3.7", "version": "3.3.8",
"resolved": "http://npmprivate.quantgroups.com/nanoid/-/nanoid-3.3.7.tgz", "resolved": "http://npmprivate.quantgroups.com/nanoid/-/nanoid-3.3.8.tgz",
"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="
} }
} }
}, },
...@@ -23471,9 +23471,9 @@ ...@@ -23471,9 +23471,9 @@
} }
}, },
"sa-sdk-javascript": { "sa-sdk-javascript": {
"version": "1.26.18", "version": "1.27.2",
"resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.26.18.tgz", "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.27.2.tgz",
"integrity": "sha512-uTYdeUbP5vkqWhPquaRi2TJzOwQbx4lk6+zgEpPUvU5HIRloaxYWZE15B+02/x16m1ubFk9xOkF77A9qTjMQRQ==" "integrity": "sha512-hHqybFag21PJKjYSUCQRKFIQKMe6/mJcqrG/ERd7QATsJSKJadPS9b/JZ0p2aljWyM1oocMomCa1OLz+wN079w=="
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.2.1", "version": "5.2.1",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment