|
|
@@ -308,16 +308,12 @@
|
|
|
<view class="item-info">
|
|
|
<view class="info-line">
|
|
|
<text class="item-name" @click="pageTo({url:'/admin/item/detail?id='+s.productId})">{{ s.name }}</text>
|
|
|
- <text class="item-price">
|
|
|
- <text class="unit"></text>
|
|
|
- <text class="price">
|
|
|
- <text v-if="detailInfo.stockChange == 1">
|
|
|
- <text style="font-size:34upx;margin-right:6upx;">{{parseFloat(s.xhNum)}}{{s.xhUnitName}}</text>* ¥{{parseFloat(s.xhUnitPrice)}}
|
|
|
- </text>
|
|
|
- <text v-else>-</text>
|
|
|
- <text></text>
|
|
|
- </text>
|
|
|
+ <!-- 扎数与单价同一行展示，避免右侧栏过窄时挤成两行 -->
|
|
|
+ <text class="item-price" v-if="detailInfo.stockChange == 1">
|
|
|
+ <text class="item-qty">{{parseFloat(s.xhNum)}}{{s.xhUnitName}}</text>
|
|
|
+ <text class="item-unit-price">x ¥{{parseFloat(s.xhUnitPrice)}}</text>
|
|
|
</text>
|
|
|
+ <text class="item-price" v-else>-</text>
|
|
|
</view>
|
|
|
<view class="info-line">
|
|
|
<text class="item-type"></text>
|
|
|
@@ -2139,22 +2135,33 @@ export default {
|
|
|
margin-bottom: 20upx;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
- align-items: flex-end;
|
|
|
+ align-items: center;
|
|
|
.item-name {
|
|
|
+ flex: 1;
|
|
|
+ min-width: 0;
|
|
|
+ margin-right: 16upx;
|
|
|
color: black;
|
|
|
font-size:32upx;
|
|
|
font-weight: 700;
|
|
|
overflow: hidden;
|
|
|
white-space: nowrap;
|
|
|
text-overflow: ellipsis;
|
|
|
- width:360upx;
|
|
|
}
|
|
|
.item-price {
|
|
|
+ flex-shrink: 0;
|
|
|
+ max-width: 46%;
|
|
|
color:black;
|
|
|
font-weight:bold;
|
|
|
font-size: 28upx;
|
|
|
- .price {
|
|
|
- font-size: 27upx;
|
|
|
+ white-space: nowrap;
|
|
|
+ text-align: right;
|
|
|
+ .item-qty {
|
|
|
+ font-size: 34upx;
|
|
|
+ margin-right: 4upx;
|
|
|
+ }
|
|
|
+ .item-unit-price {
|
|
|
+ font-size: 26upx;
|
|
|
+ font-weight: 600;
|
|
|
}
|
|
|
}
|
|
|
.item-type {
|
|
|
@@ -2162,6 +2169,7 @@ export default {
|
|
|
font-size: 24upx;
|
|
|
}
|
|
|
.item-count {
|
|
|
+ flex-shrink: 0;
|
|
|
color: #666;
|
|
|
font-size: 28upx;
|
|
|
color:black;
|
