npm - @dcloudio/uni-app-plus - Versions diffs - 2.0.0 → 2.0.1-33420211227001 - Mend

@dcloudio/uni-app-plus 2.0.0 → 2.0.1-33420211227001

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/automator.view.js +1 -1
package/dist/index.js +543 -138
package/dist/index.v3.js +1540 -460
package/dist/view.css +1 -1
package/dist/view.umd.js +21028 -11114
package/dist/view.umd.min.js +2 -2
package/lib/uni.automator.js +1 -1
package/package.json +2 -2
package/template/common/__uniappchooselocation.js +1 -1
package/template/common/__uniapperror.png +0 -0
package/template/v3/__uniappquill.js +1 -1
package/template/v3/__uniappquillimageresize.js +1 -1

package/dist/index.v3.js CHANGED Viewed

@@ -13,7 +13,8 @@ var serviceContext = (function () {
     'base64ToArrayBuffer',
     'arrayBufferToBase64',
     'addInterceptor',
-    'removeInterceptor'
+    'removeInterceptor',
+    'interceptors'
   ];
   const network = [
@@ -27,7 +28,8 @@ var serviceContext = (function () {
     'onSocketMessage',
     'closeSocket',
     'onSocketClose',
-    'getUpdateManager'
+    'getUpdateManager',
+    'configMTLS'
   ];
   const route = [
@@ -62,6 +64,7 @@ var serviceContext = (function () {
     'chooseImage',
     'chooseFile',
     'previewImage',
+    'closePreviewImage',
     'getImageInfo',
     'getVideoInfo',
     'saveImageToPhotosAlbum',
@@ -192,7 +195,10 @@ var serviceContext = (function () {
     'getRightWindowStyle',
     'setTopWindowStyle',
     'setLeftWindowStyle',
-    'setRightWindowStyle'
+    'setRightWindowStyle',
+    'getLocale',
+    'setLocale',
+    'onLocaleChange'
   ];
   const event = [
@@ -225,8 +231,11 @@ var serviceContext = (function () {
     'login',
     'checkSession',
     'getUserInfo',
+    'getUserProfile',
     'preLogin',
     'closeAuthView',
+    'getCheckBoxState',
+    'getUniverifyManager',
     'share',
     'shareWithSystem',
     'showShareMenu',
@@ -246,12 +255,16 @@ var serviceContext = (function () {
     'sendNativeEvent',
     'preloadPage',
     'unPreloadPage',
-    'loadSubPackage'
+    'loadSubPackage',
+    'sendHostEvent',
+    'navigateToMiniProgram'
   ];
   const ad = [
     'createRewardedVideoAd',
-    'createFullScreenVideoAd'
+    'createFullScreenVideoAd',
+    'createInterstitialAd',
+    'createInteractiveAd'
   ];
   const apis = [
@@ -285,6 +298,84 @@ var serviceContext = (function () {
     window.addEventListener('test-passive', null, opts);
   } catch (e) {}
+  let realAtob;
+  const b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  const b64re = /^(?:[A-Za-z\d+/]{4})*?(?:[A-Za-z\d+/]{2}(?:==)?|[A-Za-z\d+/]{3}=?)?$/;
+  if (typeof atob !== 'function') {
+    realAtob = function (str) {
+      str = String(str).replace(/[\t\n\f\r ]+/g, '');
+      if (!b64re.test(str)) { throw new Error("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.") }
+      // Adding the padding if missing, for semplicity
+      str += '=='.slice(2 - (str.length & 3));
+      var bitmap; var result = ''; var r1; var r2; var i = 0;
+      for (; i < str.length;) {
+        bitmap = b64.indexOf(str.charAt(i++)) << 18 | b64.indexOf(str.charAt(i++)) << 12 |
+                      (r1 = b64.indexOf(str.charAt(i++))) << 6 | (r2 = b64.indexOf(str.charAt(i++)));
+        result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255)
+          : r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255)
+            : String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
+      }
+      return result
+    };
+  } else {
+    // 注意atob只能在全局对象上调用，例如：`const Base64 = {atob};Base64.atob('xxxx')`是错误的用法
+    realAtob = atob;
+  }
+  function b64DecodeUnicode (str) {
+    return decodeURIComponent(realAtob(str).split('').map(function (c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
+    }).join(''))
+  }
+  function getCurrentUserInfo () {
+    const token = ( uni ).getStorageSync('uni_id_token') || '';
+    const tokenArr = token.split('.');
+    if (!token || tokenArr.length !== 3) {
+      return {
+        uid: null,
+        role: [],
+        permission: [],
+        tokenExpired: 0
+      }
+    }
+    let userInfo;
+    try {
+      userInfo = JSON.parse(b64DecodeUnicode(tokenArr[1]));
+    } catch (error) {
+      throw new Error('获取当前用户信息出错，详细错误信息为：' + error.message)
+    }
+    userInfo.tokenExpired = userInfo.exp * 1000;
+    delete userInfo.exp;
+    delete userInfo.iat;
+    return userInfo
+  }
+  function uniIdMixin (Vue) {
+    Vue.prototype.uniIDHasRole = function (roleId) {
+      const {
+        role
+      } = getCurrentUserInfo();
+      return role.indexOf(roleId) > -1
+    };
+    Vue.prototype.uniIDHasPermission = function (permissionId) {
+      const {
+        permission
+      } = getCurrentUserInfo();
+      return this.uniIDHasRole('admin') || permission.indexOf(permissionId) > -1
+    };
+    Vue.prototype.uniIDTokenValid = function () {
+      const {
+        tokenExpired
+      } = getCurrentUserInfo();
+      return tokenExpired > Date.now()
+    };
+  }
   const _toString = Object.prototype.toString;
   const hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -292,6 +383,10 @@ var serviceContext = (function () {
     return typeof fn === 'function'
   }
+  function isStr (str) {
+    return typeof str === 'string'
+  }
   function isObject (obj) {
     return obj !== null && typeof obj === 'object'
   }
@@ -640,7 +735,7 @@ var serviceContext = (function () {
         }
         if (res === false) {
           return {
-            then () {}
+            then () { }
           }
         }
       }
@@ -688,15 +783,15 @@ var serviceContext = (function () {
       if (hook !== 'returnValue') {
         interceptor[hook] = globalInterceptors[hook].slice();
       }
-    });
-    const scopedInterceptor = scopedInterceptors[method];
-    if (scopedInterceptor) {
-      Object.keys(scopedInterceptor).forEach(hook => {
-        if (hook !== 'returnValue') {
-          interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook]);
-        }
-      });
-    }
+    });
+    const scopedInterceptor = scopedInterceptors[method];
+    if (scopedInterceptor) {
+      Object.keys(scopedInterceptor).forEach(hook => {
+        if (hook !== 'returnValue') {
+          interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook]);
+        }
+      });
+    }
     return interceptor
   }
@@ -720,16 +815,20 @@ var serviceContext = (function () {
       if (!isPromise(res)) {
         return res
       }
-      return res.then(res => {
-        return res[1]
-      }).catch(res => {
-        return res[0]
+      return new Promise((resolve, reject) => {
+        res.then(res => {
+          if (res[0]) {
+            reject(res[0]);
+          } else {
+            resolve(res[1]);
+          }
+        });
       })
     }
   };
   const SYNC_API_RE =
-    /^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64/;
+    /^\$|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
   const CONTEXT_API_RE = /^create|Manager$/;
@@ -1093,18 +1192,20 @@ var serviceContext = (function () {
     scanCode: scanCode
   });
+  const isArray = Array.isArray;
   const isObject$1 = (val) => val !== null && typeof val === 'object';
+  const defaultDelimiters = ['{', '}'];
   class BaseFormatter {
       constructor() {
           this._caches = Object.create(null);
       }
-      interpolate(message, values) {
+      interpolate(message, values, delimiters = defaultDelimiters) {
           if (!values) {
               return [message];
           }
           let tokens = this._caches[message];
           if (!tokens) {
-              tokens = parse(message);
+              tokens = parse(message, delimiters);
               this._caches[message] = tokens;
           }
           return compile(tokens, values);
@@ -1112,24 +1213,24 @@ var serviceContext = (function () {
   }
   const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
   const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
-  function parse(format) {
+  function parse(format, [startDelimiter, endDelimiter]) {
       const tokens = [];
       let position = 0;
       let text = '';
       while (position < format.length) {
           let char = format[position++];
-          if (char === '{') {
+          if (char === startDelimiter) {
               if (text) {
                   tokens.push({ type: 'text', value: text });
               }
               text = '';
               let sub = '';
               char = format[position++];
-              while (char !== undefined && char !== '}') {
+              while (char !== undefined && char !== endDelimiter) {
                   sub += char;
                   char = format[position++];
               }
-              const isClosed = char === '}';
+              const isClosed = char === endDelimiter;
               const type = RE_TOKEN_LIST_VALUE.test(sub)
                   ? 'list'
                   : isClosed && RE_TOKEN_NAMED_VALUE.test(sub)
@@ -1137,12 +1238,12 @@ var serviceContext = (function () {
                       : 'unknown';
               tokens.push({ value: sub, type });
           }
-          else if (char === '%') {
-              // when found rails i18n syntax, skip text capture
-              if (format[position] !== '{') {
-                  text += char;
-              }
-          }
+          //  else if (char === '%') {
+          //   // when found rails i18n syntax, skip text capture
+          //   if (format[position] !== '{') {
+          //     text += char
+          //   }
+          // }
           else {
               text += char;
           }
@@ -1153,7 +1254,7 @@ var serviceContext = (function () {
   function compile(tokens, values) {
       const compiled = [];
       let index = 0;
-      const mode = Array.isArray(values)
+      const mode = isArray(values)
           ? 'list'
           : isObject$1(values)
               ? 'named'
@@ -1191,6 +1292,11 @@ var serviceContext = (function () {
       return compiled;
   }
+  const LOCALE_ZH_HANS = 'zh-Hans';
+  const LOCALE_ZH_HANT = 'zh-Hant';
+  const LOCALE_EN = 'en';
+  const LOCALE_FR = 'fr';
+  const LOCALE_ES = 'es';
   const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
   const hasOwn$1 = (val, key) => hasOwnProperty$1.call(val, key);
   const defaultFormatter = new BaseFormatter();
@@ -1205,31 +1311,31 @@ var serviceContext = (function () {
           return;
       }
       locale = locale.trim().replace(/_/g, '-');
-      if (messages[locale]) {
+      if (messages && messages[locale]) {
           return locale;
       }
       locale = locale.toLowerCase();
       if (locale.indexOf('zh') === 0) {
-          if (locale.indexOf('-hans') !== -1) {
-              return 'zh-Hans';
+          if (locale.indexOf('-hans') > -1) {
+              return LOCALE_ZH_HANS;
           }
-          if (locale.indexOf('-hant') !== -1) {
-              return 'zh-Hant';
+          if (locale.indexOf('-hant') > -1) {
+              return LOCALE_ZH_HANT;
           }
           if (include(locale, ['-tw', '-hk', '-mo', '-cht'])) {
-              return 'zh-Hant';
+              return LOCALE_ZH_HANT;
           }
-          return 'zh-Hans';
+          return LOCALE_ZH_HANS;
       }
-      const lang = startsWith(locale, ['en', 'fr', 'es']);
+      const lang = startsWith(locale, [LOCALE_EN, LOCALE_FR, LOCALE_ES]);
       if (lang) {
           return lang;
       }
   }
   class I18n {
       constructor({ locale, fallbackLocale, messages, watcher, formater, }) {
-          this.locale = 'en';
-          this.fallbackLocale = 'en';
+          this.locale = LOCALE_EN;
+          this.fallbackLocale = LOCALE_EN;
           this.message = {};
           this.messages = {};
           this.watchers = [];
@@ -1237,8 +1343,8 @@ var serviceContext = (function () {
               this.fallbackLocale = fallbackLocale;
           }
           this.formater = formater || defaultFormatter;
-          this.messages = messages;
-          this.setLocale(locale);
+          this.messages = messages || {};
+          this.setLocale(locale || LOCALE_EN);
           if (watcher) {
               this.watchLocale(watcher);
           }
@@ -1246,10 +1352,17 @@ var serviceContext = (function () {
       setLocale(locale) {
           const oldLocale = this.locale;
           this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
+          if (!this.messages[this.locale]) {
+              // 可能初始化时不存在
+              this.messages[this.locale] = {};
+          }
           this.message = this.messages[this.locale];
-          this.watchers.forEach((watcher) => {
-              watcher(this.locale, oldLocale);
-          });
+          // 仅发生变化时，通知
+          if (oldLocale !== this.locale) {
+              this.watchers.forEach((watcher) => {
+                  watcher(this.locale, oldLocale);
+              });
+          }
       }
       getLocale() {
           return this.locale;
@@ -1260,14 +1373,27 @@ var serviceContext = (function () {
               this.watchers.splice(index, 1);
           };
       }
-      mergeLocaleMessage(locale, message) {
-          if (this.messages[locale]) {
-              Object.assign(this.messages[locale], message);
+      add(locale, message, override = true) {
+          const curMessages = this.messages[locale];
+          if (curMessages) {
+              if (override) {
+                  Object.assign(curMessages, message);
+              }
+              else {
+                  Object.keys(message).forEach((key) => {
+                      if (!hasOwn$1(curMessages, key)) {
+                          curMessages[key] = message[key];
+                      }
+                  });
+              }
           }
           else {
               this.messages[locale] = message;
           }
       }
+      f(message, values, delimiters) {
+          return this.formater.interpolate(message, values, delimiters).join('');
+      }
       t(key, locale, values) {
           let message = this.message;
           if (typeof locale === 'string') {
@@ -1285,94 +1411,118 @@ var serviceContext = (function () {
       }
   }
-  function initLocaleWatcher(appVm, i18n) {
-      appVm.$i18n &&
-          appVm.$i18n.vm.$watch('locale', (newLocale) => {
+  function watchAppLocale(appVm, i18n) {
+      // 需要保证 watch 的触发在组件渲染之前
+      if (appVm.$watchLocale) {
+          // vue2
+          appVm.$watchLocale((newLocale) => {
+              i18n.setLocale(newLocale);
+          });
+      }
+      else {
+          appVm.$watch(() => appVm.$locale, (newLocale) => {
               i18n.setLocale(newLocale);
-          }, {
-              immediate: true,
           });
+      }
   }
   function getDefaultLocale() {
-      if (typeof navigator !== 'undefined') {
-          return navigator.userLanguage || navigator.language;
+      if (typeof uni !== 'undefined' && uni.getLocale) {
+          return uni.getLocale();
       }
-      if (typeof plus !== 'undefined') {
-          // TODO 待调整为最新的获取语言代码
-          return plus.os.language;
+      // 小程序平台，uni 和 uni-i18n 互相引用，导致访问不到 uni，故在 global 上挂了 getLocale
+      if (typeof global !== 'undefined' && global.getLocale) {
+          return global.getLocale();
       }
-      return uni.getSystemInfoSync().language;
+      return LOCALE_EN;
   }
-  function initVueI18n(messages, fallbackLocale = 'en', locale) {
+  function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
+      // 兼容旧版本入参
+      if (typeof locale !== 'string') {
+          [locale, messages] = [
+              messages,
+              locale,
+          ];
+      }
+      if (typeof locale !== 'string') {
+          // 因为小程序平台，uni-i18n 和 uni 互相引用，导致此时访问 uni 时，为 undefined
+          locale = getDefaultLocale();
+      }
+      if (typeof fallbackLocale !== 'string') {
+          fallbackLocale =
+              (typeof __uniConfig !== 'undefined' && __uniConfig.fallbackLocale) ||
+                  LOCALE_EN;
+      }
       const i18n = new I18n({
-          locale: locale || fallbackLocale,
+          locale,
           fallbackLocale,
           messages,
+          watcher,
       });
       let t = (key, values) => {
           if (typeof getApp !== 'function') {
-              // app-plus view
+              // app view
               /* eslint-disable no-func-assign */
               t = function (key, values) {
                   return i18n.t(key, values);
               };
           }
           else {
-              const appVm = getApp().$vm;
-              if (!appVm.$t || !appVm.$i18n) {
-                  if (!locale) {
-                      i18n.setLocale(getDefaultLocale());
-                  }
-                  /* eslint-disable no-func-assign */
-                  t = function (key, values) {
-                      return i18n.t(key, values);
-                  };
-              }
-              else {
-                  initLocaleWatcher(appVm, i18n);
-                  /* eslint-disable no-func-assign */
-                  t = function (key, values) {
-                      const $i18n = appVm.$i18n;
-                      const silentTranslationWarn = $i18n.silentTranslationWarn;
-                      $i18n.silentTranslationWarn = true;
-                      const msg = appVm.$t(key, values);
-                      $i18n.silentTranslationWarn = silentTranslationWarn;
-                      if (msg !== key) {
-                          return msg;
+              let isWatchedAppLocale = false;
+              t = function (key, values) {
+                  const appVm = getApp().$vm;
+                  // 可能$vm还不存在，比如在支付宝小程序中，组件定义较早，在props的default里使用了t()函数（如uni-goods-nav），此时app还未初始化
+                  // options: {
+                  // 	type: Array,
+                  // 	default () {
+                  // 		return [{
+                  // 			icon: 'shop',
+                  // 			text: t("uni-goods-nav.options.shop"),
+                  // 		}, {
+                  // 			icon: 'cart',
+                  // 			text: t("uni-goods-nav.options.cart")
+                  // 		}]
+                  // 	}
+                  // },
+                  if (appVm) {
+                      // 触发响应式
+                      appVm.$locale;
+                      if (!isWatchedAppLocale) {
+                          isWatchedAppLocale = true;
+                          watchAppLocale(appVm, i18n);
                       }
-                      return i18n.t(key, $i18n.locale, values);
-                  };
-              }
+                  }
+                  return i18n.t(key, values);
+              };
           }
           return t(key, values);
       };
       return {
+          i18n,
+          f(message, values, delimiters) {
+              return i18n.f(message, values, delimiters);
+          },
           t(key, values) {
               return t(key, values);
           },
+          add(locale, message, override = true) {
+              return i18n.add(locale, message, override);
+          },
+          watch(fn) {
+              return i18n.watchLocale(fn);
+          },
           getLocale() {
               return i18n.getLocale();
           },
           setLocale(newLocale) {
               return i18n.setLocale(newLocale);
           },
-          mixin: {
-              beforeCreate() {
-                  const unwatch = i18n.watchLocale(() => {
-                      this.$forceUpdate();
-                  });
-                  this.$once('hook:beforeDestroy', function () {
-                      unwatch();
-                  });
-              },
-              methods: {
-                  $$t(key, values) {
-                      return t(key, values);
-                  },
-              },
-          },
       };
   }
+  function isI18nStr(value, delimiters) {
+      return value.indexOf(delimiters[0]) > -1;
+  }
+  const NAVBAR_HEIGHT = 44;
   var en = {
   	"uni.app.quit": "Press back button again to exit",
@@ -1388,6 +1538,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.cancel": "Cancel",
   	"uni.chooseVideo.sourceType.album": "Album",
   	"uni.chooseVideo.sourceType.camera": "Camera",
+  	"uni.chooseFile.notUserActivation": "File chooser dialog can only be shown with a user activation",
   	"uni.previewImage.cancel": "Cancel",
   	"uni.previewImage.button.save": "Save Image",
   	"uni.previewImage.save.success": "Saved successfully",
@@ -1404,7 +1555,9 @@ var serviceContext = (function () {
   	"uni.video.danmu": "Danmu",
   	"uni.video.volume": "Volume",
   	"uni.button.feedback.title": "feedback",
-  	"uni.button.feedback.send": "send"
+  	"uni.button.feedback.send": "send",
+  	"uni.chooseLocation.search": "Find Place",
+  	"uni.chooseLocation.cancel": "Cancel"
   };
   var es = {
@@ -1421,6 +1574,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.cancel": "Cancelar",
   	"uni.chooseVideo.sourceType.album": "Álbum",
   	"uni.chooseVideo.sourceType.camera": "Cámara",
+  	"uni.chooseFile.notUserActivation": "El cuadro de diálogo del selector de archivos solo se puede mostrar con la activación del usuario",
   	"uni.previewImage.cancel": "Cancelar",
   	"uni.previewImage.button.save": "Guardar imagen",
   	"uni.previewImage.save.success": "Guardado exitosamente",
@@ -1437,7 +1591,9 @@ var serviceContext = (function () {
   	"uni.video.danmu": "Danmu",
   	"uni.video.volume": "Volumen",
   	"uni.button.feedback.title": "realimentación",
-  	"uni.button.feedback.send": "enviar"
+  	"uni.button.feedback.send": "enviar",
+  	"uni.chooseLocation.search": "Encontrar",
+  	"uni.chooseLocation.cancel": "Cancelar"
   };
   var fr = {
@@ -1454,6 +1610,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.cancel": "Annuler",
   	"uni.chooseVideo.sourceType.album": "Album",
   	"uni.chooseVideo.sourceType.camera": "Caméra",
+  	"uni.chooseFile.notUserActivation": "La boîte de dialogue du sélecteur de fichier ne peut être affichée qu'avec une activation par l'utilisateur",
   	"uni.previewImage.cancel": "Annuler",
   	"uni.previewImage.button.save": "Guardar imagen",
   	"uni.previewImage.save.success": "Enregistré avec succès",
@@ -1470,7 +1627,9 @@ var serviceContext = (function () {
   	"uni.video.danmu": "Danmu",
   	"uni.video.volume": "Le Volume",
   	"uni.button.feedback.title": "retour d'information",
-  	"uni.button.feedback.send": "envoyer"
+  	"uni.button.feedback.send": "envoyer",
+  	"uni.chooseLocation.search": "Trouve",
+  	"uni.chooseLocation.cancel": "Annuler"
   };
   var zhHans = {
@@ -1487,6 +1646,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.cancel": "取消",
   	"uni.chooseVideo.sourceType.album": "从相册选择",
   	"uni.chooseVideo.sourceType.camera": "拍摄",
+  	"uni.chooseFile.notUserActivation": "文件选择器对话框只能在由用户激活时显示",
   	"uni.previewImage.cancel": "取消",
   	"uni.previewImage.button.save": "保存图像",
   	"uni.previewImage.save.success": "保存图像到相册成功",
@@ -1503,7 +1663,9 @@ var serviceContext = (function () {
   	"uni.video.danmu": "弹幕",
   	"uni.video.volume": "音量",
   	"uni.button.feedback.title": "问题反馈",
-  	"uni.button.feedback.send": "发送"
+  	"uni.button.feedback.send": "发送",
+  	"uni.chooseLocation.search": "搜索地点",
+  	"uni.chooseLocation.cancel": "取消"
   };
   var zhHant = {
@@ -1520,6 +1682,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.cancel": "取消",
   	"uni.chooseVideo.sourceType.album": "從相冊選擇",
   	"uni.chooseVideo.sourceType.camera": "拍攝",
+  	"uni.chooseFile.notUserActivation": "文件選擇器對話框只能在由用戶激活時顯示",
   	"uni.previewImage.cancel": "取消",
   	"uni.previewImage.button.save": "保存圖像",
   	"uni.previewImage.save.success": "保存圖像到相冊成功",
@@ -1536,29 +1699,184 @@ var serviceContext = (function () {
   	"uni.video.danmu": "彈幕",
   	"uni.video.volume": "音量",
   	"uni.button.feedback.title": "問題反饋",
-  	"uni.button.feedback.send": "發送"
+  	"uni.button.feedback.send": "發送",
+  	"uni.chooseLocation.search": "搜索地點",
+  	"uni.chooseLocation.cancel": "取消"
   };
-  const messages = {
-    en,
-    es,
-    fr,
-    'zh-Hans': zhHans,
-    'zh-Hant': zhHant
-  };
+  const messages = {};
+  {
+    Object.assign(messages, {
+      en,
+      es,
+      fr,
+      'zh-Hans': zhHans,
+      'zh-Hant': zhHant
+    });
+  }
-  const fallbackLocale = 'en';
+  let locale;
-  const i18n = initVueI18n( messages , fallbackLocale);
+  {
+    if (typeof weex === 'object') {
+      locale = weex.requireModule('plus').getLanguage();
+    } else {
+      locale = '';
+    }
+  }
+  function initI18nMessages () {
+    if (!isEnableLocale()) {
+      return
+    }
+    const localeKeys = Object.keys(__uniConfig.locales);
+    if (localeKeys.length) {
+      localeKeys.forEach((locale) => {
+        const curMessages = messages[locale];
+        const userMessages = __uniConfig.locales[locale];
+        if (curMessages) {
+          Object.assign(curMessages, userMessages);
+        } else {
+          messages[locale] = userMessages;
+        }
+      });
+    }
+  }
+  initI18nMessages();
+  const i18n = initVueI18n(
+    locale,
+     messages
+  );
   const t = i18n.t;
-  const getLocale = i18n.getLocale;
+  const i18nMixin = (i18n.mixin = {
+    beforeCreate () {
+      const unwatch = i18n.i18n.watchLocale(() => {
+        this.$forceUpdate();
+      });
+      this.$once('hook:beforeDestroy', function () {
+        unwatch();
+      });
+    },
+    methods: {
+      $$t (key, values) {
+        return t(key, values)
+      }
+    }
+  });
+  const getLocale = i18n.getLocale;
+  function initAppLocale (Vue, appVm, locale) {
+    const state = Vue.observable({
+      locale: locale || i18n.getLocale()
+    });
+    const localeWatchers = [];
+    appVm.$watchLocale = fn => {
+      localeWatchers.push(fn);
+    };
+    Object.defineProperty(appVm, '$locale', {
+      get () {
+        return state.locale
+      },
+      set (v) {
+        state.locale = v;
+        localeWatchers.forEach(watch => watch(v));
+      }
+    });
+  }
+  const I18N_JSON_DELIMITERS = ['%', '%'];
+  function getLocaleMessage () {
+    const locale = uni.getLocale();
+    const locales = __uniConfig.locales;
+    return (
+      locales[locale] || locales[__uniConfig.fallbackLocale] || locales.en || {}
+    )
+  }
+  function formatI18n (message) {
+    if (isI18nStr(message, I18N_JSON_DELIMITERS)) {
+      return i18n.f(message, getLocaleMessage(), I18N_JSON_DELIMITERS)
+    }
+    return message
+  }
+  function resolveJsonObj (jsonObj, names) {
+    if (names.length === 1) {
+      if (jsonObj) {
+        const value = jsonObj[names[0]];
+        if (isStr(value) && isI18nStr(value, I18N_JSON_DELIMITERS)) {
+          return jsonObj
+        }
+      }
+      return
+    }
+    const name = names.shift();
+    return resolveJsonObj(jsonObj && jsonObj[name], names)
+  }
+  function defineI18nProperties (obj, names) {
+    return names.map(name => defineI18nProperty(obj, name))
+  }
+  function defineI18nProperty (obj, names) {
+    const jsonObj = resolveJsonObj(obj, names);
+    if (!jsonObj) {
+      return false
+    }
+    const prop = names[names.length - 1];
+    let value = jsonObj[prop];
+    Object.defineProperty(jsonObj, prop, {
+      get () {
+        return formatI18n(value)
+      },
+      set (v) {
+        value = v;
+      }
+    });
+    return true
+  }
+  function isEnableLocale () {
+    return typeof __uniConfig !== 'undefined' && __uniConfig.locales && !!Object.keys(__uniConfig.locales).length
+  }
+  function initNavigationBarI18n (navigationBar) {
+    if (isEnableLocale()) {
+      return defineI18nProperties(navigationBar, [
+        ['titleText'],
+        ['searchInput', 'placeholder']
+      ])
+    }
+  }
+  // export function initI18n() {
+  //   const localeKeys = Object.keys(__uniConfig.locales || {})
+  //   if (localeKeys.length) {
+  //     localeKeys.forEach((locale) =>
+  //       i18n.add(locale, __uniConfig.locales[locale])
+  //     )
+  //   }
+  // }
   const setClipboardData = {
-    beforeSuccess () {
+    data: {
+      type: String,
+      required: true
+    },
+    showToast: {
+      type: Boolean,
+      default: true
+    },
+    beforeSuccess (res, params) {
+      if (!params.showToast) return
       const title = t('uni.setClipboardData.success');
       if (title) {
         uni.showToast({
-          title: t('uni.setClipboardData.success'),
+          title,
           icon: 'success',
           mask: false,
           style: {
@@ -1629,10 +1947,13 @@ var serviceContext = (function () {
   function getRealPath (filePath) {
     if (filePath.indexOf('/') === 0) {
       if (filePath.indexOf('//') === 0) {
-        filePath = 'https:' + filePath;
-      } else {
-        return addBase(filePath.substr(1))
+        return 'https:' + filePath
       }
+      // 平台绝对路径 安卓、iOS
+      if (filePath.startsWith('/storage/') || filePath.startsWith('/sdcard/') || filePath.includes('/Containers/Data/Application/')) {
+        return 'file://' + filePath
+      }
+      return addBase(filePath.substr(1))
     }
     // 网络资源或base64
     if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath) || filePath.indexOf('blob:') === 0) {
@@ -1735,18 +2056,15 @@ var serviceContext = (function () {
     chooseLocation: chooseLocation
   });
-  const type = {
-    WGS84: 'WGS84',
-    GCJ02: 'GCJ02'
-  };
+  const coordTypes = ['wgs84', 'gcj02'];
   const getLocation = {
     type: {
       type: String,
       validator (value, params) {
-        value = (value || '').toUpperCase();
-        params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value;
-      },
-      default: type.WGS84
+        value = (value || '').toLowerCase();
+        params.type = coordTypes.indexOf(value) < 0 ? coordTypes[0] : value;
+      }
     },
     altitude: {
       type: Boolean,
@@ -2069,7 +2387,8 @@ var serviceContext = (function () {
     PUT: 'PUT',
     DELETE: 'DELETE',
     TRACE: 'TRACE',
-    CONNECT: 'CONNECT'
+    CONNECT: 'CONNECT',
+    PATCH: 'PATCH'
   };
   const dataType = {
     JSON: 'json'
@@ -2165,11 +2484,24 @@ var serviceContext = (function () {
     timeout: {
       type: Number
     }
+  };
+  const configMTLS = {
+    certificates: {
+      type: Array,
+      required: true,
+      validator (value) {
+        if (value.some(item => toRawType(item.host) !== 'String')) {
+          return '参数配置错误，请确认后重试'
+        }
+      }
+    }
   };
   var require_context_module_0_25 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    request: request
+    request: request,
+    configMTLS: configMTLS
   });
   const method$1 = {
@@ -2246,7 +2578,7 @@ var serviceContext = (function () {
       type: String,
       validator (value, params) {
         if (value) {
-          params.type = getRealPath(value);
+          params.filePath = getRealPath(value);
         }
       }
     },
@@ -2734,7 +3066,7 @@ var serviceContext = (function () {
     icon: {
       default: 'success',
       validator (icon, params) {
-        if (['success', 'loading', 'none'].indexOf(icon) === -1) {
+        if (['success', 'loading', 'error', 'none'].indexOf(icon) === -1) {
           params.icon = 'success';
         }
       }
@@ -3312,7 +3644,7 @@ var serviceContext = (function () {
       const errMsg = res.errMsg;
       if (errMsg.indexOf(apiName + ':ok') === 0) {
-        isFn(beforeSuccess) && beforeSuccess(res);
+        isFn(beforeSuccess) && beforeSuccess(res, params);
         hasSuccess && success(res);
@@ -3850,7 +4182,7 @@ var serviceContext = (function () {
     // 无协议的情况补全 https
     if (filePath.indexOf('//') === 0) {
-      filePath = 'https:' + filePath;
+      return 'https:' + filePath
     }
     // 网络资源或base64
@@ -3865,6 +4197,10 @@ var serviceContext = (function () {
     const wwwPath = 'file://' + _handleLocalPath('_www');
     // 绝对路径转换为本地文件系统路径
     if (filePath.indexOf('/') === 0) {
+      // 平台绝对路径 安卓、iOS
+      if (filePath.startsWith('/storage/') || filePath.startsWith('/sdcard/') || filePath.includes('/Containers/Data/Application/')) {
+        return 'file://' + filePath
+      }
       return wwwPath + filePath
     }
     // 相对资源
@@ -4029,13 +4365,15 @@ var serviceContext = (function () {
     return array.length > 1 ? '.' + array[array.length - 1] : ''
   }
+  const AUDIO_DEFAULT_CATEGORY = 'ambient';
   const audios = {};
   const evts = ['play', 'canplay', 'ended', 'stop', 'waiting', 'seeking', 'seeked', 'pause'];
   const publishAudioStateChange = (state, res = {}) => publish('onAudioStateChange', Object.assign({
     state
-  }, res));
+  }, res));
   const initStateChage = audioId => {
     const audio = audios[audioId];
@@ -4074,7 +4412,8 @@ var serviceContext = (function () {
     const audio = audios[audioId] = plus.audio.createPlayer('');
     audio.src = '';
     audio.volume = 1;
-    audio.startTime = 0;
+    audio.startTime = 0;
+    audio.setSessionCategory(AUDIO_DEFAULT_CATEGORY);
     return {
       errMsg: 'createAudioInstance:ok',
       audioId
@@ -4101,7 +4440,8 @@ var serviceContext = (function () {
     autoplay = false,
     loop = false,
     obeyMuteSwitch,
-    volume
+    volume,
+    category = AUDIO_DEFAULT_CATEGORY
   }) {
     const audio = audios[audioId];
     if (audio) {
@@ -4118,7 +4458,10 @@ var serviceContext = (function () {
       if (typeof volume === 'number') {
         audio.volume = style.volume = volume;
       }
-      audio.setStyles(style);
+      audio.setStyles(style);
+      if (category) {
+        audio.setSessionCategory(category);
+      }
       initStateChage(audioId);
     }
     return {
@@ -4537,6 +4880,9 @@ var serviceContext = (function () {
     },
     openMapApp (ctx, args) {
       return invokeVmMethod(ctx, 'openMapApp', args)
+    },
+    on (ctx, args) {
+      return ctx.on(args.name, args.callback)
     }
   };
@@ -5459,7 +5805,7 @@ var serviceContext = (function () {
       animationDuration: 200,
       uniNView: {
         path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`,
-        defaultFontSize: plus_.screen.resolutionWidth / 20,
+        defaultFontSize: 16,
         viewport: plus_.screen.resolutionWidth
       }
     };
@@ -5800,8 +6146,6 @@ var serviceContext = (function () {
     }
   }
-  const NAVBAR_HEIGHT = 44;
   const TABBAR_HEIGHT = 50;
   const isIOS$1 = plus.os.name === 'iOS';
   let config;
@@ -5844,7 +6188,7 @@ var serviceContext = (function () {
   /**
    * 动态设置 tabBar 某一项的内容
    */
-  function setTabBarItem$1 (index, text, iconPath, selectedIconPath) {
+  function setTabBarItem$1 (index, text, iconPath, selectedIconPath, visible) {
     const item = {
       index
     };
@@ -5857,7 +6201,17 @@ var serviceContext = (function () {
     if (selectedIconPath) {
       item.selectedIconPath = getRealPath$1(selectedIconPath);
     }
-    tabBar && tabBar.setTabBarItem(item);
+    if (visible !== undefined) {
+      item.visible = config.list[index].visible = visible;
+      delete item.index;
+      const tabbarItems = config.list.map(item => ({ visible: item.visible }));
+      tabbarItems[index] = item;
+      tabBar && tabBar.setTabBarItems({ list: tabbarItems });
+    } else {
+      tabBar && tabBar.setTabBarItem(item);
+    }
   }
   /**
    * 动态设置 tabBar 的整体样式
@@ -5986,7 +6340,7 @@ var serviceContext = (function () {
   let deviceId;
   function deviceId$1 () {
-    deviceId = deviceId || plus.runtime.getDCloudId();
+    deviceId = deviceId || plus.device.uuid;
     return deviceId
   }
@@ -5997,6 +6351,7 @@ var serviceContext = (function () {
   function getSystemInfo () {
     const platform = plus.os.name.toLowerCase();
     const ios = platform === 'ios';
+    const isAndroid = platform === 'android';
     const {
       screenWidth,
       screenHeight
@@ -6063,7 +6418,7 @@ var serviceContext = (function () {
       windowHeight,
       statusBarHeight,
       language: plus.os.language,
-      system: plus.os.version,
+      system: `${ios ? 'iOS' : isAndroid ? 'Android' : ''} ${plus.os.version}`,
       version: plus.runtime.innerVersion,
       fontSizeSetting: '',
       platform,
@@ -6196,16 +6551,10 @@ var serviceContext = (function () {
     filePath,
     fileType
   } = {}, callbackId) {
-    plus.io.resolveLocalFileSystemURL(getRealPath$1(filePath), entry => {
-      plus.runtime.openFile(getRealPath$1(filePath));
-      invoke$1(callbackId, {
-        errMsg: 'openDocument:ok'
-      });
-    }, err => {
-      invoke$1(callbackId, {
-        errMsg: 'openDocument:fail ' + err.message
-      });
-    });
+    const successCallback = warpPlusSuccessCallback(callbackId, 'saveFile');
+    const errorCallback = warpPlusErrorCallback(callbackId, 'saveFile');
+    plus.runtime.openDocument(getRealPath$1(filePath), undefined, successCallback, errorCallback);
   }
   const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html';
@@ -6408,8 +6757,10 @@ var serviceContext = (function () {
   function getLocation$1 ({
     type = 'wgs84',
     geocode = false,
-    altitude = false
+    altitude = false,
+    highAccuracyExpireTime
   } = {}, callbackId) {
+    const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation');
     plus.geolocation.getCurrentPosition(
       position => {
         getLocationSuccess(type, position, callbackId);
@@ -6420,13 +6771,12 @@ var serviceContext = (function () {
           getLocationSuccess(type, e, callbackId);
           return
         }
-        invoke$1(callbackId, {
-          errMsg: 'getLocation:fail ' + e.message
-        });
+        errorCallback(e);
       }, {
         geocode: geocode,
-        enableHighAccuracy: altitude
+        enableHighAccuracy: altitude,
+        timeout: highAccuracyExpireTime,
+        coordsType: type
       }
     );
   }
@@ -6625,64 +6975,32 @@ var serviceContext = (function () {
     })
   }
-  function compressImage$1 (tempFilePath) {
-    const dstPath = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(tempFilePath)}`;
-    return new Promise((resolve, reject) => {
-      plus.nativeUI.showWaiting();
-      plus.zip.compressImage({
-        src: tempFilePath,
-        dst: dstPath,
-        overwrite: true
-      }, () => {
-        plus.nativeUI.closeWaiting();
-        resolve(dstPath);
-      }, (error) => {
-        plus.nativeUI.closeWaiting();
-        reject(error);
-      });
-    })
-  }
   function chooseImage$1 ({
     count,
     sizeType,
-    sourceType
+    sourceType,
+    crop
   } = {}, callbackId) {
     const errorCallback = warpPlusErrorCallback(callbackId, 'chooseImage', 'cancel');
     function successCallback (paths) {
       const tempFiles = [];
       const tempFilePaths = [];
-      // plus.zip.compressImage 压缩文件并发调用在iOS端容易出现问题（图像错误、闪退），改为队列执行
-      paths.reduce((promise, path) => {
-        return promise.then(() => {
-          return getFileInfo$2(path)
-        }).then(fileInfo => {
-          const size = fileInfo.size;
-          // 压缩阈值 0.5 兆
-          const THRESHOLD = 1024 * 1024 * 0.5;
-          // 判断是否需要压缩
-          if (sizeType.includes('compressed') && size > THRESHOLD) {
-            return compressImage$1(path).then(dstPath => {
-              path = dstPath;
-              return getFileInfo$2(path)
-            })
-          }
-          return fileInfo
-        }).then(({ size }) => {
-          tempFilePaths.push(path);
-          tempFiles.push({
-            path,
-            size
+      Promise.all(paths.map((path) => getFileInfo$2(path)))
+        .then((filesInfo) => {
+          filesInfo.forEach((file, index) => {
+            const path = paths[index];
+            tempFilePaths.push(path);
+            tempFiles.push({ path, size: file.size });
+          });
+          invoke$1(callbackId, {
+            errMsg: 'chooseImage:ok',
+            tempFilePaths,
+            tempFiles
           });
         })
-      }, Promise.resolve()).then(() => {
-        invoke$1(callbackId, {
-          errMsg: 'chooseImage:ok',
-          tempFilePaths,
-          tempFiles
-        });
-      }).catch(errorCallback);
+        .catch(errorCallback);
     }
     function openCamera () {
@@ -6690,7 +7008,9 @@ var serviceContext = (function () {
       camera.captureImage(path => successCallback([path]),
         errorCallback, {
           filename: TEMP_PATH + '/camera/',
-          resolution: 'high'
+          resolution: 'high',
+          crop,
+          sizeType
         });
     }
@@ -6700,7 +7020,9 @@ var serviceContext = (function () {
         multiple: true,
         system: false,
         filename: TEMP_PATH + '/gallery/',
-        permissionAlert: true
+        permissionAlert: true,
+        crop,
+        sizeType
       });
     }
@@ -6744,38 +7066,20 @@ var serviceContext = (function () {
     const errorCallback = warpPlusErrorCallback(callbackId, 'chooseVideo', 'cancel');
     function successCallback (tempFilePath = '') {
-      const dst = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(tempFilePath)}`;
-      const compressVideo = compressed ? plus.zip.compressVideo : function (_, callback) {
-        callback({ tempFilePath });
-      };
-      if (compressed) {
-        plus.nativeUI.showWaiting();
-      }
-      compressVideo({
-        src: tempFilePath,
-        dst
-      }, ({ tempFilePath }) => {
-        if (compressed) {
-          plus.nativeUI.closeWaiting();
-        }
-        plus.io.getVideoInfo({
-          filePath: tempFilePath,
-          success (videoInfo) {
-            const result = {
-              errMsg: 'chooseVideo:ok',
-              tempFilePath: tempFilePath
-            };
-            result.size = videoInfo.size;
-            result.duration = videoInfo.duration;
-            result.width = videoInfo.width;
-            result.height = videoInfo.height;
-            invoke$1(callbackId, result);
-          },
-          errorCallback
-        });
-      }, error => {
-        plus.nativeUI.closeWaiting();
-        errorCallback(error);
+      plus.io.getVideoInfo({
+        filePath: tempFilePath,
+        success (videoInfo) {
+          const result = {
+            errMsg: 'chooseVideo:ok',
+            tempFilePath: tempFilePath
+          };
+          result.size = videoInfo.size;
+          result.duration = videoInfo.duration;
+          result.width = videoInfo.width;
+          result.height = videoInfo.height;
+          invoke$1(callbackId, result);
+        },
+        fail: errorCallback
       });
     }
@@ -6787,7 +7091,8 @@ var serviceContext = (function () {
         multiple: true,
         maximum: 1,
         filename: TEMP_PATH + '/gallery/',
-        permissionAlert: true
+        permissionAlert: true,
+        videoCompress: compressed
       });
     }
@@ -6796,7 +7101,8 @@ var serviceContext = (function () {
       plusCamera.startVideoCapture(successCallback, errorCallback, {
         index: camera === 'front' ? 2 : 1,
         videoMaximumDuration: maxDuration,
-        filename: TEMP_PATH + '/camera/'
+        filename: TEMP_PATH + '/camera/',
+        videoCompress: compressed
       });
     }
@@ -6831,7 +7137,7 @@ var serviceContext = (function () {
     });
   }
-  function compressImage$2 (options, callbackId) {
+  function compressImage$1 (options, callbackId) {
     const dst = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(options.src)}`;
     const errorCallback = warpPlusErrorCallback(callbackId, 'compressImage');
     plus.zip.compressImage(Object.assign({}, options, {
@@ -6845,11 +7151,11 @@ var serviceContext = (function () {
   }
   function compressVideo$1 (options, callbackId) {
-    const dst = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(options.src)}`;
+    const filename = `${TEMP_PATH}/compressed/${Date.now()}_${getFileName(options.src)}`;
     const successCallback = warpPlusSuccessCallback(callbackId, 'compressVideo');
     const errorCallback = warpPlusErrorCallback(callbackId, 'compressVideo');
     plus.zip.compressVideo(Object.assign({}, options, {
-      dst
+      filename
     }), successCallback, errorCallback);
   }
@@ -6863,11 +7169,14 @@ var serviceContext = (function () {
     return options
   }, data => {
     return {
+      orientation: data.orientation,
+      type: data.type,
       duration: data.duration,
-      fps: data.fps || 30,
+      size: data.size / 1024,
       height: data.height,
       width: data.width,
-      size: data.size
+      fps: data.fps || 30,
+      bitrate: data.bitrate
     }
   });
@@ -6945,6 +7254,19 @@ var serviceContext = (function () {
     return {
       errMsg: 'previewImage:ok'
     }
+  }
+  function closePreviewImagePlus () {
+    try {
+      plus.nativeUI.closePreviewImage();
+      return {
+        errMsg: 'closePreviewImagePlus:ok'
+      }
+    } catch (error) {
+      return {
+        errMsg: 'closePreviewImagePlus:fail'
+      }
+    }
   }
   let recorder$1;
@@ -7162,6 +7484,7 @@ var serviceContext = (function () {
     responseType,
     sslVerify = true,
     firstIpv4 = false,
+    tls,
     timeout = (__uniConfig.networkTimeout && __uniConfig.networkTimeout.request) || 60 * 1000
   } = {}) {
     const stream = requireNativePlugin('stream');
@@ -7215,7 +7538,8 @@ var serviceContext = (function () {
       timeout: timeout || 6e5,
       // 配置和weex模块内相反
       sslVerify: !sslVerify,
-      firstIpv4: firstIpv4
+      firstIpv4: firstIpv4,
+      tls
     };
     if (method !== 'GET') {
       options.body = typeof data === 'string' ? data : JSON.stringify(data);
@@ -7301,6 +7625,26 @@ var serviceContext = (function () {
     return {
       errMsg: 'operateRequestTask:fail'
     }
+  }
+  function configMTLS$1 ({ certificates }, callbackId) {
+    const stream = requireNativePlugin('stream');
+    stream.configMTLS(certificates, ({ type, code, message }) => {
+      switch (type) {
+        case 'success':
+          invoke$1(callbackId, {
+            errMsg: 'configMTLS:ok',
+            code
+          });
+          break
+        case 'fail':
+          invoke$1(callbackId, {
+            errMsg: 'configMTLS:fail ' + message,
+            code
+          });
+          break
+      }
+    });
   }
   const socketTasks = {};
@@ -7468,7 +7812,7 @@ var serviceContext = (function () {
     }
     if (files && files.length) {
       files.forEach(file => {
-        uploader.addFile(getRealPath$1(file.uri), {
+        uploader.addFile(getRealPath$1(file.uri || file.filePath), {
           key: file.name || 'file'
         });
       });
@@ -7595,6 +7939,8 @@ var serviceContext = (function () {
     }
   }
+  let univerifyManager;
   function getService (provider) {
     return new Promise((resolve, reject) => {
       plus.oauth.getServices(services => {
@@ -7607,20 +7953,36 @@ var serviceContext = (function () {
   /**
    * 微信登录
    */
-  function login (params, callbackId) {
+  function login (params, callbackId, plus = true) {
     const provider = params.provider || 'weixin';
-    const errorCallback = warpPlusErrorCallback(callbackId, 'login');
+    const errorCallback = warpErrorCallback(callbackId, 'login', plus);
+    const authOptions = provider === 'apple'
+      ? { scope: 'email' }
+      : params.univerifyStyle
+        ? { univerifyStyle: univerifyButtonsClickHandling(params.univerifyStyle, errorCallback) }
+        : {};
+    const _invoke = plus ? invoke$1 : callback.invoke;
     getService(provider).then(service => {
       function login () {
+        if (params.onlyAuthorize && provider === 'weixin') {
+          service.authorize(({ code }) => {
+            _invoke(callbackId, {
+              code,
+              authResult: '',
+              errMsg: 'login:ok'
+            });
+          }, errorCallback);
+          return
+        }
         service.login(res => {
           const authResult = res.target.authResult;
-          invoke$1(callbackId, {
+          _invoke(callbackId, {
             code: authResult.code,
             authResult: authResult,
             errMsg: 'login:ok'
           });
-        }, errorCallback, provider === 'apple' ? { scope: 'email' } : { univerifyStyle: params.univerifyStyle } || {});
+        }, errorCallback, authOptions);
       }
       // 先注销再登录
       // apple登录logout之后无法重新触发获取email,fullname；一键登录无logout
@@ -7688,6 +8050,12 @@ var serviceContext = (function () {
       });
     });
   }
+  /**
+   * 获取用户信息-兼容
+   */
+  function getUserProfile (params, callbackId) {
+    return getUserInfo(params, callbackId)
+  }
   /**
    * 获取用户信息
@@ -7704,14 +8072,121 @@ var serviceContext = (function () {
     }
   }
-  function preLogin$1 (params, callbackId) {
-    const successCallback = warpPlusSuccessCallback(callbackId, 'preLogin');
-    const errorCallback = warpPlusErrorCallback(callbackId, 'preLogin');
+  function preLogin$1 (params, callbackId, plus) {
+    const successCallback = warpSuccessCallback(callbackId, 'preLogin', plus);
+    const errorCallback = warpErrorCallback(callbackId, 'preLogin', plus);
     getService(params.provider).then(service => service.preLogin(successCallback, errorCallback)).catch(errorCallback);
   }
   function closeAuthView () {
-    getService('univerify').then(service => service.closeAuthView());
+    return getService('univerify').then(service => service.closeAuthView())
+  }
+  function getCheckBoxState (params, callbackId, plus) {
+    const successCallback = warpSuccessCallback(callbackId, 'getCheckBoxState', plus);
+    const errorCallback = warpErrorCallback(callbackId, 'getCheckBoxState', plus);
+    try {
+      getService('univerify').then(service => {
+        const state = service.getCheckBoxState();
+        successCallback({ state });
+      });
+    } catch (error) {
+      errorCallback(error);
+    }
+  }
+  /**
+   * 一键登录自定义登陆按钮点击处理
+   */
+  function univerifyButtonsClickHandling (univerifyStyle, errorCallback) {
+    if (isPlainObject(univerifyStyle) && isPlainObject(univerifyStyle.buttons) && toRawType(univerifyStyle.buttons.list) === 'Array') {
+      univerifyStyle.buttons.list.forEach((button, index) => {
+        univerifyStyle.buttons.list[index].onclick = function () {
+          const res = {
+            code: '30008',
+            message: '用户点击了自定义按钮',
+            index,
+            provider: button.provider
+          };
+          isPlainObject(univerifyManager)
+            ? univerifyManager._triggerUniverifyButtonsClick(res)
+            : closeAuthView().then(() => {
+              errorCallback(res);
+            });
+        };
+      });
+    }
+    return univerifyStyle
+  }
+  class UniverifyManager {
+    constructor () {
+      this.provider = 'univerify';
+      this.eventName = 'api.univerifyButtonsClick';
+    }
+    close () {
+      closeAuthView();
+    }
+    login (options) {
+      this._warp((data, callbackId) => login(data, callbackId, false), this._getOptions(options));
+    }
+    getCheckBoxState (options) {
+      this._warp((_, callbackId) => getCheckBoxState(_, callbackId, false), options);
+    }
+    preLogin (options) {
+      this._warp((data, callbackId) => preLogin$1(data, callbackId, false), this._getOptions(options));
+    }
+    onButtonsClick (callback) {
+      UniServiceJSBridge.on(this.eventName, callback);
+    }
+    offButtonsClick (callback) {
+      UniServiceJSBridge.off(this.eventName, callback);
+    }
+    _triggerUniverifyButtonsClick (res) {
+      UniServiceJSBridge.emit(this.eventName, res);
+    }
+    _warp (fn, options) {
+      return callback.warp(fn)(this._getOptions(options))
+    }
+    _getOptions (options = {}) {
+      return Object.assign({}, options, { provider: this.provider })
+    }
+  }
+  function getUniverifyManager () {
+    return univerifyManager || (univerifyManager = new UniverifyManager())
+  }
+  function warpSuccessCallback (callbackId, name, plus = true) {
+    return plus
+      ? warpPlusSuccessCallback(callbackId, name)
+      : (options) => {
+        callback.invoke(callbackId, Object.assign({}, options, {
+          errMsg: `${name}:ok`
+        }));
+      }
+  }
+  function warpErrorCallback (callbackId, name, plus = true) {
+    return plus
+      ? warpPlusErrorCallback(callbackId, name)
+      : (error) => {
+        const { code = 0, message: errorMessage } = error;
+        callback.invoke(callbackId, {
+          errMsg: `${name}:fail ${errorMessage || ''}`,
+          errCode: code,
+          code
+        });
+      }
   }
   function requestPayment (params, callbackId) {
@@ -8240,6 +8715,25 @@ var serviceContext = (function () {
     });
   }
+  const sendHostEvent = sendNativeEvent;
+  function navigateToMiniProgram (data, callbackId) {
+    sendHostEvent(
+      'navigateToUniMP',
+      data,
+      (res) => {
+        if (res.errMsg && res.errMsg.indexOf(':ok') === -1) {
+          return invoke$1(callbackId, {
+            errMsg: res.errMsg
+          })
+        }
+        invoke$1(callbackId, {
+          errMsg: 'navigateToMiniProgram:ok'
+        });
+      }
+    );
+  }
   const VD_SYNC_VERSION = 2;
   const PAGE_CREATE = 2;
@@ -8284,20 +8778,18 @@ var serviceContext = (function () {
     return titleNView
   }
-  function parseTitleNView (routeOptions) {
+  function parseTitleNView (id, routeOptions) {
     const windowOptions = routeOptions.window;
     const titleNView = windowOptions.titleNView;
-    routeOptions.meta.statusBarStyle = windowOptions.navigationBarTextStyle === 'black' ? 'dark' : 'light';
-    if ( // 无头
+    routeOptions.meta.statusBarStyle =
+      windowOptions.navigationBarTextStyle === 'black' ? 'dark' : 'light';
+    if (
+      // 无头
       titleNView === false ||
       titleNView === 'false' ||
-      (
-        windowOptions.navigationStyle === 'custom' &&
-        !isPlainObject(titleNView)
-      ) || (
-        windowOptions.transparentTitle === 'always' &&
-        !isPlainObject(titleNView)
-      )
+      (windowOptions.navigationStyle === 'custom' &&
+        !isPlainObject(titleNView)) ||
+      (windowOptions.transparentTitle === 'always' && !isPlainObject(titleNView))
     ) {
       return false
     }
@@ -8310,30 +8802,76 @@ var serviceContext = (function () {
       always: 'float'
     };
-    const navigationBarBackgroundColor = windowOptions.navigationBarBackgroundColor;
+    const navigationBarBackgroundColor =
+      windowOptions.navigationBarBackgroundColor;
     const ret = {
       autoBackButton: !routeOptions.meta.isQuit,
-      titleText: titleImage === '' ? windowOptions.navigationBarTitleText || '' : '',
-      titleColor: windowOptions.navigationBarTextStyle === 'black' ? '#000000' : '#ffffff',
+      titleText:
+        titleImage === '' ? windowOptions.navigationBarTitleText || '' : '',
+      titleColor:
+        windowOptions.navigationBarTextStyle === 'black' ? '#000000' : '#ffffff',
       type: titleNViewTypeList[transparentTitle],
-      backgroundColor: (/^#[a-z0-9]{6}$/i.test(navigationBarBackgroundColor) || navigationBarBackgroundColor === 'transparent') ? navigationBarBackgroundColor : '#f7f7f7',
-      tags: titleImage === '' ? [] : [{
-        tag: 'img',
-        src: titleImage,
-        position: {
-          left: 'auto',
-          top: 'auto',
-          width: 'auto',
-          height: '26px'
-        }
-      }]
+      backgroundColor:
+        /^#[a-z0-9]{6}$/i.test(navigationBarBackgroundColor) ||
+        navigationBarBackgroundColor === 'transparent'
+          ? navigationBarBackgroundColor
+          : '#f7f7f7',
+      tags:
+        titleImage === ''
+          ? []
+          : [
+            {
+              tag: 'img',
+              src: titleImage,
+              position: {
+                left: 'auto',
+                top: 'auto',
+                width: 'auto',
+                height: '26px'
+              }
+            }
+          ]
     };
     if (isPlainObject(titleNView)) {
-      return Object.assign(ret, parseTitleNViewButtons(titleNView))
+      return initTitleNViewI18n(
+        id,
+        Object.assign(ret, parseTitleNViewButtons(titleNView))
+      )
     }
+    return initTitleNViewI18n(id, ret)
+  }
-    return ret
+  function initTitleNViewI18n (id, titleNView) {
+    const i18nResult = initNavigationBarI18n(titleNView);
+    if (!i18nResult) {
+      return titleNView
+    }
+    const [titleTextI18n, searchInputPlaceholderI18n] = i18nResult;
+    if (titleTextI18n || searchInputPlaceholderI18n) {
+      uni.onLocaleChange(() => {
+        const webview = plus.webview.getWebviewById(id + '');
+        if (!webview) {
+          return
+        }
+        const newTitleNView = {};
+        if (titleTextI18n) {
+          newTitleNView.titleText = titleNView.titleText;
+        }
+        if (searchInputPlaceholderI18n) {
+          newTitleNView.searchInput = {
+            placeholder: titleNView.searchInput.placeholder
+          };
+        }
+        if (process.env.NODE_ENV !== 'production') {
+          console.log('[uni-app] updateWebview', webview.id, newTitleNView);
+        }
+        webview.setStyle({
+          titleNView: newTitleNView
+        });
+      });
+    }
+    return titleNView
   }
   function parsePullToRefresh (routeOptions) {
@@ -8424,10 +8962,12 @@ var serviceContext = (function () {
     };
     // 合并
-    routeOptions.window = parseStyleUnit(Object.assign(
-      JSON.parse(JSON.stringify(__uniConfig.window || {})),
-      routeOptions.window || {}
-    ));
+    routeOptions.window = parseStyleUnit(
+      Object.assign(
+        JSON.parse(JSON.stringify(__uniConfig.window || {})),
+        routeOptions.window || {}
+      )
+    );
     Object.keys(routeOptions.window).forEach(name => {
       if (WEBVIEW_STYLE_BLACKLIST.indexOf(name) === -1) {
@@ -8436,7 +8976,10 @@ var serviceContext = (function () {
     });
     const backgroundColor = routeOptions.window.backgroundColor;
-    if (/^#[a-z0-9]{6}$/i.test(backgroundColor) || backgroundColor === 'transparent') {
+    if (
+      /^#[a-z0-9]{6}$/i.test(backgroundColor) ||
+      backgroundColor === 'transparent'
+    ) {
       if (!webviewStyle.background) {
         webviewStyle.background = backgroundColor;
       }
@@ -8445,7 +8988,7 @@ var serviceContext = (function () {
       }
     }
-    const titleNView = parseTitleNView(routeOptions);
+    const titleNView = parseTitleNView(id, routeOptions);
     if (titleNView) {
       if (
         id === 1 &&
@@ -8470,7 +9013,8 @@ var serviceContext = (function () {
       delete webviewStyle.popGesture;
     }
-    if (routeOptions.meta.isQuit) { // 退出
+    if (routeOptions.meta.isQuit) {
+      // 退出
       webviewStyle.popGesture = plus.os.name === 'iOS' ? 'appback' : 'none';
     }
@@ -8685,31 +9229,63 @@ var serviceContext = (function () {
     });
   }
-  function onWebviewPopGesture (webview) {
+  function onWebviewPopGesture (webview) {
     let popStartStatusBarStyle;
     webview.addEventListener('popGesture', e => {
       if (e.type === 'start') {
         // 设置下一个页面的 statusBarStyle
         const pages = getCurrentPages();
-        const page = pages[pages.length - 2];
+        const page = pages[pages.length - 2];
         popStartStatusBarStyle = lastStatusBarStyle;
         const statusBarStyle = page && page.$page.meta.statusBarStyle;
         statusBarStyle && setStatusBarStyle(statusBarStyle);
       } else if (e.type === 'end' && !e.result) {
         // 拖拽未完成,设置为当前状态栏前景色
         setStatusBarStyle(popStartStatusBarStyle);
-      } else if (e.type === 'end' && e.result) {
+      } else if (e.type === 'end' && e.result) {
         const pages = getCurrentPages();
         const page = pages[pages.length - 1];
         page && page.$remove();
         setStatusBarStyle();
-        UniServiceJSBridge.emit('onAppRoute', {
-          type: 'navigateBack'
-        });
+        if (page && isDirectPage(page)) {
+          reLaunchEntryPage();
+        } else {
+          UniServiceJSBridge.emit('onAppRoute', {
+            type: 'navigateBack'
+          });
+        }
       }
     });
+  }
+  /**
+   * 是否处于直达页面
+   * @param page
+   * @returns
+   */
+  function isDirectPage (page) {
+    return (
+      __uniConfig.realEntryPagePath &&
+      page.$page.route === __uniConfig.entryPagePath
+    )
+  }
+  /**
+   * 重新启动到首页
+   */
+  function reLaunchEntryPage () {
+    __uniConfig.entryPagePath = __uniConfig.realEntryPagePath;
+    delete __uniConfig.realEntryPagePath;
+    uni.reLaunch({
+      url: addLeadingSlash(__uniConfig.entryPagePath)
+    });
+  }
+  function hasLeadingSlash (str) {
+    return str.indexOf('/') === 0
+  }
+  function addLeadingSlash (str) {
+    return hasLeadingSlash(str) ? str : '/' + str
   }
   let preloadWebview;
@@ -8834,7 +9410,7 @@ var serviceContext = (function () {
   function createPreloadWebview () {
     if (!preloadWebview || preloadWebview.__uniapp_route) { // 不存在，或已被使用
-      preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id$1++));
+      preloadWebview = plus.webview.create(VIEW_WEBVIEW_PATH, String(id$1++), { contentAdjust: false });
       if (process.env.NODE_ENV !== 'production') {
         console.log(`[uni-app] preloadWebview[${preloadWebview.id}]`);
       }
@@ -9213,6 +9789,80 @@ var serviceContext = (function () {
     return pageVm
   }
+  const extend = Object.assign;
+  function createLaunchOptions () {
+    return {
+      path: '',
+      query: {},
+      scene: 1001,
+      referrerInfo: {
+        appId: '',
+        extraData: {}
+      }
+    }
+  }
+  const enterOptions = createLaunchOptions();
+  const launchOptions = createLaunchOptions();
+  function getEnterOptions () {
+    return enterOptions
+  }
+  function initEnterOptions ({
+    path,
+    query,
+    referrerInfo
+  }) {
+    extend(enterOptions, {
+      path,
+      query: query ? parseQuery(query) : {},
+      referrerInfo: referrerInfo || {}
+    });
+  }
+  function initLaunchOptions ({
+    path,
+    query,
+    referrerInfo
+  }) {
+    extend(launchOptions, {
+      path,
+      query: query ? parseQuery(query) : {},
+      referrerInfo: referrerInfo || {}
+    });
+    extend(enterOptions, launchOptions);
+    return launchOptions
+  }
+  function parseRedirectInfo () {
+    const weexPlus = weex.requireModule('plus');
+    if (weexPlus.getRedirectInfo) {
+      const {
+        path,
+        query,
+        extraData,
+        userAction,
+        fromAppid
+      } =
+      weexPlus.getRedirectInfo() || {};
+      const referrerInfo = {
+        appId: fromAppid,
+        extraData: {}
+      };
+      if (extraData) {
+        referrerInfo.extraData = extraData;
+      }
+      return {
+        path: path || '',
+        query: query ? '?' + query : '',
+        referrerInfo,
+        userAction
+      }
+    }
+  }
   let isInitEntryPage = false;
   function initEntryPage () {
@@ -9227,9 +9877,16 @@ var serviceContext = (function () {
     const weexPlus = weex.requireModule('plus');
     if (weexPlus.getRedirectInfo) {
-      const info = weexPlus.getRedirectInfo() || {};
-      entryPagePath = info.path;
-      entryPageQuery = info.query ? ('?' + info.query) : '';
+      const {
+        path,
+        query,
+        referrerInfo
+      } = parseRedirectInfo();
+      if (path) {
+        entryPagePath = path;
+        entryPageQuery = query;
+      }
+      __uniConfig.referrerInfo = referrerInfo;
     } else {
       const argsJsonStr = plus.runtime.arguments;
       if (!argsJsonStr) {
@@ -9252,6 +9909,7 @@ var serviceContext = (function () {
     const entryRoute = '/' + entryPagePath;
     const routeOptions = __uniRoutes.find(route => route.path === entryRoute);
     if (!routeOptions) {
+      console.error(`[uni-app] ${entryPagePath} not found...`);
       return
     }
@@ -10004,7 +10662,7 @@ var serviceContext = (function () {
     let currentSize = 0;
     for (let index = 0; index < length; index++) {
       const key = plus.storage.key(index);
-      if (key !== STORAGE_KEYS && key.indexOf(STORAGE_DATA_TYPE) + STORAGE_DATA_TYPE.length !== key.length) {
+      if (key !== STORAGE_KEYS && (key.indexOf(STORAGE_DATA_TYPE) < 0 || key.indexOf(STORAGE_DATA_TYPE) + STORAGE_DATA_TYPE.length !== key.length)) {
         const value = plus.storage.getItem(key);
         currentSize += key.length + value.length;
         keys.push(key);
@@ -10158,7 +10816,7 @@ var serviceContext = (function () {
       });
       toast = true;
     } else {
-      if (icon && !~['success', 'loading', 'none'].indexOf(icon)) {
+      if (icon && !~['success', 'loading', 'error', 'none'].indexOf(icon)) {
         icon = 'success';
       }
       const waitingOptions = {
@@ -10185,11 +10843,11 @@ var serviceContext = (function () {
           interval: duration
         };
       } else {
-        if (icon === 'success') {
+        if (['success', 'error'].indexOf(icon) !== -1) {
           waitingOptions.loading = {
             display: 'block',
             height: '55px',
-            icon: '__uniappsuccess.png',
+            icon: icon === 'success' ? '__uniappsuccess.png' : '__uniapperror.png',
             interval: duration
           };
         }
@@ -10236,24 +10894,34 @@ var serviceContext = (function () {
     cancelText,
     cancelColor,
     confirmText,
-    confirmColor
+    confirmColor,
+    editable = false,
+    placeholderText	= ''
   } = {}, callbackId) {
+    const buttons = showCancel ? [cancelText, confirmText] : [confirmText];
+    const tip = editable ? placeholderText : buttons;
     content = content || ' ';
-    plus.nativeUI.confirm(content, (e) => {
+    plus.nativeUI[editable ? 'prompt' : 'confirm'](content, (e) => {
       if (showCancel) {
-        invoke$1(callbackId, {
+        const isConfirm = e.index === 1;
+        const res = {
           errMsg: 'showModal:ok',
-          confirm: e.index === 1,
+          confirm: isConfirm,
           cancel: e.index === 0 || e.index === -1
-        });
+        };
+        isConfirm && editable && (res.content = e.value);
+        invoke$1(callbackId, res);
       } else {
-        invoke$1(callbackId, {
+        const res = {
           errMsg: 'showModal:ok',
           confirm: e.index === 0,
           cancel: false
-        });
+        };
+        editable && (res.content = e.value);
+        invoke$1(callbackId, res);
       }
-    }, title, showCancel ? [cancelText, confirmText] : [confirmText]);
+    }, title, tip, buttons);
   }
   function showActionSheet$1 ({
     itemList = [],
@@ -10347,9 +11015,10 @@ var serviceContext = (function () {
     text,
     iconPath,
     selectedIconPath,
-    pagePath
+    pagePath,
+    visible
   }) {
-    tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath);
+    tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible);
     const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath);
     if (route) {
       const meta = route.meta;
@@ -10553,8 +11222,7 @@ var serviceContext = (function () {
     callbackId,
     data
   }, pageId) => {
-    const { adpid, width, count } = data;
-    getAdData(adpid, width, count, (res) => {
+    getAdData(data, (res) => {
       operateAdView(pageId, callbackId, 'success', res);
     }, (err) => {
       operateAdView(pageId, callbackId, 'fail', err);
@@ -10563,7 +11231,8 @@ var serviceContext = (function () {
   const _adDataCache = {};
-  function getAdData (adpid, width, count, onsuccess, onerror) {
+  function getAdData (data, onsuccess, onerror) {
+    const { adpid, width } = data;
     const key = adpid + '-' + width;
     const adDataList = _adDataCache[key];
     if (adDataList && adDataList.length > 0) {
@@ -10572,11 +11241,7 @@ var serviceContext = (function () {
     }
     plus.ad.getAds(
-      {
-        adpid,
-        count,
-        width
-      },
+      data,
       (res) => {
         const list = res.ads;
         onsuccess(list.splice(0, 1)[0]);
@@ -10617,6 +11282,7 @@ var serviceContext = (function () {
       this._preload = options.preload !== undefined ? options.preload : true;
       this._isLoad = false;
+      this._isLoading = false;
       this._adError = '';
       this._loadPromiseResolve = null;
       this._loadPromiseReject = null;
@@ -10625,6 +11291,7 @@ var serviceContext = (function () {
       const rewardAd = this._rewardAd = plus.ad.createRewardedVideoAd(options);
       rewardAd.onLoad((e) => {
         this._isLoad = true;
+        this._isLoading = false;
         this._lastLoadTime = Date.now();
         this._dispatchEvent('load', {});
@@ -10634,6 +11301,8 @@ var serviceContext = (function () {
         }
       });
       rewardAd.onClose((e) => {
+        this._isLoad = false;
+        this._isLoading = false;
         if (this._preload) {
           this._loadAd();
         }
@@ -10643,6 +11312,7 @@ var serviceContext = (function () {
         this._dispatchEvent('verify', { isValid: e.isValid });
       });
       rewardAd.onError((e) => {
+        this._isLoading = false;
         const { code, message } = e;
         const data = { code: code, errMsg: message };
         this._adError = message;
@@ -10656,62 +11326,228 @@ var serviceContext = (function () {
           this._loadPromiseReject = null;
         }
       });
-      rewardAd.onAdClicked((e) => {
-        this._dispatchEvent('adClicked', {});
-      });
+      rewardAd.onAdClicked((e) => {
+        this._dispatchEvent('adClicked', {});
+      });
+      if (this._preload) {
+        this._loadAd();
+      }
+    }
+    get isExpired () {
+      return (this._lastLoadTime !== 0 && (Math.abs(Date.now() - this._lastLoadTime) > EXPIRED_TIME))
+    }
+    load () {
+      return new Promise((resolve, reject) => {
+        this._loadPromiseResolve = resolve;
+        this._loadPromiseReject = reject;
+        if (this._isLoading) {
+          return
+        }
+        if (this._isLoad) {
+          resolve();
+          return
+        }
+        this._loadAd();
+      })
+    }
+    show () {
+      return new Promise((resolve, reject) => {
+        if (this._isLoading) {
+          return
+        }
+        const provider = this.getProvider();
+        if (provider === ProviderType.CSJ && this.isExpired) {
+          this._isLoad = false;
+          // TODO
+          this._dispatchEvent('error', EXPIRED_TEXT);
+          reject(new Error(EXPIRED_TEXT.errMsg));
+          return
+        }
+        if (this._isLoad) {
+          this._rewardAd.show();
+          resolve();
+        } else {
+          reject(new Error(this._adError));
+        }
+      })
+    }
+    getProvider () {
+      return this._rewardAd.getProvider()
+    }
+    destroy () {
+      this._rewardAd.destroy();
+    }
+    _loadAd () {
+      this._isLoad = false;
+      this._isLoading = true;
+      this._rewardAd.load();
+    }
+    _dispatchEvent (name, data) {
+      this._callbacks[name].forEach(callback => {
+        if (typeof callback === 'function') {
+          callback(data || {});
+        }
+      });
+    }
+  }
+  function createRewardedVideoAd (options) {
+    return new RewardedVideoAd(options)
+  }
+  const eventTypes = {
+    load: 'load',
+    close: 'close',
+    error: 'error',
+    adClicked: 'adClicked'
+  };
+  const eventNames$1 = [
+    eventTypes.load,
+    eventTypes.close,
+    eventTypes.error,
+    eventTypes.adClicked
+  ];
+  class AdBase {
+    constructor (adInstance, options) {
+      const _callbacks = this._callbacks = {};
+      eventNames$1.forEach(item => {
+        _callbacks[item] = [];
+        const name = item[0].toUpperCase() + item.substr(1);
+        this[`on${name}`] = function (callback) {
+          _callbacks[item].push(callback);
+        };
+      });
+      this._preload = options.preload !== undefined ? options.preload : false;
+      this._isLoaded = false;
+      this._isLoading = false;
+      this._adError = '';
+      this._loadPromiseResolve = null;
+      this._loadPromiseReject = null;
+      this._showPromiseResolve = null;
+      this._showPromiseReject = null;
+      const ad = this._ad = adInstance;
+      ad.onLoad((e) => {
+        this._isLoaded = true;
+        this._isLoading = false;
+        if (this._loadPromiseResolve != null) {
+          this._loadPromiseResolve();
+          this._loadPromiseResolve = null;
+        }
+        if (this._showPromiseResolve != null) {
+          this._showPromiseResolve();
+          this._showPromiseResolve = null;
+          this._showAd();
+        }
+        this._dispatchEvent(eventTypes.load, {});
+      });
+      ad.onClose((e) => {
+        this._isLoaded = false;
+        this._isLoading = false;
+        this._dispatchEvent(eventTypes.close, { isEnded: e.isEnded });
+        if (this._preload === true) {
+          this._loadAd();
+        }
+      });
+      ad.onError((e) => {
+        this._isLoading = false;
-      if (this._preload) {
-        this._loadAd();
-      }
-    }
+        const data = {
+          code: e.code,
+          errMsg: e.message
+        };
-    get isExpired () {
-      return (this._lastLoadTime !== 0 && (Math.abs(Date.now() - this._lastLoadTime) > EXPIRED_TIME))
+        this._adError = data;
+        this._dispatchEvent(eventTypes.error, data);
+        const error = new Error(JSON.stringify(this._adError));
+        error.code = e.code;
+        error.errMsg = e.message;
+        if (this._loadPromiseReject != null) {
+          this._loadPromiseReject(error);
+          this._loadPromiseReject = null;
+        }
+        if (this._showPromiseReject != null) {
+          this._showPromiseReject(error);
+          this._showPromiseReject = null;
+        }
+      });
+      ad.onAdClicked && ad.onAdClicked((e) => {
+        this._dispatchEvent(eventTypes.adClicked, {});
+      });
     }
     load () {
       return new Promise((resolve, reject) => {
-        if (this._isLoad) {
-          resolve();
-          return
-        }
         this._loadPromiseResolve = resolve;
         this._loadPromiseReject = reject;
-        this._loadAd();
+        if (this._isLoading) {
+          return
+        }
+        if (this._isLoaded) {
+          resolve();
+        } else {
+          this._loadAd();
+        }
       })
     }
     show () {
       return new Promise((resolve, reject) => {
-        const provider = this.getProvider();
-        if (provider === ProviderType.CSJ && this.isExpired) {
-          this._isLoad = false;
-          // TODO
-          this._dispatchEvent('error', EXPIRED_TEXT);
-          reject(new Error(EXPIRED_TEXT.errMsg));
+        this._showPromiseResolve = resolve;
+        this._showPromiseReject = reject;
+        if (this._isLoading) {
           return
         }
-        if (this._isLoad) {
-          this._rewardAd.show();
+        if (this._isLoaded) {
+          this._showAd();
           resolve();
         } else {
-          reject(new Error(this._adError));
+          this._loadAd();
         }
       })
     }
-    getProvider () {
-      return this._rewardAd.getProvider()
+    destroy () {
+      this._ad.destroy();
     }
-    destroy () {
-      this._rewardAd.destroy();
+    getProvider () {
+      return this._ad.getProvider()
     }
     _loadAd () {
-      this._isLoad = false;
-      this._rewardAd.load();
+      this._adError = '';
+      this._isLoaded = false;
+      this._isLoading = true;
+      this._ad.load();
+    }
+    _showAd () {
+      this._ad.show();
     }
     _dispatchEvent (name, data) {
@@ -10723,19 +11559,88 @@ var serviceContext = (function () {
     }
   }
-  function createRewardedVideoAd (options) {
-    return new RewardedVideoAd(options)
+  class FullScreenVideoAd extends AdBase {
+    constructor (options = {}) {
+      super(plus.ad.createFullScreenVideoAd(options), options);
+    }
   }
-  const eventNames$1 = [
-    'load',
-    'close',
-    'error',
-    'adClicked'
-  ];
+  function createFullScreenVideoAd (options) {
+    return new FullScreenVideoAd(options)
+  }
-  class FullScreenVideoAd {
+  class InterstitialAd extends AdBase {
     constructor (options = {}) {
+      super(plus.ad.createInterstitialAd(options), options);
+      this._loadAd();
+    }
+  }
+  function createInterstitialAd (options) {
+    return new InterstitialAd(options)
+  }
+  const sdkCache = {};
+  const sdkQueue = {};
+  function initSDK (options) {
+    const provider = options.provider;
+    if (!sdkCache[provider]) {
+      sdkCache[provider] = {};
+    }
+    if (typeof sdkCache[provider].instance === 'object') {
+      options.success(sdkCache[provider].instance);
+      return
+    }
+    if (!sdkQueue[provider]) {
+      sdkQueue[provider] = [];
+    }
+    sdkQueue[provider].push(options);
+    if (sdkCache[provider].loading === true) {
+      options.__plugin = sdkCache[provider].plugin;
+      return
+    }
+    sdkCache[provider].loading = true;
+    const plugin = requireNativePlugin(provider) || {};
+    const initFunction = plugin.init || plugin.initSDK;
+    if (!initFunction) {
+      sdkQueue[provider].forEach((item) => {
+        item.fail({
+          code: -1,
+          message: 'provider [' + provider + '] invalid'
+        });
+      });
+      sdkQueue[provider].length = 0;
+      sdkCache[provider].loading = false;
+      return
+    }
+    sdkCache[provider].plugin = plugin;
+    options.__plugin = plugin;
+    initFunction((res) => {
+      const code = res.code;
+      const isSuccess = (provider === 'BXM-AD') ? (code === 0 || code === 1) : (code === 0);
+      if (isSuccess) {
+        sdkCache[provider].instance = plugin;
+      } else {
+        sdkCache[provider].loading = false;
+      }
+      sdkQueue[provider].forEach((item) => {
+        if (isSuccess) {
+          item.success(item.__plugin);
+        } else {
+          item.fail(res);
+        }
+      });
+      sdkQueue[provider].length = 0;
+    });
+  }
+  class InteractiveAd {
+    constructor (options) {
       const _callbacks = this._callbacks = {};
       eventNames$1.forEach(item => {
         _callbacks[item] = [];
@@ -10745,80 +11650,165 @@ var serviceContext = (function () {
         };
       });
-      this._isLoad = false;
+      this._ad = null;
       this._adError = '';
+      this._adpid = options.adpid;
+      this._provider = options.provider;
+      this._userData = options.userData || {};
+      this._isLoaded = false;
+      this._isLoading = false;
       this._loadPromiseResolve = null;
       this._loadPromiseReject = null;
-      this._lastLoadTime = 0;
-      const ad = this._ad = plus.ad.createFullScreenVideoAd(options);
-      ad.onLoad((e) => {
-        this._isLoad = true;
-        this._lastLoadTime = Date.now();
-        this._dispatchEvent('load', {});
+      this._showPromiseResolve = null;
+      this._showPromiseReject = null;
-        if (this._loadPromiseResolve != null) {
-          this._loadPromiseResolve();
-          this._loadPromiseResolve = null;
-        }
-      });
-      ad.onClose((e) => {
-        this._isLoad = false;
-        this._dispatchEvent('close', { isEnded: e.isEnded });
+      setTimeout(() => {
+        this._init();
       });
-      ad.onError((e) => {
-        const { code, message } = e;
-        const data = { code: code, errMsg: message };
-        this._adError = message;
-        if (code === -5008) {
-          this._isLoad = false;
-        }
-        this._dispatchEvent('error', data);
+    }
-        if (this._loadPromiseReject != null) {
-          this._loadPromiseReject(data);
-          this._loadPromiseReject = null;
+    _init () {
+      this._adError = '';
+      initSDK({
+        provider: this._provider,
+        success: (res) => {
+          this._ad = res;
+          if (this._userData) {
+            this.bindUserData(this._userData);
+          }
+          this._loadAd();
+        },
+        fail: (err) => {
+          this._adError = err;
+          this._dispatchEvent(eventTypes.error, err);
         }
       });
-      ad.onAdClicked((e) => {
-        this._dispatchEvent('adClicked', {});
-      });
+    }
+    getProvider () {
+      return this._provider
     }
     load () {
       return new Promise((resolve, reject) => {
-        if (this._isLoad) {
-          resolve();
-          return
-        }
         this._loadPromiseResolve = resolve;
         this._loadPromiseReject = reject;
-        this._loadAd();
+        if (this._isLoading) {
+          return
+        }
+        if (this._adError) {
+          this._init();
+          return
+        }
+        if (this._isLoaded) {
+          resolve();
+        } else {
+          this._loadAd();
+        }
       })
     }
     show () {
       return new Promise((resolve, reject) => {
-        if (this._isLoad) {
-          this._ad.show();
+        this._showPromiseResolve = resolve;
+        this._showPromiseReject = reject;
+        if (this._isLoading) {
+          return
+        }
+        if (this._adError) {
+          this._init();
+          return
+        }
+        if (this._isLoaded) {
+          this._showAd();
           resolve();
         } else {
-          reject(new Error(this._adError));
+          this._loadAd();
         }
       })
     }
-    getProvider () {
-      return this._ad.getProvider()
+    destroy () {
+      if (this._ad !== null && this._ad.destroy) {
+        this._ad.destroy({
+          adpid: this._adpid
+        });
+      }
     }
-    destroy () {
-      this._ad.destroy();
+    bindUserData (data) {
+      if (this._ad !== null && this._ad.bindUserData) {
+        this._ad.bindUserData(data);
+      }
     }
     _loadAd () {
-      this._isLoad = false;
-      this._ad.load();
+      if (this._ad !== null) {
+        if (this._isLoading === true) {
+          return
+        }
+        this._isLoading = true;
+        this._ad.loadData({
+          adpid: this._adpid,
+          ...this._userData
+        }, (res) => {
+          this._isLoaded = true;
+          this._isLoading = false;
+          if (this._loadPromiseResolve != null) {
+            this._loadPromiseResolve();
+            this._loadPromiseResolve = null;
+          }
+          if (this._showPromiseResolve != null) {
+            this._showPromiseResolve();
+            this._showPromiseResolve = null;
+            this._showAd();
+          }
+          this._dispatchEvent(eventTypes.load, res);
+        }, (err) => {
+          this._isLoading = false;
+          if (this._showPromiseReject != null) {
+            this._showPromiseReject(this._createError(err));
+            this._showPromiseReject = null;
+          }
+          this._dispatchEvent(eventTypes.error, err);
+        });
+      }
+    }
+    _showAd () {
+      if (this._ad !== null && this._isLoaded === true) {
+        this._ad.show({
+          adpid: this._adpid
+        }, (res) => {
+          this._isLoaded = false;
+        }, (err) => {
+          this._isLoaded = false;
+          if (this._showPromiseReject != null) {
+            this._showPromiseReject(this._createError(err));
+            this._showPromiseReject = null;
+          }
+          this._dispatchEvent(eventTypes.error, err);
+        });
+      }
+    }
+    _createError (err) {
+      const error = new Error(JSON.stringify(err));
+      error.code = err.code;
+      error.errMsg = err.message;
+      return error
     }
     _dispatchEvent (name, data) {
@@ -10830,8 +11820,14 @@ var serviceContext = (function () {
     }
   }
-  function createFullScreenVideoAd (options) {
-    return new FullScreenVideoAd(options)
+  function createInteractiveAd (options) {
+    if (!options.provider) {
+      return new Error('provider invalid')
+    }
+    if (!options.adpid) {
+      return new Error('adpid invalid')
+    }
+    return new InteractiveAd(options)
   }
   var api = /*#__PURE__*/Object.freeze({
@@ -10920,11 +11916,12 @@ var serviceContext = (function () {
     stopVoice: stopVoice,
     chooseImage: chooseImage$1,
     chooseVideo: chooseVideo$1,
-    compressImage: compressImage$2,
+    compressImage: compressImage$1,
     compressVideo: compressVideo$1,
     getImageInfo: getImageInfo$1,
     getVideoInfo: getVideoInfo$1,
     previewImagePlus: previewImagePlus,
+    closePreviewImagePlus: closePreviewImagePlus,
     operateRecorder: operateRecorder,
     saveImageToPhotosAlbum: saveImageToPhotosAlbum$1,
     saveVideoToPhotosAlbum: saveVideoToPhotosAlbum,
@@ -10933,6 +11930,7 @@ var serviceContext = (function () {
     createRequestTaskById: createRequestTaskById,
     createRequestTask: createRequestTask,
     operateRequestTask: operateRequestTask,
+    configMTLS: configMTLS$1,
     createSocketTask: createSocketTask,
     operateSocketTask: operateSocketTask,
     operateUploadTask: operateUploadTask,
@@ -10940,9 +11938,12 @@ var serviceContext = (function () {
     getProvider: getProvider$1,
     login: login,
     getUserInfo: getUserInfo,
+    getUserProfile: getUserProfile,
     operateWXData: operateWXData,
     preLogin: preLogin$1,
     closeAuthView: closeAuthView,
+    getCheckBoxState: getCheckBoxState,
+    getUniverifyManager: getUniverifyManager,
     requestPayment: requestPayment,
     subscribePush: subscribePush,
     unsubscribePush: unsubscribePush,
@@ -10958,6 +11959,8 @@ var serviceContext = (function () {
     onNativeEventReceive: onNativeEventReceive,
     sendNativeEvent: sendNativeEvent,
     loadSubPackage: loadSubPackage$2,
+    sendHostEvent: sendHostEvent,
+    navigateToMiniProgram: navigateToMiniProgram,
     navigateBack: navigateBack$1,
     navigateTo: navigateTo$1,
     reLaunch: reLaunch$1,
@@ -10995,7 +11998,9 @@ var serviceContext = (function () {
     showTabBar: showTabBar$2,
     requestComponentInfo: requestComponentInfo$2,
     createRewardedVideoAd: createRewardedVideoAd,
-    createFullScreenVideoAd: createFullScreenVideoAd
+    createFullScreenVideoAd: createFullScreenVideoAd,
+    createInterstitialAd: createInterstitialAd,
+    createInteractiveAd: createInteractiveAd
   });
   var platformApi = Object.assign(Object.create(null), api, eventApis);
@@ -18204,8 +19209,9 @@ var serviceContext = (function () {
   }
   function Pattern (image, repetition) {
-    this.image = image;
-    this.repetition = repetition;
+    this.type = 'pattern';
+    this.data = image;
+    this.colorStop = repetition;
   }
   class CanvasGradient {
@@ -18915,6 +19921,13 @@ var serviceContext = (function () {
     constructor (id, pageVm) {
       this.id = id;
       this.pageVm = pageVm;
+    }
+    on (name, callback) {
+      operateMapPlayer$3(this.id, this.pageVm, 'on', {
+        name,
+        callback
+      });
     }
   }
@@ -18922,7 +19935,7 @@ var serviceContext = (function () {
     {
       return plus.maps.getMapById(this.pageVm.$page.id + '-map-' + this.id)
     }
-  };
+  };
   methods.forEach(function (method) {
     MapContext.prototype[method] = callback.warp(function (options, callbackId) {
@@ -19386,11 +20399,16 @@ var serviceContext = (function () {
     }
     return invokeMethod('previewImagePlus', args)
+  }
+  function closePreviewImage (args = {}) {
+    return invokeMethod('closePreviewImagePlus', args)
   }
   var require_context_module_1_15 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    previewImage: previewImage$1
+    previewImage: previewImage$1,
+    closePreviewImage: closePreviewImage
   });
   const callbacks$8 = {
@@ -20376,6 +21394,51 @@ var serviceContext = (function () {
     loadFontFace: loadFontFace$1
   });
+  function getLocale$1 () {
+    // 优先使用 $locale
+    const app = getApp({
+      allowDefault: true
+    });
+    if (app && app.$vm) {
+      return app.$vm.$locale
+    }
+    return i18n.getLocale()
+  }
+  function setLocale (locale) {
+    const oldLocale = getApp().$vm.$locale;
+    if (oldLocale !== locale) {
+      getApp().$vm.$locale = locale;
+      {
+        const pages = getCurrentPages();
+        pages.forEach((page) => {
+          UniServiceJSBridge.publishHandler(
+            'setLocale',
+            locale,
+            page.$page.id
+          );
+        });
+        weex.requireModule('plus').setLanguage(locale);
+      }
+      callbacks$a.forEach(callbackId => {
+        invoke$1(callbackId, { locale });
+      });
+      return true
+    }
+    return false
+  }
+  const callbacks$a = [];
+  function onLocaleChange (callbackId) {
+    callbacks$a.push(callbackId);
+  }
+  var require_context_module_1_27 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    getLocale: getLocale$1,
+    setLocale: setLocale,
+    onLocaleChange: onLocaleChange
+  });
   function pageScrollTo$1 (args) {
     const pages = getCurrentPages();
     if (pages.length) {
@@ -20384,7 +21447,7 @@ var serviceContext = (function () {
     return {}
   }
-  var require_context_module_1_27 = /*#__PURE__*/Object.freeze({
+  var require_context_module_1_28 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     pageScrollTo: pageScrollTo$1
   });
@@ -20397,7 +21460,7 @@ var serviceContext = (function () {
     return {}
   }
-  var require_context_module_1_28 = /*#__PURE__*/Object.freeze({
+  var require_context_module_1_29 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     setPageMeta: setPageMeta$1
   });
@@ -20422,19 +21485,19 @@ var serviceContext = (function () {
   const hideTabBarRedDot$1 = removeTabBarBadge$1;
-  const callbacks$a = [];
+  const callbacks$b = [];
   onMethod('onTabBarMidButtonTap', res => {
-    callbacks$a.forEach(callbackId => {
+    callbacks$b.forEach(callbackId => {
       invoke$1(callbackId, res);
     });
   });
   function onTabBarMidButtonTap (callbackId) {
-    callbacks$a.push(callbackId);
+    callbacks$b.push(callbackId);
   }
-  var require_context_module_1_29 = /*#__PURE__*/Object.freeze({
+  var require_context_module_1_30 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     removeTabBarBadge: removeTabBarBadge$1,
     showTabBarRedDot: showTabBarRedDot$1,
@@ -20442,23 +21505,23 @@ var serviceContext = (function () {
     onTabBarMidButtonTap: onTabBarMidButtonTap
   });
-  const callbacks$b = [];
+  const callbacks$c = [];
   onMethod('onViewDidResize', res => {
-    callbacks$b.forEach(callbackId => {
+    callbacks$c.forEach(callbackId => {
       invoke$1(callbackId, res);
     });
   });
   function onWindowResize (callbackId) {
-    callbacks$b.push(callbackId);
+    callbacks$c.push(callbackId);
   }
   function offWindowResize (callbackId) {
     // 此处和微信平台一致查询不到去掉最后一个
-    callbacks$b.splice(callbacks$b.indexOf(callbackId), 1);
+    callbacks$c.splice(callbacks$c.indexOf(callbackId), 1);
   }
-  var require_context_module_1_30 = /*#__PURE__*/Object.freeze({
+  var require_context_module_1_31 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     onWindowResize: onWindowResize,
     offWindowResize: offWindowResize
@@ -20496,10 +21559,11 @@ var serviceContext = (function () {
   './ui/create-media-query-observer.js': require_context_module_1_24,
   './ui/create-selector-query.js': require_context_module_1_25,
   './ui/load-font-face.js': require_context_module_1_26,
-  './ui/page-scroll-to.js': require_context_module_1_27,
-  './ui/set-page-meta.js': require_context_module_1_28,
-  './ui/tab-bar.js': require_context_module_1_29,
-  './ui/window.js': require_context_module_1_30,
+  './ui/locale.js': require_context_module_1_27,
+  './ui/page-scroll-to.js': require_context_module_1_28,
+  './ui/set-page-meta.js': require_context_module_1_29,
+  './ui/tab-bar.js': require_context_module_1_30,
+  './ui/window.js': require_context_module_1_31,
       };
       var req = function req(key) {
@@ -20538,6 +21602,9 @@ var serviceContext = (function () {
     }
     const evalJSCode =
       `typeof UniViewJSBridge !== 'undefined' && UniViewJSBridge.subscribeHandler("${eventType}",${args},__PAGE_ID__)`;
+    if (process.env.NODE_ENV !== 'production') {
+      console.log(`UNIAPP[publishHandler]:[${+new Date()}]`, 'length', evalJSCode.length);
+    }
     pageIds.forEach(id => {
       const webview = plus.webview.getWebviewById(String(id));
       webview && webview.evalJS(evalJSCode.replace('__PAGE_ID__', id));
@@ -20650,18 +21717,12 @@ var serviceContext = (function () {
       callCurrentPageHook('onHide');
     }
-    function onAppEnterForeground () {
-      const pages = getCurrentPages();
-      if (pages.length === 0) {
-        return
-      }
-      const page = pages[pages.length - 1];
-      const args = {
-        path: page.route,
-        query: page.options
-      };
-      callAppHook(getApp(), 'onShow', args);
+    function onAppEnterForeground (enterOptions) {
+      callAppHook(getApp(), 'onShow', enterOptions);
+      const pages = getCurrentPages();
+      if (pages.length === 0) {
+        return
+      }
       callCurrentPageHook('onShow');
     }
@@ -20981,7 +22042,11 @@ var serviceContext = (function () {
     });
     plus.globalEvent.addEventListener('resume', () => {
-      emit('onAppEnterForeground');
+      const info = parseRedirectInfo();
+      if (info && info.userAction) {
+        initEnterOptions(info);
+      }
+      emit('onAppEnterForeground', getEnterOptions());
     });
     plus.globalEvent.addEventListener('netchange', () => {
@@ -20992,10 +22057,15 @@ var serviceContext = (function () {
       });
     });
+    let keyboardHeightChange = 0;
     plus.globalEvent.addEventListener('KeyboardHeightChange', function (event) {
-      publish('onKeyboardHeightChange', {
-        height: event.height
-      });
+      // 安卓设备首次获取高度为 0
+      if (keyboardHeightChange !== event.height) {
+        keyboardHeightChange = event.height;
+        publish('onKeyboardHeightChange', {
+          height: keyboardHeightChange
+        });
+      }
     });
     globalEvent.addEventListener('uistylechange', function (event) {
@@ -21033,14 +22103,20 @@ var serviceContext = (function () {
   }
   function initAppLaunch (appVm) {
-    const args = {
+    const args = initLaunchOptions({
       path: __uniConfig.entryPagePath,
-      query: {},
-      scene: 1001
-    };
+      query: __uniConfig.entryPageQuery,
+      referrerInfo: __uniConfig.referrerInfo
+    });
     callAppHook(appVm, 'onLaunch', args);
     callAppHook(appVm, 'onShow', args);
+    // https://tower.im/teams/226535/todos/16905/
+    const getAppState = weex.requireModule('plus').getAppState;
+    const appState = getAppState && Number(getAppState());
+    if (appState === 2) {
+      callAppHook(appVm, 'onHide', args);
+    }
   }
   function initTabBar () {
@@ -21101,12 +22177,13 @@ var serviceContext = (function () {
     });
   }
-  function registerApp (appVm) {
+  function registerApp (appVm, Vue) {
     if (process.env.NODE_ENV !== 'production') {
       console.log('[uni-app] registerApp');
     }
     appCtx = appVm;
     appCtx.$vm = appVm;
+    initAppLocale(Vue, appVm);
     Object.assign(appCtx, defaultApp); // 拷贝默认实现
@@ -21933,7 +23010,7 @@ var serviceContext = (function () {
     return {
       version: VD_SYNC_VERSION,
-      locale: plus.os.language, // TODO
+      locale: weex.requireModule('plus').getLanguage(),
       disableScroll,
       onPageScroll,
       onPageReachBottom,
@@ -22010,6 +23087,8 @@ var serviceContext = (function () {
       initPolyfill(Vue);
+      uniIdMixin(Vue);
       Vue.prototype.getOpenerEventChannel = function () {
         if (!this.$root.$scope.eventChannel) {
           this.$root.$scope.eventChannel = new EventChannel();
@@ -22045,12 +23124,12 @@ var serviceContext = (function () {
                 console.log('[uni-app] launchApp');
               }
               plus.updateConfigInfo && plus.updateConfigInfo();
-              registerApp(this);
+              registerApp(this, Vue);
               oldMount.call(this, el, hydrating);
             });
             return
           }
-          registerApp(this);
+          registerApp(this, Vue);
         }
         return oldMount.call(this, el, hydrating)
       };
@@ -22089,7 +23168,8 @@ var serviceContext = (function () {
     __registerPage: registerPage,
     uni: uni$1,
     getApp: getApp$1,
-    getCurrentPages: getCurrentPages$1
+    getCurrentPages: getCurrentPages$1,
+    EventChannel
   };
   return index$1;