@kaiyinchem/ky-uniui 1.1.16 → 1.1.18

package/components/ky-btn.vue

@@ -56,11 +56,7 @@
     	<slot v-else name="content"></slot>
     </view>
     <!--位置占位-->
-    <view
-      v-if="fixed"
-      :class="{ iphoneX: safeBottom > 0, noPadding }"
-      class="btn-space">
-    </view>
+    <view v-if="fixed" class="btn-space"></view>
   </view>
 </template>
 
@@ -156,9 +152,6 @@
 		hasSlots() {
 			return Object.keys(this.$slots).length
 		},
-		safeBottom() {
-			return uni.getSystemInfoSync().safeAreaInsets.bottom
-		}
 	 },
    methods: {
      onClick(e) {
@@ -365,9 +358,10 @@
 			right: 0;
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
+			justify-content: center;
 			&.hasLeft {
 				height: 90rpx;
+				justify-content: space-between;
 				.btn-main {
 					width: 200rpx;
 					margin: 0;
@@ -413,15 +407,9 @@
 		}
 	}
   .btn-space {
-    height: 120rpx;
-    &.iphoneX {
-    	height: 150rpx;
-    }
+    height: calc(120rpx + var(--window-bottom));
     &.noPadding {
-      height: 90rpx;
-      &.iphoneX {
-      	height: 120rpx;
-      }
+      height: calc(90rpx + var(--window-bottom));
     }
   }
 	

package/components/ky-fetch.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 		
-		<view v-if="loadState === 0 || !loadState" :class="{ isRelative }" class="ky-fetch-loading">
+		<view v-if="loadState === 0 || !loadState" :class="{ isRelative, hasLoadingSlots: !!$slots.loading }" class="ky-fetch-loading">
 			<ky-loading v-if="!$slots.loading" :type="loadingType" :isRelative="isRelative"></ky-loading>
 			<slot name="loading"></slot>
 		</view>
@@ -320,6 +320,10 @@
 			position: relative;
 			min-height: 100rpx;
 		}
+		&.hasLoadingSlots {
+			padding: 0;
+			min-height: inherit;
+		}
 	}
 	.ky-fetch-error {
 		position: absolute;

package/components/ky-pop.vue

@@ -53,10 +53,10 @@
 						</view>
 						<view v-if="$slots.footer" :class="{'white-bg': !noFooterBg}" class="pop-footer">
 							<slot name="footer"></slot>
-							<view :style="{height: $safeBottom - 15 + 'px'}"></view>
+							<view style="{height: var(--window-bottom)}"></view>
 						</view>
 						<!--iPhoneX等机型手势条底部高度-->
-						<view v-if="!$slots.footer" :style="{height: $safeBottom - 15 + 'px'}"></view>
+						<view v-if="!$slots.footer" style="{height: var(--window-bottom)}"></view>
 					</view>
 					<!--############## end 底部弹出层 ##############-->
 
@@ -283,9 +283,6 @@
 			hasSlots() {
 				return Object.keys(this.$slots).length
 			},
-			$safeBottom() {
-				return uni.getSystemInfoSync().safeAreaInsets.bottom
-			}
 		},
 		watch: {
 			value(v) {

package/components/ky-switch.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	const isDark = uni.getSystemInfoSync().theme === 'dark'
+	const isDark = uni.getAppBaseInfo().theme !== 'light'
 	
 	export default {
 		emits: ['update:value', 'change'],

package/components/ky-tab.vue

@@ -4,7 +4,6 @@
     :class="{
       fixed: position === 'fixed',
       sticky: position === 'sticky',
-      iphonex: $safeBottom > 0 && position === 'fixed',
       icon: hasIcon,
       scroll: scrollX,
 			card: type === 'card',
@@ -121,9 +120,6 @@
       hasIcon() {
         return this.menu.find(e => e.icon)
       },
-      $safeBottom() {
-      	return uni.getSystemInfoSync().safeAreaInsets.bottom
-      }
     },
 		mounted() {
 			this.onTabClick(typeof this.value !== 'undefined' ? this.value : this.index)
@@ -213,7 +209,7 @@
       right: 0;
       bottom: 0;
       &.iphonex {
-        padding-bottom: 50rpx;
+        padding-bottom: var(--window-bottom);
       }
     }
     &.sticky {

package/package.json

@@ -9,7 +9,7 @@
 		"locale"
   ],
   "description": "an uniapp ui",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yezipi/ky-uniui.git"
@@ -27,7 +27,7 @@
   "scripts": {},
   "license": "ISC",
   "dependencies": {
-    "@dcloudio/uni-ui": "^1.4.28",
-    "vue-i18n": "^9.13.1"
+    "@dcloudio/uni-ui": "^1.5.1",
+    "vue-i18n": "^11.2.8"
   }
 }