|
|
@@ -67,13 +67,14 @@
|
|
|
: ''
|
|
|
}}</text>
|
|
|
</view>
|
|
|
+ <!-- 客户片区：放配送方式行右侧，避免与价格挤在一起 -->
|
|
|
+ <view v-if="item.customDistName" class="dist-name">{{ item.customDistName }}</view>
|
|
|
</view>
|
|
|
<view class="order-info_box">
|
|
|
<view>数量：</view>
|
|
|
<view v-if="item.smallNum > 0">{{ `${item.bigNum}/${item.smallNum}` }}</view>
|
|
|
<view v-else>{{ item.bigNum }}</view>
|
|
|
<view class="price">
|
|
|
- <text v-if="item.customDistName" class="price-dist-name">{{ item.customDistName }}</text>
|
|
|
<view v-if="item.orderPrice == item.actPrice">￥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</view>
|
|
|
<view v-else>
|
|
|
<text class="price-original">￥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</text>
|
|
|
@@ -88,7 +89,7 @@
|
|
|
<view
|
|
|
v-if="Number(item.nextDayTkPrice) > 0"
|
|
|
class="next-day-refund"
|
|
|
- >结后退款 ¥{{ parseFloat(item.nextDayTkPrice) }}，实付款 ¥{{ afterNextDayPayPrice }}</view>
|
|
|
+ >结后退款 ¥{{ parseFloat(item.nextDayTkPrice) }}，实付 ¥{{ afterNextDayPayPrice }}</view>
|
|
|
</view>
|
|
|
<!-- 点击备注区域编辑，阻止冒泡避免进入订单详情 -->
|
|
|
<view
|
|
|
@@ -876,6 +877,16 @@ export default {
|
|
|
font-size: 28upx;
|
|
|
}
|
|
|
|
|
|
+/* 片区名：方式行右侧，与账单日期同布局 */
|
|
|
+.dist-name {
|
|
|
+ flex: 1;
|
|
|
+ color: #999999;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: flex-end;
|
|
|
+ font-size: 26upx;
|
|
|
+}
|
|
|
+
|
|
|
.price-original {
|
|
|
text-decoration: line-through;
|
|
|
color: #847676;
|
|
|
@@ -893,7 +904,7 @@ export default {
|
|
|
align-items: center;
|
|
|
justify-content: flex-end;
|
|
|
font-size: 30upx;
|
|
|
- font-weight: 500;
|
|
|
+ font-weight: 600;
|
|
|
}
|
|
|
|
|
|
.remark-box {
|
|
|
@@ -1156,12 +1167,6 @@ export default {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: flex-end;
|
|
|
- .price-dist-name {
|
|
|
- margin-right: 230upx;
|
|
|
- font-size: 28upx;
|
|
|
- color: #999999;
|
|
|
- flex-shrink: 0;
|
|
|
- }
|
|
|
& .iconxiangyou {
|
|
|
color: #999999;
|
|
|
font-size: 25upx;
|
