Commit 61eb210098edaa5f8f9e2137675f2f9aaab90c16

Authored by wangfan
1 parent 55ceadb1

fixui

// components/hr.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
... ...
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--components/hr.wxml-->
<view class="hr flex-vc">
<view class="hr-one flex-vc">
<view class="text">
<slot></slot>
</view>
</view>
</view>
... ...
/* components/hr.wxss */
@import "../app.wxss";
.hr{
width: 100%;
position: relative;
font-size: 24rpx;
color: #999999;
height: 34rpx;
}
.hr-one{
width: 100%;
background-color: #F5F5F5;
height: 2rpx;
}
.text{
background-color: #fff;
padding: 0 24rpx;
}
\ No newline at end of file
... ...
... ... @@ -7,10 +7,12 @@
width: 99%;
border: 2rpx solid #E0E0E0;
border-radius: 6rpx;
box-shadow: 0 4rpx 8rpx 0 #E0E0E0;
box-shadow: 0 0 8rpx 0 #E0E0E0;
}
.seller.noborder{
border-width: 0;
}
.seller.noshadow{
box-shadow: none;
}
.seller image{
... ...
... ... @@ -6,6 +6,7 @@
"formids":"/components/formids/formids",
"getpos":"/components/userinfo/getpos",
"sb-tr":"/components/reserve/seller-box-transverse/seller-box",
"nav":"/components/nav/nav"
"nav":"/components/nav/nav",
"hr":"/components/hr"
}
}
\ No newline at end of file
... ...
... ... @@ -10,9 +10,9 @@
<view class="follow" wx:else="">
<view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}"></sb-tr>
<sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}" sellerStyle="noborder"></sb-tr>
</view>
<view class="seller flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
<hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
</view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
\ No newline at end of file
... ...
... ... @@ -8,7 +8,7 @@
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}"
hasActivity="{{true}}" hasAverage="{{false}}"
hasSlogan="{{true}}" sellerStyle="noborder"></sb-tr>
hasSlogan="{{true}}" sellerStyle="noborder noshadow"></sb-tr>
</view>
<view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
</view>
... ...
... ... @@ -253,7 +253,7 @@ page{
line-height: 34rpx;
font-size: 24rpx;
color: #999999;
margin-top: 4rpx;
margin-top: 6rpx;
}
.transverse-search{
background-color: #fefefe;
... ...
... ... @@ -7,6 +7,7 @@
"nav":"/components/nav/nav",
"getpos":"/components/userinfo/getpos",
"sb-tr":"/components/reserve/seller-box-transverse/seller-box",
"caixi":"/components/reserve/caixi"
"caixi":"/components/reserve/caixi",
"hr":"/components/hr"
}
}
\ No newline at end of file
... ...
... ... @@ -27,9 +27,9 @@
<view class="seller" wx:for="{{markers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}">
<sb-tr seller="{{item}}"
hasActivityTags="{{true}}" ></sb-tr>
hasActivityTags="{{true}}" sellerStyle="noborder"></sb-tr>
</view>
<view class="flex-vc nomore" wx:if="{{!hasMore}}">没有更多了</view>
<hr class="flex-vc nomore" wx:if="{{!hasMore}}">我是有底线的</hr>
</view>
</view>
<caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
... ...
/* pages/reserve/indexList.wxss */
.header{
height: 100rpx;
height: 81rpx;
position: fixed;
width: 100%;
z-index: 10;
... ... @@ -53,26 +53,29 @@
.pages{
width: 90%;
margin: 100rpx auto 0;
margin: 81rpx auto 0;
color:#fff;
font-size: 28rpx;
}
.follow {
padding-top: 10rpx;
padding-bottom: 50rpx;
}
.follow .seller{
margin-bottom:20rpx;
background-color: #ffffff;
border-radius: 6rpx;
overflow: hidden;
padding-bottom: 10rpx;
padding-top: 10rpx;
}
.nomore{
color: #999;
font-size: 28rpx;
margin-top: 30rpx;
}
.hr{
height: 2rpx;
background-color: #F5F5F5;
width: 90%;
margin: 19rpx auto;
margin: 19rpx auto 0;
}
\ No newline at end of file
... ...
... ... @@ -9,13 +9,12 @@
top:150rpx;
width: 90%;
height: 60rpx;
background-color: #fefefe;
background-color: #F5F5F5;
border-radius: 30rpx;
line-height: 60rpx;
color:#999999;
line-height: 60rpx;
font-size: 28rpx;
border: 2rpx solid #cccccc;
z-index: 99;
}
.searchAddr .icon{
... ...