Merge branch 'dev' of gitcode.net:dcloud/hello-uni-app-x into dev

pages/API/choose-location/choose-location.uvue

@@ -18,7 +18,9 @@
         <text class="tips">注意：\n1. Web和App需要正确配置地图服务商的Key并且保证Key的权限和余额足够，才能正常选择位置\n2. 若没有关联uniCloud空间，则只能全屏地图选点，不能根据POI选择位置\n3. payload参数会原样透传给uni-map-co，可用于用户鉴权</text>
         <boolean-data :defaultValue="false" title="是否指定位置为天安门" @change="changeLocationBoolean"></boolean-data>
         <boolean-data :defaultValue="false" title="是否携带keyword参数" @change="changeKeywordBoolean"></boolean-data>
+        <!-- #ifndef MP -->
         <boolean-data :defaultValue="false" title="是否携带payload参数" @change="changePayloadBoolean"></boolean-data>
+        <!-- #endif -->
         <button class="btn" type="primary" @tap="chooseLocation">选择位置</button>
         <button class="btn" @tap="clear">清空</button>
         <!-- #ifdef APP-IOS -->
@@ -83,11 +85,13 @@
         if (this.hoverKeyword) {
           chooseLocationOptions.keyword = '公园'
         }
+        // #ifndef MP
         if (this.hoverPayload) {
           chooseLocationOptions.payload = {
             token: 'xxx'
           }
         }
+        // #endif
         uni.chooseLocation(chooseLocationOptions)
         // 自动化测试
         setTimeout(() => {

pages/API/get-video-info/get-video-info.test.js

@@ -33,16 +33,15 @@ describe('API-getVideoInfo', () => {
     const infos = process.env.uniTestPlatformInfo.split(' ');
     const version = parseInt(infos[infos.length - 1]);
     if (process.env.uniTestPlatformInfo.startsWith('android') && version > 5) {
-      expect(await page.data('videoInfoForTest')).toEqual({
-        orientation: 'up',
-        type: 'video/mp4',
-        duration: 10,
-        size: 183,
-        width: 1280,
-        height: 720,
-        fps: 31,
-        bitrate: 149
-      });
+      var videoInfo = await page.data('videoInfoForTest')
+      expect(videoInfo.orientation).toEqual("up")
+      expect(videoInfo.type).toEqual("video/mp4")
+      expect(videoInfo.duration).toEqual(10)
+      expect(videoInfo.size).toEqual(183)
+      expect(videoInfo.width).toEqual(1280)
+      expect(videoInfo.height).toEqual(720)
+      expect(videoInfo.fps == 30 || videoInfo.fps == 31).toEqual(true)
+      expect(videoInfo.bitrate).toEqual(149)
     }
   });
 });