xt / xcx-book · Commits

Go to a project

Commit 5780a53343af929021313ccae73689c58dcf07f6

Authored by vking
1 parent 1a37a25a
build: skipped

fix list & detail ui

Inline Side-by-side
Showing 2 changed files with 12 additions and 11 deletions
@@ -61,11 +61,11 @@ @@ -61,11 +61,11 @@
61 <view class="activity-view-easy flex-lr" > 61 <view class="activity-view-easy flex-lr" >
62 <view class="activity-left flex-ll"> 62 <view class="activity-left flex-ll">
63 <view class="icon"></view> 63 <view class="icon"></view>
64 - <view class="flex-ll discount" wx:for="{{seller.activity}}"  
65 - wx:key="seller.activity.key"  
66 - wx:if="{{index<2}}">  
67 - {{item.title}}  
68 - </view> 64 + <block wx:for="{{seller.activity}}"
  65 + wx:key="seller.activity.key"
  66 + wx:if="{{index<2}}">
  67 + <view class="discount" >{{item.title}}</view>
  68 + </block>
69 </view> 69 </view>
70 <view class="flex-rr activity-right"> 70 <view class="flex-rr activity-right">
71 <view class="more-text">更多</view> 71 <view class="more-text">更多</view>
@@ -316,9 +316,10 @@ @@ -316,9 +316,10 @@
316 color: #C28C56; 316 color: #C28C56;
317 } 317 }
318 .more{ 318 .more{
319 - background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%B3%E7%AE%AD%E5%A4%B4.png"); 319 + background-image: url("https://qn.colorcun.com/reserve/images/m713.png");
320 margin-left: 20rpx; 320 margin-left: 20rpx;
321 - height: 24rpx; 321 + height: 26rpx;
  322 + width: 14rpx;
322 } 323 }
323 .discount{ 324 .discount{
324 margin-right: 20rpx; 325 margin-right: 20rpx;
@@ -438,7 +439,7 @@ @@ -438,7 +439,7 @@
438 height: 40rpx; 439 height: 40rpx;
439 line-height: 40rpx; 440 line-height: 40rpx;
440 background-color: #FFF5EB; 441 background-color: #FFF5EB;
441 - padding: 0 8rpx; 442 + padding: 4rpx 8rpx;
442 } 443 }
443 444
444 .activity-view-easy{ 445 .activity-view-easy{
@@ -450,12 +451,10 @@ @@ -450,12 +451,10 @@
450 line-height: 120rpx; 451 line-height: 120rpx;
451 } 452 }
452 .activity-view-easy .icon{ 453 .activity-view-easy .icon{
453 - background-image: url("https://qn.colorcun.com/reserve/images/ad.png"); 454 + background-image: url("https://qn.colorcun.com/reserve/images/ad2.png");
454 width: 30rpx; 455 width: 30rpx;
455 height: 32rpx; 456 height: 32rpx;
456 background-size: 100% 100%; 457 background-size: 100% 100%;
457 - margin-top: 8rpx;  
458 - margin-right: 20rpx;  
459 } 458 }
460 .activity-view-easy .discount{ 459 .activity-view-easy .discount{
461 border-right: 2rpx #C0A369 solid; 460 border-right: 2rpx #C0A369 solid;
@@ -463,6 +462,8 @@ @@ -463,6 +462,8 @@
463 line-height: 30rpx; 462 line-height: 30rpx;
464 font-size: 30rpx; 463 font-size: 30rpx;
465 padding-right: 20rpx; 464 padding-right: 20rpx;
  465 + padding-left: 20rpx;
  466 + margin-right: 0;
466 } 467 }
467 .activity-view-easy .discount:last-child{ 468 .activity-view-easy .discount:last-child{
468 border-right-width: 0; 469 border-right-width: 0;