提交 fefc0de7 编写于 作者: 雪洛's avatar 雪洛

feat: 兼容uni-app-x的客户端平台

上级 55090d7f
...@@ -111,6 +111,8 @@ module.exports = { ...@@ -111,6 +111,8 @@ module.exports = {
switch (clientPlatform) { switch (clientPlatform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
clientPlatform = 'app' clientPlatform = 'app'
break break
case 'web': case 'web':
......
...@@ -18,7 +18,7 @@ const uniIdConfig = createConfig({ ...@@ -18,7 +18,7 @@ const uniIdConfig = createConfig({
}) })
class ConfigUtils { class ConfigUtils {
constructor ({ constructor({
context context
} = {}) { } = {}) {
this.context = context this.context = context
...@@ -31,6 +31,8 @@ class ConfigUtils { ...@@ -31,6 +31,8 @@ class ConfigUtils {
switch (uniPlatform) { switch (uniPlatform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
this.platform = 'app' this.platform = 'app'
break break
case 'web': case 'web':
...@@ -43,7 +45,7 @@ class ConfigUtils { ...@@ -43,7 +45,7 @@ class ConfigUtils {
} }
} }
getConfigArray () { getConfigArray() {
let configContent let configContent
try { try {
configContent = require('uni-config-center/uni-id/config.json') configContent = require('uni-config-center/uni-id/config.json')
...@@ -57,12 +59,12 @@ class ConfigUtils { ...@@ -57,12 +59,12 @@ class ConfigUtils {
return [configContent] return [configContent]
} }
getAppConfig () { getAppConfig() {
const configArray = this.getConfigArray() const configArray = this.getConfigArray()
return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig) return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
} }
getPlatformConfig () { getPlatformConfig() {
const appConfig = this.getAppConfig() const appConfig = this.getAppConfig()
if (!appConfig) { if (!appConfig) {
throw new Error( throw new Error(
...@@ -87,7 +89,7 @@ class ConfigUtils { ...@@ -87,7 +89,7 @@ class ConfigUtils {
return Object.assign(defaultConfig, appConfig, appConfig[platform]) return Object.assign(defaultConfig, appConfig, appConfig[platform])
} }
getOauthProvider ({ getOauthProvider({
provider provider
} = {}) { } = {}) {
const clientPlatform = this.platform const clientPlatform = this.platform
...@@ -101,7 +103,7 @@ class ConfigUtils { ...@@ -101,7 +103,7 @@ class ConfigUtils {
return oatuhProivder return oatuhProivder
} }
getOauthConfig ({ getOauthConfig({
provider provider
} = {}) { } = {}) {
const config = this.getPlatformConfig() const config = this.getPlatformConfig()
...@@ -122,7 +124,7 @@ class ConfigUtils { ...@@ -122,7 +124,7 @@ class ConfigUtils {
return oauthConfig return oauthConfig
} }
getHooks () { getHooks() {
if (uniIdConfig.hasFile('hooks/index.js')) { if (uniIdConfig.hasFile('hooks/index.js')) {
return require( return require(
uniIdConfig.resolve('hooks/index.js') uniIdConfig.resolve('hooks/index.js')
......
...@@ -10,6 +10,8 @@ function getQQPlatform () { ...@@ -10,6 +10,8 @@ function getQQPlatform () {
switch (platform) { switch (platform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
return 'app' return 'app'
case 'mp-qq': case 'mp-qq':
return 'mp' return 'mp'
......
...@@ -43,6 +43,8 @@ function getWeixinPlatform () { ...@@ -43,6 +43,8 @@ function getWeixinPlatform () {
switch (platform) { switch (platform) {
case 'app': case 'app':
case 'app-plus': case 'app-plus':
case 'app-android':
case 'app-ios':
return 'app' return 'app'
case 'mp-weixin': case 'mp-weixin':
return 'mp' return 'mp'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册