xt / xcx-book · Commits

Go to a project

Commit d604ec1f96a12f56472891bf138e931db21e58b9

Authored by wangfan
1 parent d780b488
build: skipped

activity

Inline Side-by-side
Showing 4 changed files with 8 additions and 4 deletions
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <stat stat="{{seller.score}}"></stat> 11 <stat stat="{{seller.score}}"></stat>
12 </view> 12 </view>
13 <view wx:if="{{hasActivity}}" class="activity flex-ll"> 13 <view wx:if="{{hasActivity}}" class="activity flex-ll">
14 - <view wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}"> 14 + <view wx:for="{{seller.activity}}" class="activity-item flex-vc" wx:key="seller.activity.key" wx:if="{{index<3}}">
15 {{item.title}} 15 {{item.title}}
16 </view> 16 </view>
17 </view> 17 </view>
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 } 81 }
82 .activity-item{ 82 .activity-item{
83 height: 34rpx; 83 height: 34rpx;
84 - width: 100rpx; 84 + width: 104rpx;
85 line-height: 34rpx; 85 line-height: 34rpx;
86 overflow: hidden; 86 overflow: hidden;
87 max-height: 34rpx; 87 max-height: 34rpx;
@@ -89,6 +89,8 @@ @@ -89,6 +89,8 @@
89 border: 2rpx solid #F8A990; 89 border: 2rpx solid #F8A990;
90 margin-left: 10rpx; 90 margin-left: 10rpx;
91 text-align: center; 91 text-align: center;
  92 + overflow: hidden;
  93 + white-space:nowrap;
92 } 94 }
93 .activity-item:first-child{ 95 .activity-item:first-child{
94 margin-left: 0; 96 margin-left: 0;
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <view class="icon car" wx:if="{{seller.is_parking==1}}">停车场</view> 31 <view class="icon car" wx:if="{{seller.is_parking==1}}">停车场</view>
32 </view> 32 </view>
33 </view> 33 </view>
34 - <formids wx:if="{{seller.activity.length>0}}" url="{{seller.activity.length>2?'/pages/reserve/activity?id='+seller.id:''}}"> 34 + <formids wx:if="{{seller.activity.length>0}}" url="/pages/reserve/activity?id={{seller.id}}">
35 <view class="activity flex-lr" > 35 <view class="activity flex-lr" >
36 <view class="activity-left"> 36 <view class="activity-left">
37 <view class="activity-first flex-ll" style="align-items: flex-start"> 37 <view class="activity-first flex-ll" style="align-items: flex-start">
@@ -249,6 +249,7 @@ @@ -249,6 +249,7 @@
249 line-height: 42rpx; 249 line-height: 42rpx;
250 overflow: hidden; 250 overflow: hidden;
251 text-align: left; 251 text-align: left;
  252 + height: 42rpx;
252 } 253 }
253 .activity-first image{ 254 .activity-first image{
254 width: 30rpx; 255 width: 30rpx;
@@ -256,7 +257,7 @@ @@ -256,7 +257,7 @@
256 margin-right: 20rpx; 257 margin-right: 20rpx;
257 min-width: 30rpx; 258 min-width: 30rpx;
258 margin-left: 8rpx; 259 margin-left: 8rpx;
259 - margin-top: 7rpx; 260 + margin-top: 8rpx;
260 } 261 }
261 .activity-text{ 262 .activity-text{
262 margin-left: 60rpx; 263 margin-left: 60rpx;
@@ -265,6 +266,7 @@ @@ -265,6 +266,7 @@
265 margin-top: 10rpx; 266 margin-top: 10rpx;
266 overflow: hidden; 267 overflow: hidden;
267 text-align: left; 268 text-align: left;
  269 + height: 42rpx;
268 } 270 }
269 .more{ 271 .more{
270 background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png"); 272 background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png");