1.修改首页 top样式和自动轮播

2.修改部门管理样式和计算滚动内容区域
v2
king 1 year ago
parent 4d2b83b950
commit 85da032f41
  1. 2
      src/components/tabs/tabs.scss
  2. 5
      src/pages/home/components/feature_recommended.tsx
  3. 5
      src/pages/home/home.module.scss
  4. 2
      src/pages/home/home.tsx
  5. 12
      src/pages/manage/depAdmin/depAdmin.scss
  6. 2
      src/pages/manage/depAdmin/depAdmin.tsx
  7. 2
      src/pages/preview/illness/sort/sort.module.scss
  8. 5
      src/pages/preview/illness/sort/sort.tsx

@ -35,7 +35,7 @@
} }
.tabs-item { .tabs-item {
padding: 16rpx 20rpx; padding: 16rpx 25rpx;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Medium, PingFang SC; font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;

@ -151,7 +151,7 @@ const FeatureRecommended: FC<Props> = (props) => {
return ( return (
<View className={styles.feature}> <View className={styles.feature}>
<Swiper nextMargin='30px' style={{height: '450rpx'}}> <Swiper nextMargin='30px' style={{height: '390rpx'}} circular autoplay>
{ {
data.map(d => <SwiperItem key={d.url}> data.map(d => <SwiperItem key={d.url}>
<Image <Image
@ -160,7 +160,8 @@ const FeatureRecommended: FC<Props> = (props) => {
onClick={() => jump(d.url)} src={d.titleUrl}/> onClick={() => jump(d.url)} src={d.titleUrl}/>
{ {
d.data.length > 0 && d.data.map((c, index) => <View d.data.length > 0 && d.data.map((c, index) => <View
className='flex mb-3' className='flex'
style={{marginBottom: '16rpx'}}
key={c.id} key={c.id}
onClick={() => jump(d.detailsUrl + c.path, c.id, d.type)}> onClick={() => jump(d.detailsUrl + c.path, c.id, d.type)}>
<View style={{position: 'relative'}}> <View style={{position: 'relative'}}>

@ -139,7 +139,6 @@
.featureTitle { .featureTitle {
max-width: 212px; max-width: 212px;
height: 50rpx; height: 50rpx;
padding-bottom: 10rpx;
} }
.featureText { .featureText {
@ -166,13 +165,13 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
-o-text-overflow: ellipsis; -o-text-overflow: ellipsis;
line-height: 3; margin-top: 8rpx;
} }
.ranking { .ranking {
top: 0; top: 0;
position: absolute; position: absolute;
left: 24rpx; left: 12rpx;
width: 30px; width: 30px;
height: 30px; height: 30px;
} }

@ -52,7 +52,7 @@ const Home: FC = () => {
leftNode={ leftNode={
<> <>
<Image src={logo} style={{height: "110%"}} mode='heightFix'/> <Image src={logo} style={{height: "110%"}} mode='heightFix'/>
<Text className='ml-1 font-36'></Text> <Text className='font-36 font-weight'></Text>
</> </>
} }
> >

@ -1,13 +1,23 @@
.content {
margin-top: 20rpx;
background: white;
min-height: calc(100vh - 20rpx);
box-sizing: border-box;
padding-bottom: calc(env(safe-area-inset-bottom) + 80rpx);
}
.operation { .operation {
width: 100%; width: 100%;
background: #F5F8F7; background: #F5F8F7;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
padding: 30px 0; align-items: center;
color: #45D4A8; color: #45D4A8;
left: 0; left: 0;
.safeAreaInsetBottom { .safeAreaInsetBottom {
height: 80rpx;
align-items: center;
justify-content: space-around; justify-content: space-around;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
display: flex; display: flex;

@ -141,7 +141,7 @@ const DepAdmin: FC = () => {
return ( return (
<> <>
<Spin overlay enable={enable}/> <Spin overlay enable={enable}/>
<View> <View className='content'>
{manages.map(d => <PopPut {manages.map(d => <PopPut
key={d.id} key={d.id}
title={d.name} title={d.name}

@ -10,7 +10,7 @@
} }
.firstOrder { .firstOrder {
width: 200rpx; width: 260rpx;
height: 100%; height: 100%;
View { View {

@ -8,7 +8,6 @@ import {illnessApi} from "@/api/illness";
import Empty from "@/components/empty/empty"; import Empty from "@/components/empty/empty";
import leftArrow from "@/static/img/leftArrow.png" import leftArrow from "@/static/img/leftArrow.png"
import Spin from "@/components/spinner"; import Spin from "@/components/spinner";
// import NavigationBar from "@/components/navigationBar/navigationBar";
const prefix = 'SORT' const prefix = 'SORT'
const Sort: FC = () => { const Sort: FC = () => {
@ -90,8 +89,7 @@ const Sort: FC = () => {
<View <View
className="flex flex-column align-center justify-center" className="flex flex-column align-center justify-center"
style={{width:globalData.textBarHeight+'px', height: globalData.textBarHeight+'px'}} style={{width:globalData.textBarHeight+'px', height: globalData.textBarHeight+'px'}}
onClick={() => Taro.navigateBack()} onClick={() => Taro.navigateBack()}>
>
<Image <Image
src={leftArrow} src={leftArrow}
mode='widthFix' mode='widthFix'
@ -108,7 +106,6 @@ const Sort: FC = () => {
</View> </View>
</View> </View>
{/*<Search onConfirm={onConfirm}/>*/}
<Swiper <Swiper
onChange={swiperChange} onChange={swiperChange}

Loading…
Cancel
Save