|
@@ -114,6 +114,7 @@
|
|
:warehouseSn="warehouseSn"
|
|
:warehouseSn="warehouseSn"
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:authCode="authCode"
|
|
:authCode="authCode"
|
|
|
|
+ :maxHeight="activeList.length?'250':pageHeight"
|
|
:showCityPrice="isCityPrice"></detailProductList>
|
|
:showCityPrice="isCityPrice"></detailProductList>
|
|
|
|
|
|
<!-- 活动列表 -->
|
|
<!-- 活动列表 -->
|
|
@@ -124,7 +125,7 @@
|
|
<div class="active-title">
|
|
<div class="active-title">
|
|
<div>
|
|
<div>
|
|
<strong style="margin-right:10px;font-size:14px;">{{item.promotion.title}}</strong> ({{item.promotionRule.description}})
|
|
<strong style="margin-right:10px;font-size:14px;">{{item.promotion.title}}</strong> ({{item.promotionRule.description}})
|
|
- <span style="margin-left:20px;color:#00aaff;cursor: pointer;" @click="(event) => {showDesc(event, item)}">
|
|
|
|
|
|
+ <span style="margin-left:10px;color:#00aaff;cursor: pointer;" @click="(event) => {showDesc(event, item)}">
|
|
<a-icon title="查看活动详情" type="eye"/> 活动详情
|
|
<a-icon title="查看活动详情" type="eye"/> 活动详情
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
@@ -271,6 +272,9 @@ export default {
|
|
return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
|
|
return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ pageHeight(){
|
|
|
|
+ return window.innerHeight - 320
|
|
|
|
+ }
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
// 返回
|
|
// 返回
|
|
@@ -480,7 +484,7 @@ export default {
|
|
align-items: center;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
padding: 10px;
|
|
padding: 10px;
|
|
- background: #e3f9ff;
|
|
|
|
|
|
+ background: #dafafa;
|
|
}
|
|
}
|
|
.flexBox{
|
|
.flexBox{
|
|
display: flex;
|
|
display: flex;
|