Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2023-11-07 13:54:21 +08:00
commit 5796e1cf49
2 changed files with 43 additions and 0 deletions

View File

@ -84,6 +84,19 @@
height: 60rpx;
}
}
.orderCount {
width: 38rpx;
height: 38rpx;
background: #FFFFFF;
border: 3rpx solid #DC222F;
position: relative;
top: -125rpx;
left: 103rpx;
font-size: 22rpx;
border-radius: 50%;
line-height: 35rpx;
color: #DC222F;
}
}
.righttitle {

View File

@ -76,24 +76,54 @@
<view class="text">
待付款
</view>
<view class="orderCount" v-if="appPersonallist.waitPayCount>0&&appPersonallist.waitPayCount<100">
{{appPersonallist.waitPayCount}}
</view>
<view class="orderCount" style="width: 57rpx;border-radius: 17rpx;right:25rpx"
v-if="appPersonallist.waitPayCount>=100">
99+
</view>
</view>
<view class="item" @tap="goorder(2,'WAIT_RECEIVED_GOODS')">
<image src="../../static/pages/daishouhuo.png" mode=""></image>
<view class="text">
待收货
</view>
<view class="orderCount"
v-if="appPersonallist.waitReceivedGoodsCount>0&&appPersonallist.waitReceivedGoodsCount<100">
{{appPersonallist.waitReceivedGoodsCount}}
</view>
<view class="orderCount" style="width: 57rpx;border-radius: 17rpx;right:25rpx"
v-if="appPersonallist.waitReceivedGoodsCount>=100">
99+
</view>
</view>
<view class="item" @tap="goorder(3,'RECEIVED_GOODS')">
<image src="../../static/pages/daipingjia.png" mode=""></image>
<view class="text">
待评价
</view>
<view class="orderCount"
v-if="appPersonallist.receivedGoodsCount>0&&appPersonallist.receivedGoodsCount<100">
{{appPersonallist.receivedGoodsCount}}
</view>
<view class="orderCount" style="width: 57rpx;border-radius: 17rpx;right:25rpx"
v-if="list.receivedGoodsCount>=100">
99+
</view>
</view>
<view class="item" @tap="goorder(4,'EVALUATED')">
<image src="../../static/pages/yiwancheng.png" mode=""></image>
<view class="text">
已完成
</view>
<!-- <view class="orderCount" v-if="appPersonallist.evaluatedCount>0&&appPersonallist.evaluatedCount<100">
{{appPersonallist.evaluatedCount}}
</view>
<view class="orderCount" v-if="appPersonallist.evaluatedCount>=100">
99+
</view> -->
</view>
</view>
</view>