Authored by 黄敬囿

调整UI review by 肖亚东

... ... @@ -37,8 +37,6 @@
margin-top: 6rpx;
}
.order-action-selected-button {
/* display: flex; */
/* align-items: center; */
height: 80rpx;
width: 224rpx;
font-family: PingFang-SC-Medium;
... ... @@ -49,8 +47,6 @@
align-items: center;
padding-top: 10rpx;
padding-bottom: 10rpx;
/* padding-left: 40rpx;
padding-right: 40rpx; */
margin-left: 20rpx;
}
... ... @@ -61,22 +57,15 @@
.order-action-unselected-button {
height: 80rpx;
width: 224rpx;
/* display: flex; */
/* align-items: center; */
font-family: PingFang-SC-Regular;
font-size: 24rpx;
color: #999999;
background-color: #FFFFFF;
border: 2rpx solid #CCCCCC;
border: 1rpx solid #CCCCCC;
border-radius: 0;
padding-top: 10rpx;
padding-bottom: 10rpx;
/* padding-left: 40rpx;
padding-right: 40rpx; */
/* border-style: none; */
/* margin-right: 20rpx; */
/* padding-left: 40rpx;
padding-right: 40rpx; */
}
.order-action-left-view {
display: flex;
... ...
... ... @@ -12,7 +12,7 @@
/* padding-right: 40rpx; */
}
.component-order-right-view {
width: 100%;
width: 468rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
... ...
... ... @@ -33,7 +33,8 @@ Page({
slideOffset: 0,
activeIndex: 0,
sliderWidth: 96,
contentHeight: 0
contentHeight: 0,
contentWidth:0
},
/**
... ... @@ -48,7 +49,8 @@ Page({
that.setData({
sliderWidth: (res.windowWidth - 20) / that.data.tabs.length,
sliderOffset: (res.windowWidth - 20) / that.data.tabs.length * that.data.activeIndex,
contentHeight: res.windowHeight - res.windowWidth / 750 * 108//计算内容区高度,rpx -> px计算
contentHeight: res.windowHeight - res.windowWidth / 750 * 108,//计算内容区高度,rpx -> px计算
contentWidth: res.windowWidth
});
that.setData({ api: api });
that.fetchOrderList(2,1);
... ...
<view class="order-list-page">
<view class="order-list-navbar">
<view class='order-list-navbar-item-space'></view>
<block wx:for="{{tabs}}" wx:key="{{index}}">
<view id="{{index}}" class="order-list-navbar-item {{activeIndex == index ? 'order-list-navbar-item-on' : ''}}" bindtap="navTabClick">
{{item.name}}
<!-- <text class="order-list-navbar-title">{{item.name}}</text> -->
</view>
</block>
<view class='order-list-navbar-item-space'></view>
<view class="order-list-navbar-slider" style="width: {{sliderWidth}}px; transform: translateX({{sliderOffset}}px); -webkit-transform: translateX({{sliderOffset}}px);"></view>
</view>
<view style="position: absolute;top: 108rpx;width: 100%;height:{{contentHeight}}px">
<view style="position: absolute;top: 108rpx;width: {{contentWidth}}px;height:{{contentHeight}}px;">
<swiper current="{{activeIndex}}" duration="300" bindchange="bindChange" type>
<swiper-item wx:for="{{tabs}}" wx:for-item="tab" wx:key="{{index}}" catchtouchmove='catchTouchMove'>
<block wx:if="{{tab && tab.data && tab.data.data.length > 0}}">
... ...
... ... @@ -12,12 +12,16 @@
position: absolute;
z-index: 500;
top: 0;
width: calc( 100% - 80rpx );
width: 100%;
height: 96rpx;
border-top: 2rpx solid #eeeeee;
border-bottom: 2rpx solid #eeeeee;
margin-left: 40rpx;
margin-right: 40rpx;
/* align-content: center; */
/* padding-left: 40rpx;
padding-right: 40rpx; */
}
.order-list-navbar-item-space {
width: 0rpx;
}
.order-list-navbar-item {
/* display: block;
... ... @@ -29,6 +33,7 @@
font-weight: 500;
font-size: 28rpx;
color: #999999;
align-self: center;
}
.order-list-navbar-item-on {
color: #000000;
... ...