ming 3 yıl önce
ebeveyn
işleme
7622be82a7

+ 0 - 4
components/fs-avatar/fs-avatar.vue

@@ -145,9 +145,5 @@ const handlePreview = () => {
 		align-items: center;
 		color: #fff;
 	}
-	
-	& + &{
-		margin-left: -20rpx;
-	}
 }
 </style>

+ 1 - 2
components/fs-empty/fs-empty.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="fs-empty-box">
+	<view class="fs-empty-box" :style="{padding: padding}">
 		<image :src="src" mode="widthFix" style="width: 400rpx;"></image>
 		<view class="content">{{text}}</view>
 	</view>
@@ -27,7 +27,6 @@ const props = defineProps({
 <style lang="scss" scoped>
 .fs-empty-box{
 	text-align: center;
-	padding: var(padding);
 	
 	.content{
 		margin-top: 20rpx;

+ 3 - 1
components/fs-loadmore/fs-loadmore.vue

@@ -2,7 +2,9 @@
 	<view>
 		<slot></slot>
 		<fs-empty v-if="!state.loading && !state.dataList.length"></fs-empty>
-		<fs-divider v-if="!state.hasMore">{{nomore}}</fs-divider>
+		<template v-else>
+			<fs-divider v-if="!state.hasMore">{{nomore}}</fs-divider>
+		</template>
 	</view>
 </template>
 

+ 1 - 1
components/fs-message/fs-message.vue

@@ -92,7 +92,7 @@ defineExpose({
 <style lang="scss" scoped>
 .fs-message{
 	position: fixed;
-	top: 0;
+	top: var(--window-top);
 	left: 0;
 	right: 0;
 	padding: 20rpx;

+ 1 - 1
components/fs-notice-bar/fs-notice-bar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="fs-notice-bar" :animation="animationData" :style="{backgroundColor: bgColor, color}" v-if="visible">
-		<fs-icon v-if="showIcon" class="fs-notice-bar-notice" type="icon-notice1" :color="color"></fs-icon>
+		<fs-icon v-if="showIcon" class="fs-notice-bar-notice" type="icon-sound" :color="color"></fs-icon>
 		<swiper
 			class="fs-notice-bar-swiper"
 			autoplay

+ 3 - 3
components/fs-search/fs-search.vue

@@ -15,11 +15,11 @@
 			/>
 			<view class="fs-icon fs-icon-search">
 				<slot name="icon">
-					<fs-icon type="icon-search" color="#666666" size="32rpx"></fs-icon>
+					<fs-icon type="icon-search" color="#666666" size="28rpx"></fs-icon>
 				</slot>
 			</view>
 			<view class="fs-icon fs-icon-close" v-if="modelValue" @click="handleClear">
-				<fs-icon type="icon-close" color="#666666"></fs-icon>
+				<fs-icon type="icon-close-circle" color="#666666"></fs-icon>
 			</view>
 		</view>
 		<view 
@@ -136,7 +136,7 @@
 .fs-input{
   height: 100%;
   width: 100%;
-  padding-left: 62rpx;
+  padding-left: 68rpx;
   padding-right: 60rpx;
   border-radius: 6rpx;
   box-sizing: border-box;

+ 1 - 2
components/fs-sidebar/fs-sidebar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="fs-side-bar">
-		<view class="fs-side-bar-left">
+		<view class="fs-side-bar-left" :style="{width: width}">
 			<view 
 				class="fs-side-bar-item line1"
 				:class="{'fs-side-bar-active': activeId ? (activeId === item[valueKey]) : (index === 0)}"
@@ -58,7 +58,6 @@ const handleClick = (item, index) => {
 	height: 100%;
 	
 	&-left{
-		width: v-bind(width);
 		flex-shrink: 0;
 		background-color: #fafafa;
 		overflow: auto;

+ 1 - 1
components/fs-tag/fs-tag.vue

@@ -20,7 +20,7 @@
 		<fs-icon
 			class="fs-tag-close"
 			size="13px"
-			type="icon-close1"
+			type="icon-close"
 			v-if="closable"
 			@click="handleClosed">
 		</fs-icon>