|
|
@@ -72,7 +72,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="tab-content">
|
|
|
+ <view class="tab-content" :style="tabActive === 1?'height:880rpx!important':''">
|
|
|
<view class="order-list">
|
|
|
<scroll-view
|
|
|
v-if="orderList.length > 0"
|
|
|
@@ -638,7 +638,7 @@ const checkIndex = async(index) => {
|
|
|
const param = {
|
|
|
token: uni.getStorageSync('token'),
|
|
|
}
|
|
|
- console.log('checkIndex param，history》》',param)
|
|
|
+
|
|
|
const {data:res} = await selectDepartment(param)
|
|
|
if (res.code === 200) {
|
|
|
officeArr.value.push(...res.data)
|
|
|
@@ -761,10 +761,9 @@ const loadPreList = async()=>{
|
|
|
width: 750rpx;
|
|
|
.nav{
|
|
|
display: flex;
|
|
|
- height:74.34rpx;
|
|
|
+ height: 75rpx;
|
|
|
width: 750rpx;
|
|
|
- // position: sticky;
|
|
|
- // top: 0;
|
|
|
+
|
|
|
}
|
|
|
.body{
|
|
|
display: flex;
|
|
|
@@ -775,7 +774,7 @@ const loadPreList = async()=>{
|
|
|
display: flex;
|
|
|
position: sticky;
|
|
|
flex-direction:column;
|
|
|
- z-index: 100;
|
|
|
+ // z-index: 100;
|
|
|
.tab-bar{
|
|
|
height: 62.5rpx;
|
|
|
display: flex;
|
|
|
@@ -833,8 +832,11 @@ const loadPreList = async()=>{
|
|
|
}
|
|
|
}
|
|
|
.history{
|
|
|
+ // display: flex;
|
|
|
+ // width: 100%;
|
|
|
display: flex;
|
|
|
- width: 100%;
|
|
|
+ flex-direction:row;
|
|
|
+ justify-content: flex-start;
|
|
|
.searchchoice{
|
|
|
padding: 0 10rpx;
|
|
|
display: flex;
|
|
|
@@ -945,11 +947,11 @@ const loadPreList = async()=>{
|
|
|
}
|
|
|
.tab-content{
|
|
|
display: flex;
|
|
|
- margin: 8rpx 10rpx;
|
|
|
+ margin: 8rpx 0;
|
|
|
border-radius: 4rpx;
|
|
|
background-color: #fff;
|
|
|
- width: calc(100% - 20rpx);
|
|
|
- height: 980rpx;
|
|
|
+ width: calc(100%);
|
|
|
+ height: 980rpx;//980rpx
|
|
|
z-index:10;
|
|
|
.order-list{
|
|
|
padding: 8rpx;
|
Neo