|
@@ -21,7 +21,8 @@
|
|
|
<view class="order-list">
|
|
|
<view class="order-list-item" v-for="(item, index) in list" :key="index">
|
|
|
<view class="order-list-item__state">
|
|
|
- <text class="success" v-if="!status">{{ item.status && item.status.desc }}</text>
|
|
|
+ <text class="success" v-if="item.status.value == -1 || item.status.value == 3">{{ item.status && item.status.desc }}</text>
|
|
|
+ <text v-else>{{ item.status && item.status.desc }}</text>
|
|
|
</view>
|
|
|
<view class="order-list-item__goods" @click="toDetail(item)">
|
|
|
<view class="order-list-item__goods-item" v-for="(items, indexs) in item.items" :key="indexs">
|
|
@@ -37,7 +38,7 @@
|
|
|
</view>
|
|
|
<view class="order-list-item-price flex">
|
|
|
<view class="order-list-item-price__num">共计<text>{{ item.orderNum }}</text>商品,</view>
|
|
|
- <view class="order-list-item-price__total">总金额:<text>¥{{ $numberFormat(item.payAmt) }}</text></view>
|
|
|
+ <view class="order-list-item-price__total">总金额:<text>¥</text><text>{{ $numberFormat(item.payAmt) }}</text></view>
|
|
|
</view>
|
|
|
<view class="order-list-item-btn flex">
|
|
|
<view class="order-list-item-btn-item flex logistics" v-if="item.status.value == 2 || item.status.value == 3" @click="toLogistics(item)"><text>查看物流</text></view>
|
|
@@ -266,22 +267,20 @@
|
|
|
font-size: 30rpx;
|
|
|
line-height: 30rpx;
|
|
|
margin-bottom: 22rpx;
|
|
|
+ color: #F9822C;
|
|
|
|
|
|
.success {
|
|
|
- color: #FF1818;
|
|
|
+ color: #999;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 商品列表
|
|
|
&__goods {
|
|
|
- margin-bottom: 20rpx;
|
|
|
-
|
|
|
&-item{
|
|
|
display: flex;
|
|
|
- padding: 22rpx;
|
|
|
- box-shadow: 0px 0px 8px 0px rgba(26, 35, 113, 0.08);
|
|
|
+ padding: 40rpx 20rpx;
|
|
|
border-radius: 4rpx;
|
|
|
- margin-bottom: 20rpx;
|
|
|
+ border-bottom: 1px solid rgba(51, 51, 51, 0.12);
|
|
|
|
|
|
image {
|
|
|
width: 220rpx;
|
|
@@ -318,6 +317,7 @@
|
|
|
|
|
|
&-item:last-child {
|
|
|
margin-bottom: 0;
|
|
|
+ border: none;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -328,15 +328,16 @@
|
|
|
border-bottom: 1px solid #E5E5E5;
|
|
|
margin-bottom: 22rpx;
|
|
|
|
|
|
- &__num {
|
|
|
- text {
|
|
|
- color: #F9822C;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
&__total {
|
|
|
+ text:first-child {
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-weight: normal;
|
|
|
+ }
|
|
|
+
|
|
|
text {
|
|
|
- color: #F24E4E;
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-weight: bold;
|
|
|
+ color: #F9822C;
|
|
|
}
|
|
|
}
|
|
|
}
|