diff --git a/src/core/helpers/api.js b/src/core/helpers/api.js index 8cfd2c9cd5702935875b5fec8ecb2e94c8784e93..bf5dfe192639160a82dfa490f828af999cd836fb 100644 --- a/src/core/helpers/api.js +++ b/src/core/helpers/api.js @@ -286,7 +286,7 @@ function wrapperExtras (name, extras) { } } // 部分 API 直接实现 -const unwrappers = ['getPushClientid', 'onPushMessage', 'offPushMessage'] +const unwrappers = ['getPushClientId', 'onPushMessage', 'offPushMessage'] export function wrapper (name, invokeMethod, extras = {}) { if (unwrappers.indexOf(name) > -1 || !isFn(invokeMethod)) { @@ -329,4 +329,4 @@ export function wrapper (name, invokeMethod, extras = {}) { } } } -} +} diff --git a/src/core/service/api/plugin/push.js b/src/core/service/api/plugin/push.js index 881179bb3737adbe2d9d7a44c0c7187c55125174..7d5aa5d4dc866675da78a7665a7d01a314d514b9 100644 --- a/src/core/service/api/plugin/push.js +++ b/src/core/service/api/plugin/push.js @@ -49,7 +49,7 @@ function invokeGetPushCidCallbacks (cid, errMsg) { getPushCidCallbacks.length = 0 } -export function getPushClientid (args) { +export function getPushClientId (args) { if (!isPlainObject(args)) { args = {} } @@ -65,13 +65,13 @@ export function getPushClientid (args) { let res if (cid) { res = { - errMsg: 'getPushClientid:ok', + errMsg: 'getPushClientId:ok', cid } hasSuccess && success(res) } else { res = { - errMsg: 'getPushClientid:fail' + (errMsg ? ' ' + errMsg : '') + errMsg: 'getPushClientId:fail' + (errMsg ? ' ' + errMsg : '') } hasFail && fail(res) } @@ -99,4 +99,4 @@ export const offPushMessage = (fn) => { onPushMessageCallbacks.splice(index, 1) } } -} +} diff --git a/src/core/view/components/image/index.vue b/src/core/view/components/image/index.vue index f08c6b047806a355d2eea76751107af713097a9f..4d63ecc51ab88206e8e38edd6c7461d00fbf0bd1 100644 --- a/src/core/view/components/image/index.vue +++ b/src/core/view/components/image/index.vue @@ -172,8 +172,8 @@ export default { const img = this._img = this._img || new Image() img.onload = $event => { this._img = null - this.originalWidth = img.width - this.originalHeight = img.height + const width = this.originalWidth = img.width + const height = this.originalHeight = img.height this._fixSize() @@ -186,8 +186,8 @@ export default { this.$el.appendChild(img) this.$trigger('load', $event, { - width: img.width, - height: img.height + width, + height }) } img.onerror = $event => { diff --git a/src/core/view/components/navigator/index.vue b/src/core/view/components/navigator/index.vue index 90f4007f54b9d3e835f2ce58a15ca3359bbfcb44..024e4ab6282bcac345d140b484c3df8267ecaac8 100644 --- a/src/core/view/components/navigator/index.vue +++ b/src/core/view/components/navigator/index.vue @@ -92,7 +92,8 @@ export default { type: String, validator (value) { return !value || ~ANIMATION_TYPE_IN.concat(ANIMATION_TYPE_OUT).indexOf(value) - } + }, + default: '' }, animationDuration: { type: [String, Number], diff --git a/src/platforms/mp-alipay/runtime/api/index.js b/src/platforms/mp-alipay/runtime/api/index.js index 5cb9b32fe5eb9428f8d4e175c0fcfc78452ad0fb..0ffb1e8696551a4d581e69f6e0f4d80657ee4fb4 100644 --- a/src/platforms/mp-alipay/runtime/api/index.js +++ b/src/platforms/mp-alipay/runtime/api/index.js @@ -11,7 +11,7 @@ export { } from '../../helpers/storage' export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback @@ -106,4 +106,4 @@ export function createIntersectionObserver (component, options) { export { createMediaQueryObserver -} +} diff --git a/src/platforms/mp-baidu/runtime/api/index.js b/src/platforms/mp-baidu/runtime/api/index.js index 4f98ed19f003907d24abd60c208a25e0f4f53dbd..1d88c0b99427b04b90b50adadf8a0389b1d7759b 100644 --- a/src/platforms/mp-baidu/runtime/api/index.js +++ b/src/platforms/mp-baidu/runtime/api/index.js @@ -1,6 +1,6 @@ import createMediaQueryObserver from '../../../mp-weixin/helpers/create-media-query-observer' export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback @@ -26,4 +26,4 @@ export function requestPayment (params) { export { createMediaQueryObserver -} +} diff --git a/src/platforms/mp-jd/runtime/api/index.js b/src/platforms/mp-jd/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/mp-jd/runtime/api/index.js +++ b/src/platforms/mp-jd/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-kuaishou/runtime/api/index.js b/src/platforms/mp-kuaishou/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/mp-kuaishou/runtime/api/index.js +++ b/src/platforms/mp-kuaishou/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-lark/runtime/api/index.js b/src/platforms/mp-lark/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/mp-lark/runtime/api/index.js +++ b/src/platforms/mp-lark/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-qq/runtime/api/index.js b/src/platforms/mp-qq/runtime/api/index.js index 9f6a1478196c88f8cbc0e9f46475e17966f9cda2..7d5b51361ef4b766c0202c10cc568fabe56ae13c 100644 --- a/src/platforms/mp-qq/runtime/api/index.js +++ b/src/platforms/mp-qq/runtime/api/index.js @@ -4,9 +4,9 @@ export { createMediaQueryObserver } export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-toutiao/runtime/api/index.js b/src/platforms/mp-toutiao/runtime/api/index.js index 9f6a1478196c88f8cbc0e9f46475e17966f9cda2..7d5b51361ef4b766c0202c10cc568fabe56ae13c 100644 --- a/src/platforms/mp-toutiao/runtime/api/index.js +++ b/src/platforms/mp-toutiao/runtime/api/index.js @@ -4,9 +4,9 @@ export { createMediaQueryObserver } export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-weixin/runtime/api/index.js b/src/platforms/mp-weixin/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/mp-weixin/runtime/api/index.js +++ b/src/platforms/mp-weixin/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/mp-xhs/runtime/api/index.js b/src/platforms/mp-xhs/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/mp-xhs/runtime/api/index.js +++ b/src/platforms/mp-xhs/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push' diff --git a/src/platforms/quickapp-webview/runtime/api/index.js b/src/platforms/quickapp-webview/runtime/api/index.js index d9d3f7f8794a9ce50252f2ebd5635bef622984b0..2cad07eca9d3578b9280764a59431c47d71014b8 100644 --- a/src/platforms/quickapp-webview/runtime/api/index.js +++ b/src/platforms/quickapp-webview/runtime/api/index.js @@ -1,7 +1,7 @@ export { - getPushClientid, + getPushClientId, onPushMessage, offPushMessage, invokePushCallback } - from 'uni-core/service/api/plugin/push' + from 'uni-core/service/api/plugin/push'