|
|
@@ -6,7 +6,7 @@
|
|
|
<view class="product-con skeleton" :style="{ visibility: showSkeleton ? 'hidden' : 'visible' }">
|
|
|
<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
|
|
|
</homeList>
|
|
|
- <view>
|
|
|
+ <view class="">
|
|
|
<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
|
|
|
:style="'height:' + height + 'px;'" @scroll="scroll">
|
|
|
<view id="past0">
|
|
|
@@ -65,7 +65,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="groupbuying-log" hover-class="none" hover-stop-propagation="false">
|
|
|
+ <view class="groupbuying-log " hover-class="none" hover-stop-propagation="false">
|
|
|
<view class="log-top">
|
|
|
<text class="log-top-title">团购记录</text>
|
|
|
<text class="log-top-count">共{{storeInfo.grouponUserTotal}}条</text>
|
|
|
@@ -84,7 +84,12 @@
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
+ </view>
|
|
|
|
|
|
+ <view class="product-intro " id="past3">
|
|
|
+ <!-- <view class="title">{{ $t(`产品介绍`) }}</view>-->
|
|
|
+ <u-album :urls="storeInfo.detailImage" :rowCount="1" :multipleSize="albumWidth" maxCount="9999"
|
|
|
+ multipleMode="widthFix"></u-album>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
@@ -121,6 +126,10 @@
|
|
|
|
|
|
</view>
|
|
|
</view>
|
|
|
+
|
|
|
+ <view :style="{'height':bottomHeight}">
|
|
|
+<!-- 占位view-->
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<!-- <view class="attribute acea-row row-between-wrapper skeleton-rect" @click="selecAttr">
|
|
|
<view class="flex">
|
|
|
@@ -135,15 +144,11 @@
|
|
|
</view> -->
|
|
|
|
|
|
</view>
|
|
|
- <view class="product-intro" id="past3">
|
|
|
- <view class="title">{{ $t(`产品介绍`) }}</view>
|
|
|
- <u-album :urls="storeInfo.detailImage" :rowCount="1" :multipleSize="albumWidth" maxCount="9999"
|
|
|
- multipleMode="widthFix"></u-album>
|
|
|
- </view>
|
|
|
+
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
|
|
|
- <view v-if="isShowBottom" class="footer acea-row row-between-wrapper">
|
|
|
+ <view v-if="isShowBottom" class="footer acea-row row-between-wrapper">
|
|
|
<navigator hover-class="none" class="item skeleton-rect" open-type="switchTab" url="/pages/index/index">
|
|
|
<view class="iconfont icon-shouye6"></view>
|
|
|
<view class="p_center">{{ $t(`首页`) }}</view>
|
|
|
@@ -151,7 +156,7 @@
|
|
|
|
|
|
<view style="margin-right: 30rpx;">
|
|
|
<view class="bnt acea-row">
|
|
|
- <view class="buy-box" >
|
|
|
+ <view class="buy-box " >
|
|
|
<button class="share-btn " open-type="share">
|
|
|
分享有礼
|
|
|
</button>
|
|
|
@@ -341,6 +346,7 @@ export default {
|
|
|
data () {
|
|
|
let that = this;
|
|
|
return {
|
|
|
+ bottomHeight:'0rpx',
|
|
|
isShowBottom:true,
|
|
|
albumWidth: 0,
|
|
|
availableCheck: false,
|
|
|
@@ -915,6 +921,10 @@ export default {
|
|
|
detailGroupon({grouponId: that.id}).then((res) => {
|
|
|
that.storeInfo = res.data
|
|
|
this.isShowBottom = this.getIsShowBottom(res.data.grouponEndTime)
|
|
|
+ if (this.isShowBottom ){
|
|
|
+ this.bottomHeight = '150rpx'
|
|
|
+ console.log(this.bottomHeight,this.isShowBottom)
|
|
|
+ }
|
|
|
console.log('+++++++++++isShowBottom++++++++++++++',this.isShowBottom)
|
|
|
})
|
|
|
},
|
|
|
@@ -1560,7 +1570,7 @@ margin-left: 0rpx;
|
|
|
}
|
|
|
|
|
|
.scroll-Y {
|
|
|
- height: 250rpx;
|
|
|
+ height: 90rpx;
|
|
|
}
|
|
|
|
|
|
.activity_pin {
|
|
|
@@ -2594,5 +2604,8 @@ action-sheet-item {
|
|
|
|
|
|
|
|
|
}
|
|
|
+ .product-intro{
|
|
|
+ padding-bottom: 0rpx ;
|
|
|
+ }
|
|
|
</style>
|
|
|
|
zhanghui