提交 d52158ae 编写于 作者: Q qiang

chore: build app

上级 3b44e515
...@@ -2790,7 +2790,7 @@ var serviceContext = (function () { ...@@ -2790,7 +2790,7 @@ var serviceContext = (function () {
icon: { icon: {
default: 'success', default: 'success',
validator (icon, params) { validator (icon, params) {
if (['success', 'loading', 'none'].indexOf(icon) === -1) { if (['success', 'loading', 'error', 'none'].indexOf(icon) === -1) {
params.icon = 'success'; params.icon = 'success';
} }
} }
...@@ -6471,6 +6471,7 @@ var serviceContext = (function () { ...@@ -6471,6 +6471,7 @@ var serviceContext = (function () {
geocode = false, geocode = false,
altitude = false altitude = false
} = {}, callbackId) { } = {}, callbackId) {
const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation');
plus.geolocation.getCurrentPosition( plus.geolocation.getCurrentPosition(
position => { position => {
getLocationSuccess(type, position, callbackId); getLocationSuccess(type, position, callbackId);
...@@ -6481,10 +6482,7 @@ var serviceContext = (function () { ...@@ -6481,10 +6482,7 @@ var serviceContext = (function () {
getLocationSuccess(type, e, callbackId); getLocationSuccess(type, e, callbackId);
return return
} }
errorCallback(e);
invoke$1(callbackId, {
errMsg: 'getLocation:fail ' + e.message
});
}, { }, {
geocode: geocode, geocode: geocode,
enableHighAccuracy: altitude enableHighAccuracy: altitude
...@@ -10258,7 +10256,7 @@ var serviceContext = (function () { ...@@ -10258,7 +10256,7 @@ var serviceContext = (function () {
}); });
toast = true; toast = true;
} else { } else {
if (icon && !~['success', 'loading', 'none'].indexOf(icon)) { if (icon && !~['success', 'loading', 'error', 'none'].indexOf(icon)) {
icon = 'success'; icon = 'success';
} }
const waitingOptions = { const waitingOptions = {
...@@ -10285,11 +10283,11 @@ var serviceContext = (function () { ...@@ -10285,11 +10283,11 @@ var serviceContext = (function () {
interval: duration interval: duration
}; };
} else { } else {
if (icon === 'success') { if (icon !== 'loading') {
waitingOptions.loading = { waitingOptions.loading = {
display: 'block', display: 'block',
height: '55px', height: '55px',
icon: '__uniappsuccess.png', icon: icon === 'success' ? '__uniappsuccess.png' : '__uniapperror.png',
interval: duration interval: duration
}; };
} }
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册