Skip to content

严立 / mini-shimao

Go to a project
Commit e034c80f by 严立
Options

首页调整

parent 36d8dfb0
Inline Side-by-side
Showing with 77 additions and 34 deletions
component/home-activity/home-activity.js
......@@ -13,7 +13,7 @@ Component({
data: {
list: [],
disableOperation: '',
disableOperation: false,
},
observers: {
......@@ -40,7 +40,7 @@ Component({
break
case 1:
list.push(nothindItem)
list.unshift(nothindItem)
list.push(nothindItem)
this.setData({
list: list,
......@@ -52,21 +52,21 @@ Component({
list.push(nothindItem)
this.setData({
list: list,
disableOperation: ''
disableOperation: false
})
break
case 3:
this.setData({
list: list,
disableOperation: ''
disableOperation: false
})
break
default:
this.setData({
list: list,
disableOperation: ''
disableOperation: false
})
break
}
......
component/home-activity/home-activity.wxml
<view class="swiper-container column cc ac">
<swiper class="swiper-list" circular="{{true}}" current="{{currentIndex}}">
<swiper-item class="swiper-item" wx:for="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="index" catchtouchmove="{{disableOperation}}">
<view wx:if="{{!item.isNothing}}" class="card row ae" data-item="{{item}}" bindtap="onItem">
<view class="card-content column cc">
<image class="card-cover" mode="heightFix" src="{{item.banner}}"></image>
<view class="card-name row ac">
<text class="fs38 fw700 c01 overflow_point_1">{{item.name}}</text>
<block wx:if="{{disableOperation}}">
<view class="swiper-list prohibit-move row ac">
<view class="swiper-item" wx:for="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{!item.isNothing}}" class="card row ae" data-item="{{item}}" bindtap="onItem">
<view class="card-content column cc">
<view class="card-cover row cc ac">
<image class="card-cover-image" mode="heightFix" src="{{item.banner}}"></image>
</view>
<view class="card-name row ac">
<text class="fs38 fw700 c01 overflow_point_1">{{item.name}}</text>
</view>
<view class="card-date row ac">
<text class="fs22 fw400 c32">{{item.timeDate + item.timePeriod}}</text>
</view>
</view>
<view class="card-date row ac">
<text class="fs22 fw400 c32">{{item.timeDate + item.timePeriod}}</text>
</view>
<view wx:if="{{item.isNothing}}">
<view class="card-content-nothing column cc ac">
<image class="nothing-icon" src="./image/nothing.png"></image>
<text class="nothing-tip">更多活动 敬请期待</text>
</view>
</view>
</view>
<view wx:if="{{item.isNothing}}">
<view class="card-content-nothing column cc ac">
<image class="nothing-icon" src="./image/nothing.png"></image>
<text class="nothing-tip">更多活动 敬请期待</text>
</view>
</block>
<block wx:if="{{!disableOperation}}">
<swiper class="swiper-list" circular="{{true}}" current="{{currentIndex}}">
<swiper-item class="swiper-item" wx:for="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view wx:if="{{!item.isNothing}}" class="card row ae" data-item="{{item}}" bindtap="onItem">
<view class="card-content column cc">
<image class="card-cover" mode="heightFix" src="{{item.banner}}"></image>
<view class="card-name row ac">
<text class="fs38 fw700 c01 overflow_point_1">{{item.name}}</text>
</view>
<view class="card-date row ac">
<text class="fs22 fw400 c32">{{item.timeDate + item.timePeriod}}</text>
</view>
</view>
</view>
</view>
</swiper-item>
</swiper>
<view wx:if="{{item.isNothing}}">
<view class="card-content-nothing column cc ac">
<image class="nothing-icon" src="./image/nothing.png"></image>
<text class="nothing-tip">更多活动 敬请期待</text>
</view>
</view>
</swiper-item>
</swiper>
</block>
</view>
\ No newline at end of file
component/home-activity/home-activity.wxss
......@@ -2,17 +2,20 @@
/* 券码弹窗 */
.swiper-container {
position: relative;
width: 750rpx;
margin: 30rpx 0 0 0;
padding: 20rpx 0 0 0;
}
.swiper-list {
white-space: nowrap;
width: 750rpx;
height: 570rpx;
}
.swiper-item {
display: inline-block;
left: 110rpx;
width: 500rpx !important;
height: 570rpx !important;
......@@ -31,7 +34,7 @@
padding: 380rpx 50rpx 0 50rpx;
border-radius: 2px;
background: #EEF3F9;
overflow: visible;
overflow: hidden;
}
.card-cover {
......@@ -41,6 +44,13 @@
width: 400rpx;
height: 400rpx;
border-radius: 2px;
overflow: hidden;
}
.card-cover-image {
width: 400rpx;
height: 400rpx;
border-radius: 2px;
}
.card-name {
......@@ -72,4 +82,16 @@
color: #959da9;
line-height: 42rpx;
font-weight: 600;
}
.prohibit-move {
position: relative;
left: -440rpx;
}
.prohibit-move .swiper-item {
position: relative;
top: 0;
left: 0;
margin: 0 16rpx;
}
\ No newline at end of file
pages/home/home/home.js
......@@ -9,8 +9,6 @@ Page({
// 近期活动
recentActivitiesList: [],
recentActivitiesListA: [],
recentActivitiesListB: [],
// 游客攻略
touristRouteList: [],
......@@ -178,11 +176,8 @@ Page({
}
funcList.push(funcItem)
}
console.log(funcList)
this.setData({ recentActivitiesList: JSON.parse(JSON.stringify(funcList)) })
funcList.push(this.data.recentActivitiesList[0])
this.setData({ recentActivitiesListA: JSON.parse(JSON.stringify(funcList)) })
funcList.push(this.data.recentActivitiesList[0])
this.setData({ recentActivitiesListB: JSON.parse(JSON.stringify(funcList)) })
}).catch((response) => {
})
......
pages/home/home/home.wxml
......@@ -112,15 +112,10 @@
<text class="fs26 fw400 c31" bindtap="onAllActivity">查看全部</text>
</view>
<view class="recent_activities_list row" bindchange="swiperRecentChange">
<home-activity contentList="{{[]}}" bind:onItem="onActivityDetail"></home-activity>
<!-- <home-activity contentList="{{recentActivitiesList}}" bind:onItem="onActivityDetail"></home-activity> -->
<home-activity contentList="{{recentActivitiesList}}" bind:onItem="onActivityDetail"></home-activity>
</view>
</view>
<home-activity contentList="{{recentActivitiesList}}" bind:onItem="onActivityDetail"></home-activity>
<home-activity contentList="{{recentActivitiesListA}}" bind:onItem="onActivityDetail"></home-activity>
<home-activity contentList="{{recentActivitiesListB}}" bind:onItem="onActivityDetail"></home-activity>
<!-- 游客攻略 -->
<view class="route">
<block wx:if="{{touristRouteList.length > 0}}">
......
pages/home/home/home.wxss
......@@ -396,6 +396,7 @@
.recent_activities_list {
width: 750rpx;
overflow: hidden;
}
/* 游客攻略 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment