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

src/core/helpers/protocol/network/upload-file.js

-import getRealPath from 'uni-platform/helpers/get-real-path'
+// App端可以只使用files不传filePath和name
+// import getRealPath from 'uni-platform/helpers/get-real-path'
 
 export const uploadFile = {
   url: {
     type: String,
     required: true
   },
+  files: {
+    type: Array
+  },
   filePath: {
-    type: String,
-    validator (value, params) {
-      params.type = getRealPath(value)
-    }
+    type: String
   },
   name: {
     type: String

src/core/service/api/context/background-audio.js

@@ -119,7 +119,7 @@ class BackgroundAudioManager {
     this._operate('stop')
   }
   seek (position) {
-    this._operate('play', {
+    this._operate('seek', {
       currentTime: position
     })
   }

src/platforms/app-plus/service/api/ad/rewarded-video-ad.js

@@ -5,6 +5,8 @@ const eventNames = [
   'error'
 ]
 
+const ERROR_CODE_LIST = [-5001, -5002, -5003, -5004, -5005, -5006]
+
 class RewardedVideoAd {
   constructor (adpid) {
     this._options = {
@@ -21,7 +23,7 @@ class RewardedVideoAd {
     })
 
     this._isLoad = false
-    this._adError = false
+    this._adError = ''
     this._loadPromiseResolve = null
     this._loadPromiseReject = null
     const rewardAd = this._rewardAd = plus.ad.createRewardedVideoAd(this._options)
@@ -40,9 +42,9 @@ class RewardedVideoAd {
     rewardAd.onError((e) => {
       const { code, message } = e
       const data = { code: code, errMsg: message }
-      this._adError = (code && code < 5005)
+      this._adError = message
       this._dispatchEvent('error', data)
-      if (code === 5005 && this._loadPromiseReject != null) {
+      if ((code === -5005 || ERROR_CODE_LIST.index(code) === -1) && this._loadPromiseReject != null) {
         this._loadPromiseReject(data)
         this._loadPromiseReject = null
       }
@@ -66,14 +68,11 @@ class RewardedVideoAd {
         this._rewardAd.show()
         resolve()
       } else {
-        reject(new Error(''))
+        reject(new Error(this._adError))
       }
     })
   }
   _loadAd () {
-    if (this._adError) {
-      return
-    }
     this._isLoad = false
     this._rewardAd.load()
   }

src/platforms/app-plus/view/components/picker/index.vue

@@ -27,6 +27,7 @@ function padLeft (num) {
   return num > 9 ? num : (`0${num}`)
 }
 function getDate (str, mode_) {
+  str = String(str || '')
   const date = new Date()
   if (mode_ === mode.TIME) {
     str = str.split(':')
@@ -72,10 +73,7 @@ export default {
     },
     fields: {
       type: String,
-      default: 'day',
-      validator (val) {
-        return Object.values(fields).indexOf(val) >= 0
-      }
+      default: ''
     },
     start: {
       type: String,
@@ -90,7 +88,7 @@ export default {
               return year
             case fields.MONTH:
               return year + '-01'
-            case fields.DAY:
+            default:
               return year + '-01-01'
           }
         }
@@ -110,7 +108,7 @@ export default {
               return year
             case fields.MONTH:
               return year + '-12'
-            case fields.DAY:
+            default:
               return year + '-12-31'
           }
         }
@@ -151,7 +149,7 @@ export default {
       this._showPicker(Object.assign({}, this.$props))
     },
     _showPicker (data) {
-      if (this.mode === mode.TIME || this.mode === mode.DATE) {
+      if ((data.mode === mode.TIME || data.mode === mode.DATE) && !data.fields) {
         plus.nativeUI[this.mode === mode.TIME ? 'pickTime' : 'pickDate']((res) => {
           const date = res.date
           this.$trigger('change', {}, {
@@ -167,6 +165,7 @@ export default {
           maxDate: getDate(this.end, mode.DATE)
         })
       } else {
+        data.fields = Object.values(fields).includes(data.fields) ? data.fields : fields.DAY
         let res = { event: 'cancel' }
         this.page = showPage({
           url: '__uniapppicker',