Merge branch 'dev' of github.com:dcloudio/uni-app into dev

packages/uni-mp-alipay/dist/index.js

@@ -222,7 +222,7 @@ function _handleSystemInfo (result) {
 }
 
 const protocols = { // 需要做转换的 API 列表
-  returnValue (methodName, res) { // 通用 returnValue 解析
+  returnValue (methodName, res = {}) { // 通用 returnValue 解析
     if (res.error || res.errorMessage) {
       res.errMsg = `${methodName}:fail ${res.errorMessage || res.error}`;
       delete res.error;

packages/uni-mp-alipay/package.json

 {
 	"name": "@dcloudio/uni-mp-alipay",
-	"version": "0.0.812",
+	"version": "0.0.813",
 	"description": "uni-app mp-alipay",
 	"main": "dist/index.js",
 	"scripts": {

src/platforms/h5/components/app/popup/toast.vue

 <template>
   <transition name="uni-fade">
     <uni-toast
-      v-show="visible"
-      :class="{'uni-toast-fixed':mask}"
+      v-if="visible"
       :data-duration="duration">
       <div
         v-if="mask"
@@ -86,20 +85,17 @@ export default {
 }
 </script>
 <style>
-	uni-toast {
+	uni-toast {
+    position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 999;
 		display: block;
 		box-sizing: border-box;
 	}
 
-	uni-toast .uni-toast-fixed {
-		position: fixed;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		z-index: 999;
-	}
-
 	uni-toast .uni-sample-toast {
 		position: fixed;
 		z-index: 999;

src/platforms/mp-alipay/service/api/protocols.js

@@ -74,7 +74,7 @@ function _handleSystemInfo (result) {
 }
 
 const protocols = { // 需要做转换的 API 列表
-  returnValue (methodName, res) { // 通用 returnValue 解析
+  returnValue (methodName, res = {}) { // 通用 returnValue 解析
     if (res.error || res.errorMessage) {
       res.errMsg = `${methodName}:fail ${res.errorMessage || res.error}`
       delete res.error