Commit 61eb210098edaa5f8f9e2137675f2f9aaab90c16

Authored by wangfan
1 parent 55ceadb1

fixui

  1 +// components/hr.js
  2 +Component({
  3 + /**
  4 + * 组件的属性列表
  5 + */
  6 + properties: {
  7 +
  8 + },
  9 +
  10 + /**
  11 + * 组件的初始数据
  12 + */
  13 + data: {
  14 +
  15 + },
  16 +
  17 + /**
  18 + * 组件的方法列表
  19 + */
  20 + methods: {
  21 +
  22 + }
  23 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
  1 +<!--components/hr.wxml-->
  2 +<view class="hr flex-vc">
  3 + <view class="hr-one flex-vc">
  4 + <view class="text">
  5 + <slot></slot>
  6 + </view>
  7 + </view>
  8 +</view>
  1 +/* components/hr.wxss */
  2 +@import "../app.wxss";
  3 +.hr{
  4 + width: 100%;
  5 + position: relative;
  6 + font-size: 24rpx;
  7 + color: #999999;
  8 + height: 34rpx;
  9 +}
  10 +.hr-one{
  11 + width: 100%;
  12 + background-color: #F5F5F5;
  13 + height: 2rpx;
  14 +}
  15 +.text{
  16 + background-color: #fff;
  17 + padding: 0 24rpx;
  18 +}
@@ -7,10 +7,12 @@ @@ -7,10 +7,12 @@
7 width: 99%; 7 width: 99%;
8 border: 2rpx solid #E0E0E0; 8 border: 2rpx solid #E0E0E0;
9 border-radius: 6rpx; 9 border-radius: 6rpx;
10 - box-shadow: 0 4rpx 8rpx 0 #E0E0E0; 10 + box-shadow: 0 0 8rpx 0 #E0E0E0;
11 } 11 }
12 .seller.noborder{ 12 .seller.noborder{
13 border-width: 0; 13 border-width: 0;
  14 +}
  15 +.seller.noshadow{
14 box-shadow: none; 16 box-shadow: none;
15 } 17 }
16 .seller image{ 18 .seller image{
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "formids":"/components/formids/formids", 6 "formids":"/components/formids/formids",
7 "getpos":"/components/userinfo/getpos", 7 "getpos":"/components/userinfo/getpos",
8 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 8 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
9 - "nav":"/components/nav/nav" 9 + "nav":"/components/nav/nav",
  10 + "hr":"/components/hr"
10 } 11 }
11 } 12 }
@@ -10,9 +10,9 @@ @@ -10,9 +10,9 @@
10 <view class="follow" wx:else=""> 10 <view class="follow" wx:else="">
11 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key" 11 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
12 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}"> 12 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
13 - <sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}"></sb-tr> 13 + <sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}" sellerStyle="noborder"></sb-tr>
14 </view> 14 </view>
15 - <view class="seller flex-vc" wx:if="{{!hasMore}}">没有更多了</view> 15 + <hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
16 </view> 16 </view>
17 </view> 17 </view>
18 <getpos bindpos="onpos" id="getpos" hasAllowFail></getpos> 18 <getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}"> 8 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
9 <sb-tr seller="{{item}}" 9 <sb-tr seller="{{item}}"
10 hasActivity="{{true}}" hasAverage="{{false}}" 10 hasActivity="{{true}}" hasAverage="{{false}}"
11 - hasSlogan="{{true}}" sellerStyle="noborder"></sb-tr> 11 + hasSlogan="{{true}}" sellerStyle="noborder noshadow"></sb-tr>
12 </view> 12 </view>
13 <view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view> 13 <view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
14 </view> 14 </view>
@@ -253,7 +253,7 @@ page{ @@ -253,7 +253,7 @@ page{
253 line-height: 34rpx; 253 line-height: 34rpx;
254 font-size: 24rpx; 254 font-size: 24rpx;
255 color: #999999; 255 color: #999999;
256 - margin-top: 4rpx; 256 + margin-top: 6rpx;
257 } 257 }
258 .transverse-search{ 258 .transverse-search{
259 background-color: #fefefe; 259 background-color: #fefefe;
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "nav":"/components/nav/nav", 7 "nav":"/components/nav/nav",
8 "getpos":"/components/userinfo/getpos", 8 "getpos":"/components/userinfo/getpos",
9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
10 - "caixi":"/components/reserve/caixi" 10 + "caixi":"/components/reserve/caixi",
  11 + "hr":"/components/hr"
11 } 12 }
12 } 13 }
@@ -27,9 +27,9 @@ @@ -27,9 +27,9 @@
27 <view class="seller" wx:for="{{markers}}" wx:key="sellers.key" 27 <view class="seller" wx:for="{{markers}}" wx:key="sellers.key"
28 bindtap="gotoDetail" data-sid="{{item.id}}"> 28 bindtap="gotoDetail" data-sid="{{item.id}}">
29 <sb-tr seller="{{item}}" 29 <sb-tr seller="{{item}}"
30 - hasActivityTags="{{true}}" ></sb-tr> 30 + hasActivityTags="{{true}}" sellerStyle="noborder"></sb-tr>
31 </view> 31 </view>
32 - <view class="flex-vc nomore" wx:if="{{!hasMore}}">没有更多了</view> 32 + <hr class="flex-vc nomore" wx:if="{{!hasMore}}">我是有底线的</hr>
33 </view> 33 </view>
34 </view> 34 </view>
35 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" 35 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
1 /* pages/reserve/indexList.wxss */ 1 /* pages/reserve/indexList.wxss */
2 .header{ 2 .header{
3 - height: 100rpx; 3 + height: 81rpx;
4 position: fixed; 4 position: fixed;
5 width: 100%; 5 width: 100%;
6 z-index: 10; 6 z-index: 10;
@@ -53,26 +53,29 @@ @@ -53,26 +53,29 @@
53 53
54 .pages{ 54 .pages{
55 width: 90%; 55 width: 90%;
56 - margin: 100rpx auto 0; 56 + margin: 81rpx auto 0;
57 color:#fff; 57 color:#fff;
58 font-size: 28rpx; 58 font-size: 28rpx;
59 } 59 }
60 .follow { 60 .follow {
  61 + padding-top: 10rpx;
61 padding-bottom: 50rpx; 62 padding-bottom: 50rpx;
62 } 63 }
63 .follow .seller{ 64 .follow .seller{
64 - margin-bottom:20rpx;  
65 background-color: #ffffff; 65 background-color: #ffffff;
66 border-radius: 6rpx; 66 border-radius: 6rpx;
67 overflow: hidden; 67 overflow: hidden;
  68 + padding-bottom: 10rpx;
  69 + padding-top: 10rpx;
68 } 70 }
69 .nomore{ 71 .nomore{
70 color: #999; 72 color: #999;
71 font-size: 28rpx; 73 font-size: 28rpx;
  74 + margin-top: 30rpx;
72 } 75 }
73 .hr{ 76 .hr{
74 height: 2rpx; 77 height: 2rpx;
75 background-color: #F5F5F5; 78 background-color: #F5F5F5;
76 width: 90%; 79 width: 90%;
77 - margin: 19rpx auto; 80 + margin: 19rpx auto 0;
78 } 81 }
@@ -9,13 +9,12 @@ @@ -9,13 +9,12 @@
9 top:150rpx; 9 top:150rpx;
10 width: 90%; 10 width: 90%;
11 height: 60rpx; 11 height: 60rpx;
12 - background-color: #fefefe; 12 + background-color: #F5F5F5;
13 border-radius: 30rpx; 13 border-radius: 30rpx;
14 line-height: 60rpx; 14 line-height: 60rpx;
15 color:#999999; 15 color:#999999;
16 line-height: 60rpx; 16 line-height: 60rpx;
17 font-size: 28rpx; 17 font-size: 28rpx;
18 - border: 2rpx solid #cccccc;  
19 z-index: 99; 18 z-index: 99;
20 } 19 }
21 .searchAddr .icon{ 20 .searchAddr .icon{