uview last to 220118-16:39:58

gooking · gooking · commit 6011fa3e7e2a · 2022-01-18T16:40:15.000+08:00
diff --git a/uni_modules/uview-ui/components/u-back-top/u-back-top.vue b/uni_modules/uview-ui/components/u-back-top/u-back-top.vue
@@ -64,15 +64,7 @@
 				return style
 			},
 			show() {
-				let top
-				// 如果是rpx，转为px
-				if (/rpx$/.test(this.top)) {
-					top = uni.rpx2px(parseInt(this.top))
-				} else {
-					// 如果px，通过parseInt获取其数值部分
-					top = parseInt(this.top)
-				}
-				return this.scrollTop > top
+				return uni.$u.getPx(this.scrollTop) > uni.$u.getPx(this.top)
 			},
 			contentStyle() {
 				const style = {}
diff --git a/uni_modules/uview-ui/components/u-number-box/u-number-box.vue b/uni_modules/uview-ui/components/u-number-box/u-number-box.vue
@@ -134,8 +134,7 @@
 		computed: {
 			getCursorSpacing() {
 				// 判断传入的单位，如果为px单位，需要转成px
-				const number = parseInt(this.cursorSpacing)
-				return /rpx$/.test(String(this.cursorSpacing)) ? uni.upx2px(number) : number
+				return uni.$u.getPx(this.cursorSpacing)
 			},
 			// 按钮的样式
 			buttonStyle() {
diff --git a/uni_modules/uview-ui/components/u-sticky/u-sticky.vue b/uni_modules/uview-ui/components/u-sticky/u-sticky.vue
@@ -135,13 +135,7 @@
 				observer && observer.disconnect()
 			},
 			getStickyTop() {
-				if (/rpx$/.test(this.customNavHeight)) {
-					// rpx单位需要转为px单位，才能直接相加
-					this.stickyTop = parseInt(this.offsetTop) + parseInt(uni.rpx2px(this.customNavHeight))
-				} else {
-					// 无论customNavHeight为数值(默认px单位)，还是12px(parseInt后为12)之类转换后都为数值，可以直接相加
-					this.stickyTop = parseInt(this.offsetTop) + parseInt(this.customNavHeight)
-				}
+				this.stickyTop = uni.$u.getPx(this.offsetTop) + uni.$u.getPx(this.customNavHeight)
 			},
 			async checkSupportCssSticky() {
 				// #ifdef H5
diff --git a/uni_modules/uview-ui/components/u-subsection/u-subsection.vue b/uni_modules/uview-ui/components/u-subsection/u-subsection.vue
@@ -159,7 +159,7 @@ export default {
                 // subsection模式下，激活时默认为白色的文字
                 if (this.mode === "subsection") {
                     style.color =
-                        this.current === index ? "#fff" : this.activeColor;
+                        this.current === index ? "#fff" : this.inactiveColor;
                 } else {
                     // button模式下，激活时文字颜色默认为activeColor
                     style.color =
diff --git a/uni_modules/uview-ui/components/u-upload/utils.js b/uni_modules/uview-ui/components/u-upload/utils.js
@@ -127,6 +127,25 @@ export function chooseFile({
             // #endif
             break
 				// #endif
+		default: 
+			// 此为保底选项，在accept不为上面任意一项的时候选取全部文件
+			// #ifdef MP-WEIXIN
+			wx.chooseMessageFile({
+			    count: multiple ? maxCount : 1,
+			    type: 'all',
+			    success: (res) => resolve(formatFile(res)),
+			    fail: reject
+			})
+			// #endif
+			// #ifdef H5
+			// 需要hx2.9.9以上才支持uni.chooseFile
+			uni.chooseFile({
+				count: multiple ? maxCount : 1,
+				type: 'all',
+				success: (res) => resolve(formatFile(res)),
+				fail: reject
+			})
+			// #endif
         }
     })
 }
diff --git a/uni_modules/uview-ui/libs/config/props/navbar.js b/uni_modules/uview-ui/libs/config/props/navbar.js
@@ -13,7 +13,7 @@ export default {
     navbar: {
         safeAreaInsetTop: true,
         placeholder: false,
-        fixed: false,
+        fixed: true,
         border: false,
         leftIcon: 'arrow-left',
         leftText: '',
