Merge branch 'alpha' into alpha-stat

manifest.json

@@ -2,8 +2,8 @@
   "name": "Hello uni-app x",
   "appid": "__UNI__HelloUniAppX",
   "description": "",
-  "versionName": "1.6",
-  "versionCode": 10600,
+  "versionName": "1.6.5",
+  "versionCode": 10605,
   "uni-app-x": {},
   /* 快应用特有相关 */
   "quickapp": {},

pages.json

@@ -16,7 +16,7 @@
 			"path": "pages/tabBar/component",
 			"style": {
 				"navigationBarTitleText": "内置组件",
-				"backgroundColor": "#F8F8F8"
+				"backgroundColorContent": "#f8f8f8"
 			}
 		},
 		{
@@ -521,7 +521,7 @@
 			"path": "pages/tabBar/API",
 			"style": {
 				"navigationBarTitleText": "接口",
-				"backgroundColor": "#F8F8F8"
+				"backgroundColorContent": "#f8f8f8"
 			}
 		},
 		{
@@ -1232,12 +1232,21 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		// #endif
+    // #ifdef APP-ANDROID || APP-IOS
+    {
+      "path" : "uni_modules/uni-upgrade-center-app/pages/uni-app-x/upgrade-popup",
+      "style" :
+      {
+        "navigationBarTitleText" : ""
+      }
+    },
     // #endif
 		{
 			"path": "pages/tabBar/CSS",
 			"style": {
 				"navigationBarTitleText": "CSS",
-				"backgroundColor": "#F8F8F8"
+				"backgroundColorContent": "#f8f8f8"
 			}
 		},
 		{
@@ -1684,7 +1693,8 @@
 		{
 			"path": "pages/tabBar/template",
 			"style": {
-				"navigationBarTitleText": "模板"
+				"navigationBarTitleText": "模板",
+				"backgroundColorContent": "#f8f8f8"
 			}
 		},
 		{

pages/API/privacy/privacy.uvue

@@ -15,6 +15,9 @@
       <button class="privacy-button" type="primary" @tap="resetPrivacyAuthorization">
         重置隐私协议授权状态
       </button>
+      <button class="privacy-button" @tap="openPrivacyDialog">
+        显示隐私政策弹框
+      </button>
     </view>
 	</view>
 </template>
@@ -63,6 +66,11 @@
 			},
       resetPrivacyAuthorization(){
         uni.resetPrivacyAuthorization()
+      },
+      openPrivacyDialog(){
+        uni.openDialogPage({
+          url: '/pages/component/button/privacy',
+        })
       }
 		}
 	}

pages/CSS/border/border.test.js

+describe('css-border', () => {
+  let page;
+  beforeAll(async () => {
+    page = await program.reLaunch("/pages/CSS/border/border")
+    await page.waitFor(2000);
+  });
+
+  it('Check Border Wait Screenshot', async () => {
+    const image = await program.screenshot({fullPage: true});
+    expect(image).toSaveImageSnapshot();
+  });
+});

pages/CSS/border/border.uvue

 <template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
     <view style="flex-grow: 1;">
       <view>
         <text>border: 5px dotted blue</text>
@@ -10,11 +13,24 @@
           style="border-style: solid;border-color: rgba(0, 0, 255, 0.1);background-image: linear-gradient(to right, #00ff00, #00bc79)">
         </view>
       </view>
+      <view>
+        <text>设置border的view，通过v-show控制显示</text>
+        <view v-show="shown">
+          <view class="common" style="border: 5px dotted blue;">
+          </view>
+        </view>
       </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
 </template>
 
-<script>
-
+<script setup lang="uts">
+  const shown = ref(false)
+  setTimeout(() => {
+    shown.value = true
+  }, 1000);
 </script>
 
 <style>

pages/CSS/layout/width.uvue

@@ -9,6 +9,11 @@
       <text>width: 50%</text>
       <view class="common" style="width: 50%;"></view>
     </view>
+
+    <view>
+      <text>width: 250rpx</text>
+      <view class="common" style="width: 250rpx;"></view>
+    </view>
   </view>
 </template>
 

pages/component/button/button.uvue

@@ -39,6 +39,11 @@
           url: 'buttonstatus',
         })
       },
+      openPrivacyDialog() {
+        uni.openDialogPage({
+          url: '/pages/component/button/privacy',
+        })
+      },
       //用于自动化测试
       checkUniButtonElement() : boolean {
         const button = uni.getElementById("testButton")
@@ -71,7 +76,10 @@
       <enum-data :items="type_enum" title="按钮的类型" @change="radio_change_type_enum"></enum-data>
       <input-data :defaultValue="text" title="按钮的文案" type="text" @confirm="confirm_text_input"></input-data>
       <view style="height: 10px;"></view>
+      <button @click="openPrivacyDialog">open-type实现隐私政策弹框</button>
+      <view style="height: 10px;"></view>
       <button @click="navigateToChild">更多示例</button>
+      <view style="height: 10px;"></view>
     </view>
   </scroll-view>
 </template>

pages/component/picker-view/picker-view.test.js

-
 const PAGE_PATH = '/pages/component/picker-view/picker-view'
-let page,pickerViewEl;
+let page, pickerViewEl;
 describe('PickerView.uvue', () => {
   beforeAll(async () => {
     page = await program.reLaunch(PAGE_PATH)
@@ -14,19 +13,25 @@ describe('PickerView.uvue', () => {
   })
 
   async function toScreenshot(imgName) {
-    const image = await program.screenshot({fullPage: true});
-    expect(image).toSaveImageSnapshot({customSnapshotIdentifier() {
+    const image = await program.screenshot({
+      fullPage: true
+    });
+    expect(image).toSaveImageSnapshot({
+      customSnapshotIdentifier() {
         return imgName
-    }})
+      }
+    })
     await page.waitFor(500);
   }
 
   it('value', async () => {
     await page.callMethod('setValue')
     await page.waitFor(1000)
+
+
     const newValue1 = await pickerViewEl.property('value')
     // TODO
-    expect(newValue1.toString()).toEqual('0,0,0')
+    expect(newValue1.toString()).toEqual('0,1,30')
     if (process.env.UNI_PLATFORM === 'app-android') {
       expect(await page.data('result')).toEqual([0, 0, 0])
     }
@@ -58,27 +63,31 @@ describe('PickerView.uvue', () => {
     await toScreenshot('picker-view-indicator-style')
   })
 
-  if(process.env.uniTestPlatformInfo.startsWith('web')){
+  if (process.env.uniTestPlatformInfo.startsWith('web')) {
     // indicator-class、mask-style、mask-class 仅web支持
     it('indicator-class', async () => {
       await page.setData({
-        indicatorStyle:"",//清空indicatorStyle
-        indicatorClass:"indicator-test",//设置indicatorClass为indicator-test
+        indicatorStyle: "", //清空indicatorStyle
+        indicatorClass: "indicator-test", //设置indicatorClass为indicator-test
       })
       expect(await pickerViewEl.attribute('indicatorClass')).toBe("indicator-test")
       await toScreenshot('picker-view-web-indicator-class')
       await page.setData({
-        indicatorClass:"",//清空indicatorClass
+        indicatorClass: "", //清空indicatorClass
       })
     })
     it('mask-style', async () => {
       const maskStyle = "background-image: linear-gradient(to bottom, #d8e5ff, rgba(216, 229, 255, 0));"
-      await page.setData({maskStyle})
+      await page.setData({
+        maskStyle
+      })
       expect(await pickerViewEl.attribute('maskStyle')).toBe(maskStyle)
       await toScreenshot('picker-view-web-mask-style')
     })
     it('mask-class', async () => {
-      await page.setData({maskClass:"mask-test"})
+      await page.setData({
+        maskClass: "mask-test"
+      })
       expect(await pickerViewEl.attribute('maskClass')).toBe("mask-test")
       await toScreenshot('picker-view-web-mask-class')
     })
@@ -106,22 +115,22 @@ describe('PickerView.uvue', () => {
       await page.waitFor(500)
       page = await program.navigateTo(PAGE_PATH)
       await page.waitFor(500)
-      const date = new Date()
+
       const {
         year,
         month,
         day
       } = await page.data()
-      expect(year).toEqual(date.getFullYear())
-      expect(month).toEqual(date.getMonth() + 1)
-      expect(day).toEqual(date.getDate())
+      expect(year).toEqual(2018)
+      expect(month).toEqual(1)
+      expect(day).toEqual(12)
     })
 
     it('trigger UniPickerViewChangeEvent', async () => {
       await page.callMethod('setValue')
       await page.waitFor(1500)
       const eventCallbackNum = await page.callMethod('getEventCallbackNum')
-      // 3 times 3*3
+      // 年月日滚动三次，测试 e.tagName +1 和 e.type+2，正常为9
       expect(eventCallbackNum).toBe(9)
     })
   }

pages/component/picker-view/picker-view.uvue

@@ -27,13 +27,13 @@
   import { state, setEventCallbackNum } from '@/store/index.uts'
   export default {
     data() {
-      const date = new Date()
+      // 20180112 HBuilderX内测开始 :)
       const _years : number[] = []
-      const _year = date.getFullYear()
+      const _year = 2018
       const _months : number[] = []
-      const _month : number = date.getMonth() + 1
+      const _month : number = 1
       const _days : number[] = []
-      const _day = date.getDate()
+      const _day = 12
       for (let i = 2000; i <= _year; i++) {
         _years.push(i)
       }
@@ -72,8 +72,8 @@
         setEventCallbackNum(num)
       },
       bindChange(e : UniPickerViewChangeEvent) {
-        // 自动化测试
-        console.log(e.target?.tagName, e.type);
+        // 自动化测试 触发事件元素、type 类型
+        // console.log(e.target?.tagName, e.type);
         if ((e.target?.tagName ?? '').includes('PICKER-VIEW')) {
           this.setEventCallbackNum(state.eventCallbackNum + 1)
         }
@@ -87,7 +87,7 @@
         this.day = this.days[val[2]]
       },
       setValue() {
-        this.value = [0, 0, 0] as number[]
+        this.value = [0, 1, 30] as number[]
       },
       setValue1() {
         this.value = [10, 10, 10] as number[]

pages/pages.test.js

@@ -170,7 +170,7 @@ const pages = [
   '/pages/CSS/background/background-color',
   // 单独测试例中截图
   // '/pages/CSS/background/background-image',
-  '/pages/CSS/border/border',
+  // '/pages/CSS/border/border',
   '/pages/CSS/border/border-color',
   '/pages/CSS/border/border-top',
   '/pages/CSS/border/border-bottom',

pages/tabBar/API.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex: 1; background-color: #f8f8f8" enable-back-to-top="true">
+  <scroll-view style="flex: 1;" enable-back-to-top="true">
   <!-- #endif -->
     <view class="uni-container">
       <view v-if="!hasLeftWin" class="uni-header-logo">
@@ -79,11 +79,7 @@
       goPage(url : string) {
         if (url == '/set-tab-bar') {
           this.showPop()
-        }else if (url == '/show-privacy-dialog') {
-         uni.openDialogPage({
-           url: '/pages/component/button/privacy',
-         })
-        }  else {
+        }else {
           if (this.hasLeftWin) {
             uni.reLaunch({ url })
           } else {

pages/tabBar/CSS.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex: 1; background-color: #f8f8f8" enable-back-to-top="true">
+  <scroll-view style="flex: 1;" enable-back-to-top="true">
   <!-- #endif -->
     <view class="uni-container">
       <view v-if="!hasLeftWin" class="uni-header-logo">

pages/tabBar/component.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex: 1; background-color: #f8f8f8" enable-back-to-top="true">
+  <scroll-view style="flex: 1;" enable-back-to-top="true">
   <!-- #endif -->
     <view class="uni-container">
       <view v-if="!hasLeftWin" class="uni-header-logo">
@@ -39,10 +39,6 @@
           </template>
         </uni-collapse-item>
       </uni-collapse>
-
-      <!-- #ifdef UNI-APP-X && APP -->
-      <uni-upgrade-center-app ref="upgradePopup" @show="upgradePopupShow" @close="upgradePopupClose" />
-      <!-- #endif -->
     </view>
   <!-- #ifdef APP -->
   </scroll-view>
@@ -80,19 +76,7 @@
         } else {
           uni.navigateTo({ url })
         }
-      },
-      // #ifdef UNI-APP-X && APP
-      upgradePopupShow() {
-        console.log('upgradePopup show');
-        if (!this.pageHiden) {
-          uni.hideTabBar()?.catch(_ => { })
-        }
-      }
-      , upgradePopupClose() {
-        console.log('upgradePopup close');
-        uni.showTabBar()?.catch(_ => { })
       }
-      // #endif
     },
     // #ifdef WEB
     watch: {
@@ -113,7 +97,19 @@
     // #endif
     onReady() {
       // #ifdef UNI-APP-X && APP
-      checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
+      uni.getPrivacySetting({
+        success(res) {
+          if (res.needAuthorization) {
+            uni.onPrivacyAuthorizationChange((res) => {
+              if (!res.needAuthorization) {
+                checkUpdate()
+              }
+            })
+          } else {
+            checkUpdate()
+          }
+        }
+      })
       // #endif
     },
     onShow() {

pages/tabBar/generateMenu.uts

@@ -158,16 +158,5 @@ function addSetTabBarPage(menuItem : MenuItem) {
       group: null,
       items: []
     } as MenuItem)
-    menuItem.items.push({
-      id: 'show-privacy-dialog',
-      name: '隐私政策',
-      index: 0,
-      path: 'show-privacy-dialog',
-      style: {
-        navigationBarTitleText: '隐私政策弹框'
-      },
-      group: null,
-      items: []
-    } as MenuItem)
   }
 }

pages/tabBar/template.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex: 1; background-color: #f8f8f8" enable-back-to-top="true">
+  <scroll-view style="flex: 1;" enable-back-to-top="true">
   <!-- #endif -->
     <view class="uni-container">
       <view v-if="!hasLeftWin" class="uni-header-logo">

uni_modules/uni-pay-x/pages/success/success.uvue

@@ -40,7 +40,7 @@
 					adpid: "",
 					order_no: "",
 					out_trade_no: "",
-					total_fee: null,
+					total_fee: 0,
 					pay_date: "",
 					return_url: ""
 				} as UTSJSONObject,
@@ -55,9 +55,11 @@
 		// 监听 - 页面每次【加载时】执行(如：前进)
 		onLoad(options) {
 			this.myOptions['adpid'] = options['adpid'];
-			this.myOptions['order_no'] = options['order_no'];
+			this.myOptions['order_no'] = options['order_no'] != null ? options['order_no'] : "-";
 			this.myOptions['out_trade_no'] = options['out_trade_no'];
+			if (options['total_fee'] != null) {
 				this.myOptions['total_fee'] = parseFloat(options['total_fee'] as string);
+			}
 			this.myOptions['pay_date'] = options['pay_date'];
 			this.myOptions['return_url'] = options['return_url'];
 		},
@@ -84,7 +86,7 @@
 				console.log("ad-error", e);
 			},
 			amountFormat(totalFee : number | null) :string{
-				if (totalFee == null) {
+				if (totalFee == null || totalFee == 0) {
 					return "0";
 				} else {
 					return (totalFee / 100).toFixed(2)

uni_modules/uni-upgrade-center-app/changelog.md

+## 0.9.0（2024-10-30）
+- **重要更新** 在 uni-app x 项目中弃用之前弹窗方案使用[dialogPage](https://doc.dcloud.net.cn/uni-app-x/api/dialog-page.html)实现，需要 `HBuilderX 4.31+`
+## 0.8.5（2024-10-26）
+- 优化 去除不必要代码
+## 0.8.4（2024-10-26）
+- 修复  uni-app x 项目升级到 4.31 alpha 后中间有空隙的Bug
 ## 0.8.3（2024-07-31）
 - 修复 部分类型报错
 ## 0.8.2（2024-07-15）

uni_modules/uni-upgrade-center-app/package.json

 {
   "id": "uni-upgrade-center-app",
   "displayName": "升级中心 uni-upgrade-center - App",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "uni升级中心 - 客户端检查更新",
   "keywords": [
     "uniCloud",
@@ -48,7 +48,9 @@
       "client": {
         "App": {
             "app-vue": "y",
-          "app-nvue": "y"
+            "app-nvue": "y",
+            "app-harmony": "u",
+            "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "n",

uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue → uni_modules/uni-upgrade-center-app/pages/uni-app-x/upgrade-popup.uvue

 <template>
-	<view v-show="shown" class="mask flex-center">
+	<view class="mask flex-center">
 		<view class="content">
-
 			<view class="content-top">
 				<text class="content-top-text">{{title}}</text>
 				<image class="content-top-image" mode="widthFix"
 					src="/uni_modules/uni-upgrade-center-app/static/app/bg_top.png"></image>
 			</view>
 
+			<view class="content-space"></view>
+
 			<view class="content-body">
 				<view class="content-body-title">
 					<text class="text title">{{subTitle}}</text>
@@ -29,10 +30,13 @@
 					<template v-else>
 						<template v-if="!downloadSuccess">
 							<view class="progress-box flex-column" v-if="downloading">
-								<progress class="progress" :percent="downLoadPercent" activeColor="#3DA7FF" :show-info="true" :stroke-width="10" />
-								<view style="width:100%;display: flex;justify-content: space-around;flex-direction: row;">
+								<progress class="progress" :percent="downLoadPercent" activeColor="#3DA7FF"
+									:show-info="true" :stroke-width="10" />
+								<view
+									style="width:100%;display: flex;justify-content: space-around;flex-direction: row;">
 									<text class="text" style="font-size: 14px;">{{downLoadingText}}</text>
-									<text class="text" style="font-size: 14px;">({{downloadedSize}}/{{packageFileSize}}M)</text>
+									<text class="text"
+										style="font-size: 14px;">({{downloadedSize}}/{{packageFileSize}}M)</text>
 								</view>
 							</view>
 
@@ -41,7 +45,8 @@
 							</button>
 						</template>
 
-						<button v-else-if="downloadSuccess && !installed" class="content-button" :loading="installing" :disabled="installing" @click="installPackage">
+						<button v-else-if="downloadSuccess && !installed" class="content-button" :loading="installing"
+							:disabled="installing" @click="installPackage">
 							{{installing ? '正在安装……' : '下载完成，立即安装'}}
 						</button>
 
@@ -53,7 +58,8 @@
 			</view>
 
 			<view class="content-bottom">
-				<image v-if="!is_mandatory" class="close-img" mode="widthFix" src="/uni_modules/uni-upgrade-center-app/static/app/app_update_close.png" @click="closeUpdate">
+				<image v-if="!is_mandatory" class="close-img" mode="widthFix"
+					src="/uni_modules/uni-upgrade-center-app/static/app/app_update_close.png" @click="closeUpdate">
 				</image>
 			</view>
 		</view>
@@ -65,27 +71,24 @@
 	import { createNotificationProgress, cancelNotificationProgress, finishNotificationProgress } from '@/uni_modules/uts-progressNotification'
 	import { type CreateNotificationProgressOptions, type FinishNotificationProgressOptions } from '@/uni_modules/uts-progressNotification/utssdk/interface.uts'
 	import { UniUpgradeCenterResult, StoreListItem } from '../../utils/call-check-version'
-
 	const platform_iOS = 'iOS';
 	const platform_Android = 'Android';
 	const requiredKey = ['version', 'url', 'type']
 	let downloadTask : DownloadTask | null = null;
-	let openSchemePromise: Promise<boolean> | null = null;
+	let openSchemePromise : Promise<boolean> | null = null;
 
-	const openSchema = (url: string): Promise<boolean> => new Promise<boolean>((resolve,reject) =>{
-    try{
+	const openSchema = (url : string) : Promise<boolean> => new Promise<boolean>((resolve, reject) => {
+		try {
 			utsOpenSchema(url)
 			resolve(true)
-    }catch(e){
+		} catch (e) {
 			reject(false)
 		}
 	})
 
 	export default {
-    emits: ['close', 'show'],
 		data() {
 			return {
-				shown: false,
 				// 从之前下载安装
 				installForBeforeFilePath: '',
 
@@ -126,26 +129,52 @@
 			isAndroid() : boolean {
 				return this.platform.includes(platform_Android);
 			},
-			needNotificationProgress(): boolean {
+			needNotificationProgress() : boolean {
 				return this.isAndroid && !this.is_mandatory
 			}
 		},
-    beforeUnmount() {
+		onUnload() {
 			if (this.needNotificationProgress) {
 				cancelNotificationProgress()
 			}
 		},
+		onLoad(onLoadOptions: OnLoadOptions) {
+			const local_storage_key: string | null = onLoadOptions['local_storage_key']
+			if (local_storage_key == null) {
+				console.error('local_storage_key为空，请检查后重试')
+				this.closePopup()
+				return;
+			};
+
+			const localPackageInfo = uni.getStorageSync(local_storage_key);
+			if (localPackageInfo == null) {
+				console.error('安装包信息为空，请检查后重试')
+				this.closePopup()
+				return;
+			};
+
+			this.show(JSON.parse<UniUpgradeCenterResult>(JSON.stringify(localPackageInfo)) as UniUpgradeCenterResult)
+		},
+		onBackPress(options : OnBackPressOptions) : boolean | null {
+			if (this.is_mandatory) return true
+			if (!this.needNotificationProgress) {
+				if (downloadTask !== null) {
+					downloadTask!.abort()
+				}
+			}
+			return false
+		},
 		methods: {
 			jumpToAppStore() {
 				openSchema(this.url)
 			},
-			show(shown : boolean, localPackageInfo : UniUpgradeCenterResult | null) {
+			show(localPackageInfo : UniUpgradeCenterResult | null) {
 				if (localPackageInfo === null) return;
 
 				for (let key in localPackageInfo) {
 					if (requiredKey.indexOf(key) != -1 && localPackageInfo[key] === null) {
 						console.error(`参数 ${key} 必填，请检查后重试`)
-						uni.navigateBack()
+						this.closePopup()
 						return;
 					}
 				}
@@ -157,9 +186,6 @@
 				this.platform = localPackageInfo.platform
 				this.version = localPackageInfo.version
 				this.store_list = localPackageInfo.store_list
-				this.shown = shown
-
-        this.$emit('show')
 			},
 			askAbortDownload() {
 				uni.showModal({
@@ -175,23 +201,14 @@
 				});
 			},
 			closeUpdate() {
-				if (this.downloading) {
-					if (this.is_mandatory) {
-						return uni.showToast({
-							title: '下载中，请稍后……',
-							icon: 'none',
-							duration: 500
-						})
-					}
-          if (!this.needNotificationProgress) {
+				if (this.downloading && !this.needNotificationProgress) {
 					this.askAbortDownload()
 					return;
 				}
-				}
+
 				this.closePopup()
 			},
 			closePopup() {
-				this.shown = false
 				this.downloadSuccess = false
 				this.downloading = false
 				this.downLoadPercent = 0
@@ -202,8 +219,9 @@
 				this.installing = false
 				this.installed = false
 
-        if (this.needNotificationProgress) cancelNotificationProgress()
-        this.$emit('close')
+				uni.closeDialogPage({
+					dialogPage: this.$page
+				})
 			},
 			updateApp() {
 				const checkStoreScheme = this.checkStoreScheme()
@@ -217,18 +235,18 @@
 				} else { this.downloadPackage() }
 			},
 			// 跳转应用商店
-      checkStoreScheme(): Promise<boolean> | null {
+			checkStoreScheme() : Promise<boolean> | null {
 				if (this.store_list !== null) {
-          const storeList: StoreListItem[] = this.store_list!.filter((item: StoreListItem): boolean => item.enable)
+					const storeList : StoreListItem[] = this.store_list!.filter((item : StoreListItem) : boolean => item.enable)
 					if (storeList.length > 0) {
 						if (openSchemePromise === null) {
 							openSchemePromise = Promise.reject() as Promise<boolean>
 						}
 						storeList
-              .sort((cur: StoreListItem, next: StoreListItem): number => next.priority - cur.priority)
-              .map((item: StoreListItem): string => item.scheme)
-              .reduce((promise: Promise<boolean>, cur: string): Promise<boolean> => {
-                openSchemePromise = promise.catch<boolean>((): Promise<boolean> => openSchema(cur))
+							.sort((cur : StoreListItem, next : StoreListItem) : number => next.priority - cur.priority)
+							.map((item : StoreListItem) : string => item.scheme)
+							.reduce((promise : Promise<boolean>, cur : string) : Promise<boolean> => {
+								openSchemePromise = promise.catch<boolean>(() : Promise<boolean> => openSchema(cur))
 								return openSchemePromise!
 							}, openSchemePromise!)
 						return openSchemePromise!
@@ -290,7 +308,7 @@
 					finishNotificationProgress({
 						title: "安装升级包",
 						content: "下载完成",
-            onClick(){}
+						onClick() { }
 					} as FinishNotificationProgressOptions)
 
 					this.installPackage();
@@ -308,7 +326,6 @@
 				uni.installApk({
 					filePath: this.tempFilePath,
 					success: _ => {
-						console.log('installApk success');
 						this.installing = false;
 						this.installed = true;
 					},
@@ -372,6 +389,15 @@
 		border-bottom-style: solid;
 	}
 
+	.content-space {
+		width: 100%;
+		height: 50px;
+		background-color: #fff;
+		position: absolute;
+		top: 140px;
+		z-index: -1;
+	}
+
 	.content-top-image {
 		width: 100%;
 		position: relative;

uni_modules/uni-upgrade-center-app/utils/check-update.ts

@@ -6,13 +6,7 @@ import { openSchema } from '@/uni_modules/uts-openSchema'
 // 推荐再App.vue中使用
 const PACKAGE_INFO_KEY = '__package_info__'
 
-// uni-app 项目无法从 vue 中导出 ComponentPublicInstance 类型，故使用条件编译
-// #ifdef UNI-APP-X
-export default function (component : ComponentPublicInstance | null = null) : Promise<UniUpgradeCenterResult> {
-// #endif
-// #ifndef UNI-APP-X
 export default function () : Promise<UniUpgradeCenterResult> {
-// #endif
 	return new Promise<UniUpgradeCenterResult>((resolve, reject) => {
 		callCheckVersion().then(async (uniUpgradeCenterResult) => {
 			// NOTE uni-app x 3.96 解构有问题
@@ -54,8 +48,8 @@ export default function () : Promise<UniUpgradeCenterResult> {
 					 * 提示升级二
 					 * 官方适配的升级弹窗，可自行替换资源适配UI风格
 					 */
-          // #ifndef UNI-APP-X
 					uni.setStorageSync(PACKAGE_INFO_KEY, uniUpgradeCenterResult)
+					// #ifndef UNI-APP-X
 					uni.navigateTo({
 						url: `/uni_modules/uni-upgrade-center-app/pages/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
 						fail: (err) => {
@@ -65,7 +59,14 @@ export default function () : Promise<UniUpgradeCenterResult> {
 					})
 					// #endif
 					// #ifdef UNI-APP-X
-          component?.$callMethod('show', true, uniUpgradeCenterResult)
+          uni.openDialogPage({
+            url: `/uni_modules/uni-upgrade-center-app/pages/uni-app-x/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
+            disableEscBack: true,
+                fail: (err) => {
+                  console.error('更新弹框跳转失败', err)
+                  uni.removeStorageSync(PACKAGE_INFO_KEY)
+                }
+          })
 					// #endif
 
 					return resolve(uniUpgradeCenterResult)