|
|
@@ -59,18 +59,21 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="remark-bar" v-if="info.itemRemark" @click.stop>
|
|
|
- <text class="remark-label">备注</text>
|
|
|
+ <text class="iconfont iconmingxi1 remark-icon"></text>
|
|
|
<text class="remark-text">{{ info.itemRemark }}</text>
|
|
|
</view>
|
|
|
<view class="extra-line extra-line--middle" v-if="showMiddleExtra" @click.stop>
|
|
|
- <text style="font-weight:bold;" v-if="Number(info.reachNum)>0">
|
|
|
- 满{{info.reachNum}}扎，享 ¥{{parseFloat(info.reachPrice)}}/扎<block v-if="info.presell == 0">（下单后生效）</block>
|
|
|
- </text>
|
|
|
- <block v-if="info.presell && info.presell == 1"><block v-if="Number(info.reachNum)>0">，</block>到货日期
|
|
|
+ <view class="extra-line-row" v-if="Number(info.reachNum)>0">
|
|
|
+ <text style="font-weight:bold;">
|
|
|
+ 满{{info.reachNum}}扎，享 ¥{{parseFloat(info.reachPrice)}}/扎<block v-if="info.presell == 0">（下单后生效）</block>
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+ <view class="extra-line-row" v-if="info.presell && info.presell == 1">
|
|
|
+ <text style="font-weight:bold;margin-right:10upx;">到货日期</text>
|
|
|
<block v-if="!$util.isEmpty(info.presellDateShow)">
|
|
|
- <text v-for="(dateItem, dateIndex) in info.presellDateShow" :key="dateIndex">{{dateItem}}<text v-if="dateIndex!=info.presellDateShow.length-1">，</text></text>
|
|
|
+ <text style="font-weight:bold;" v-for="(dateItem, dateIndex) in info.presellDateShow" :key="dateIndex">{{dateItem}}<text v-if="dateIndex!=info.presellDateShow.length-1">，</text></text>
|
|
|
</block>
|
|
|
- </block>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="extra-line" v-else-if="showMyStock" @click.stop>
|
|
|
<text v-if="info.myLack == 0" class="my-stock my-stock--ok">
|
|
|
@@ -199,9 +202,8 @@ export default {
|
|
|
border-left: 5upx solid #ff8c3a;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
-.remark-label {
|
|
|
+.remark-icon {
|
|
|
font-size: 28upx;
|
|
|
- font-weight: bold;
|
|
|
color: #ff8c3a;
|
|
|
line-height: 1.2;
|
|
|
margin-right: 10upx;
|
|
|
@@ -228,6 +230,11 @@ export default {
|
|
|
}
|
|
|
.extra-line--middle {
|
|
|
font-size: 26upx;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+}
|
|
|
+.extra-line-row + .extra-line-row {
|
|
|
+ margin-top: 4upx;
|
|
|
}
|
|
|
.my-stock--ok {
|
|
|
color: green;
|
