Commit 107821d658633fb5c3dacd93b262bf1f0599ad5b

Authored by zhangyan
1 parent 796d9c27

no message

@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 </block> 64 </block>
65 </swiper> 65 </swiper>
66 </view> 66 </view>
67 -<view class="topic"> 67 +<view class="topic flex-lr">
68 <swiper display-multiple-items="2" next-margin="80"> 68 <swiper display-multiple-items="2" next-margin="80">
69 <swiper-item> 69 <swiper-item>
70 <view class="pet-block"> 70 <view class="pet-block">
@@ -78,12 +78,6 @@ @@ -78,12 +78,6 @@
78 <view class="white-font font28r font-siny pet-mask flex-cm">#宠物照片集</view> 78 <view class="white-font font28r font-siny pet-mask flex-cm">#宠物照片集</view>
79 </view> 79 </view>
80 </swiper-item> 80 </swiper-item>
81 - <swiper-item>  
82 - <view class="pet-block">  
83 - <image src="/pages/image/topic3.jpg" class="topic-image"></image>  
84 - <view class="white-font font28r font-siny pet-mask flex-cm">#宠物时尚秀</view>  
85 - </view>  
86 - </swiper-item>  
87 </swiper> 81 </swiper>
88 </view> 82 </view>
89 <view class="best-info"> 83 <view class="best-info">
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 .banner-mask{ 116 .banner-mask{
117 width:100%; 117 width:100%;
118 height:100%; 118 height:100%;
119 - background:rgba(0,0,0,.5); 119 + background:rgba(0,0,0,.3);
120 position:absolute; 120 position:absolute;
121 left:0; 121 left:0;
122 top:0; 122 top:0;
@@ -128,24 +128,26 @@ @@ -128,24 +128,26 @@
128 } 128 }
129 .topic{ 129 .topic{
130 width:100%; 130 width:100%;
131 - margin:50rpx 30rpx; 131 + margin:50rpx 0;
132 } 132 }
133 .topic swiper{ 133 .topic swiper{
134 width:100%; 134 width:100%;
  135 + padding-left:30rpx;
  136 + box-sizing:border-box;
135 height:190rpx; 137 height:190rpx;
136 } 138 }
137 .topic swiper-item{ 139 .topic swiper-item{
138 - width:320rpx!important; 140 + width:360rpx!important;
139 } 141 }
140 .pet-block{ 142 .pet-block{
141 - width:290rpx; 143 + width:330rpx;
142 height:190rpx; 144 height:190rpx;
143 position:relative; 145 position:relative;
144 border-radius:14rpx; 146 border-radius:14rpx;
145 overflow:hidden; 147 overflow:hidden;
146 } 148 }
147 .topic-image{ 149 .topic-image{
148 - width:290rpx; 150 + width:330rpx;
149 height:190rpx; 151 height:190rpx;
150 box-shadow:0 0 5px rgba(0,0,0,.4); 152 box-shadow:0 0 5px rgba(0,0,0,.4);
151 margin-right:30rpx; 153 margin-right:30rpx;
@@ -4,19 +4,23 @@ Page({ @@ -4,19 +4,23 @@ Page({
4 setting:[ 4 setting:[
5 { 5 {
6 title:'我的晒宠', 6 title:'我的晒宠',
7 - iconurl:'/pages/image/pub-msg.svg' 7 + iconurl:'http://qn.colorcun.com/ac/xiangji1.png'
8 }, 8 },
9 { 9 {
10 title:'大头贴', 10 title:'大头贴',
11 - iconurl:'/pages/image/pub-picture.svg' 11 + iconurl:'http://qn.colorcun.com/ac/biaoqian.png'
12 }, 12 },
13 { 13 {
14 title:'分享邀请', 14 title:'分享邀请',
15 - iconurl:'/pages/image/pub-share.svg' 15 + iconurl:'http://qn.colorcun.com/ac/fenxiang.png'
16 }, 16 },
17 { 17 {
18 title:'消息', 18 title:'消息',
19 - iconurl:'/pages/image/pub-remind.svg' 19 + iconurl:'http://qn.colorcun.com/ac/xiaoxi.png'
  20 + },
  21 + {
  22 + title:'积分兑换',
  23 + iconurl:'http://qn.colorcun.com/ac/jifenduihua.png'
20 } 24 }
21 ] 25 ]
22 } 26 }
@@ -20,9 +20,6 @@ @@ -20,9 +20,6 @@
20 .best-line{ 20 .best-line{
21 width:80rpx; 21 width:80rpx;
22 height:1px; 22 height:1px;
23 - margin:0 6rpx;  
24 - position:relative;  
25 - top:1px;  
26 } 23 }
27 .seller-list{ 24 .seller-list{
28 padding-bottom:120rpx; 25 padding-bottom:120rpx;