| @@ -14,10 +14,7 @@ page{ | |||||
| width: 142rpx; | width: 142rpx; | ||||
| height: 142rpx!important; | height: 142rpx!important; | ||||
| border-radius: 10rpx; | border-radius: 10rpx; | ||||
| /* overflow: hidden; */ | |||||
| margin-top:10rpx; | margin-top:10rpx; | ||||
| /* word-wrap: break-word; | |||||
| word-break: break-all; */ | |||||
| display: block; | display: block; | ||||
| } | } | ||||
| .listitem .icon{ | .listitem .icon{ | ||||
| @@ -331,7 +331,7 @@ page{ | |||||
| line-height: 75rpx; | line-height: 75rpx; | ||||
| text-align: center; | text-align: center; | ||||
| border: none; | border: none; | ||||
| font-size: 32rpx; | |||||
| font-size: 28rpx; | |||||
| margin: 0 auto; | margin: 0 auto; | ||||
| } | } | ||||
| button::after{ border: none; } | button::after{ border: none; } | ||||
| @@ -6,10 +6,9 @@ | |||||
| .tabs { | .tabs { | ||||
| width: 100% !important; | width: 100% !important; | ||||
| height: 88rpx; | |||||
| height: 96rpx; | |||||
| text-align: center; | text-align: center; | ||||
| position: fixed; | position: fixed; | ||||
| /* top: 136rpx; */ | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| z-index: 100000; | z-index: 100000; | ||||
| @@ -247,7 +246,6 @@ | |||||
| } | } | ||||
| .txt2{ | .txt2{ | ||||
| /* opacity: .99; */ | |||||
| margin-top: 36rpx; | margin-top: 36rpx; | ||||
| } | } | ||||
| .imgicon { | .imgicon { | ||||
| @@ -287,8 +285,6 @@ | |||||
| font-family: PingFang-SC-Regular; | font-family: PingFang-SC-Regular; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| color: #FD832D; | color: #FD832D; | ||||
| /* opacity: .99; */ | |||||
| line-height: 44rpx; | |||||
| margin-top: 30rpx; | margin-top: 30rpx; | ||||
| background: #fff; | background: #fff; | ||||
| position: fixed; | position: fixed; | ||||
| @@ -48,7 +48,7 @@ | |||||
| <text class='rmb'>¥</text> | <text class='rmb'>¥</text> | ||||
| <view class="fl" wx:if="{{data.type!=8}}"> | <view class="fl" wx:if="{{data.type!=8}}"> | ||||
| <text class="pri01" wx:if="{{data.type!=50&&data.type!=51}}">{{data.salePriceStr}}</text> | <text class="pri01" wx:if="{{data.type!=50&&data.type!=51}}">{{data.salePriceStr}}</text> | ||||
| <text class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}积分</text> | |||||
| <view class="pri01" wx:if="{{data.type==50||data.type==51}}">{{data.creditPrice}}<text class='jifen'>积分</text></view> | |||||
| <!-- <text class="yuan" wx:if="{{data.type!=50&&data.type!=51}}">元</text> --> | <!-- <text class="yuan" wx:if="{{data.type!=50&&data.type!=51}}">元</text> --> | ||||
| <text class='throgh' wx:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{data.priceStr}}元</text> | <text class='throgh' wx:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{data.priceStr}}元</text> | ||||
| <text wx:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{data.priceStr}}小时</text> | <text wx:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{data.priceStr}}小时</text> | ||||
| @@ -721,7 +721,7 @@ button::after { | |||||
| color: #999; | color: #999; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| background: #fff; | background: #fff; | ||||
| padding-top: 20rpx; | |||||
| } | } | ||||
| .presslimit { | .presslimit { | ||||
| @@ -869,4 +869,7 @@ background: #ccc8c8; | |||||
| } | } | ||||
| .swiper-box .wx-swiper-dot-active::before{ | .swiper-box .wx-swiper-dot-active::before{ | ||||
| background:#f6792b; | background:#f6792b; | ||||
| } | |||||
| .jifen{ | |||||
| font-size: 30rpx; | |||||
| } | } | ||||
| @@ -8,6 +8,9 @@ const QR = require("../../../utils/memberqrcode.js"); | |||||
| //券详情页面 | //券详情页面 | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| showMore: true, | |||||
| more: "点击查看更多", | |||||
| hidden: "hidden", | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| code: "", | code: "", | ||||
| topLine: imgurl.topLine.url, | topLine: imgurl.topLine.url, | ||||
| @@ -34,6 +37,25 @@ Page({ | |||||
| staticGamedata: {}, | staticGamedata: {}, | ||||
| showIf: false, | showIf: false, | ||||
| }, | }, | ||||
| // 点击查看更多 | |||||
| more: function () { | |||||
| let that = this; | |||||
| if (that.data.more == '点击查看更多') { | |||||
| this.setData({ | |||||
| hidden: "", | |||||
| height: that.data.data.merchantVoList.length * 140 + 'rpx', | |||||
| more: "点击收起", | |||||
| showMore: true | |||||
| }) | |||||
| } else { | |||||
| this.setData({ | |||||
| hidden: "hidden", | |||||
| height: 4 * 140 + 'rpx', | |||||
| more: "点击查看更多", | |||||
| showMore: true | |||||
| }) | |||||
| } | |||||
| }, | |||||
| onUnload:function(){ | onUnload:function(){ | ||||
| let that = this; | let that = this; | ||||
| clearInterval(that.data.setInter); | clearInterval(that.data.setInter); | ||||
| @@ -148,7 +170,7 @@ Page({ | |||||
| }) | }) | ||||
| } | } | ||||
| }, 2000); | }, 2000); | ||||
| /** | /** | ||||
| * 页面需要初始渲染的效果 | * 页面需要初始渲染的效果 | ||||
| */ | */ | ||||
| @@ -173,6 +195,16 @@ Page({ | |||||
| validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | ||||
| }) | }) | ||||
| } | } | ||||
| if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) { | |||||
| that.setData({ | |||||
| height: that.data.data.merchantVoList.length * 140 + 'rpx', | |||||
| showMore: false | |||||
| }) | |||||
| } else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) { | |||||
| that.setData({ | |||||
| height: 4 * 140 + 'rpx' | |||||
| }) | |||||
| } | |||||
| let url = JSON.stringify({ | let url = JSON.stringify({ | ||||
| END:"C", | END:"C", | ||||
| TYPE:"couponorder", | TYPE:"couponorder", | ||||
| @@ -49,26 +49,26 @@ | |||||
| <text>优惠券码:</text>{{code}}</view> | <text>优惠券码:</text>{{code}}</view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="posi"> | |||||
| <view class="tit"> | |||||
| 适用门店 | |||||
| </view> | |||||
| <view wx:for="{{data.merchantVoList}}" wx:key="{{index}}"> | |||||
| <view class='posi_logo'> | |||||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | |||||
| <image src='{{item.merchantImgUrl}}'></image> | |||||
| </view> | |||||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | |||||
| <text>{{item.merchantName}}</text> | |||||
| <text>{{item.addr}}{{item.buildingName}}{{item.floorName}}</text> | |||||
| </view> | |||||
| <view wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}'> | |||||
| <image class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| <view class='applyshop'>适用门店</view> | |||||
| <view class='posi' style='overflow:{{hidden}};height:{{height}}'> | |||||
| <view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | |||||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | |||||
| <image src='{{item.merchantImgUrl}}'></image> | |||||
| </view> | |||||
| <view bindtap='gotoDetail' data-id='{{item.id}}'> | |||||
| <view class='name'>{{item.merchantName}}</view> | |||||
| <view class='shopVoList'> | |||||
| <view wx:for="{{item.shopVoList}}" wx:key="{{index}}" wx:for-item="itemName"> | |||||
| <text>{{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}</text> | |||||
| <text class='douhao' wx:if="{{item.shopVoList.length>1}}">,</text> | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | |||||
| <image class='line' mode="widthFix" src="{{btomLine}}"></image> | <image class='line' mode="widthFix" src="{{btomLine}}"></image> | ||||
| <view class='note'> | <view class='note'> | ||||
| @@ -197,69 +197,69 @@ page { | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| text-align: left; | text-align: left; | ||||
| } | } | ||||
| .applyshop { | |||||
| font-size: 30rpx; | |||||
| height: 70rpx; | |||||
| line-height: 70rpx; | |||||
| color: #333; | |||||
| text-indent: 1em; | |||||
| padding-top: 20rpx; | |||||
| } | |||||
| .posi { | .posi { | ||||
| width: 100%; | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| background: #fff; | |||||
| position: relative; | position: relative; | ||||
| width: 100%; | |||||
| background: #FFF; | |||||
| /* margin: 18rpx 0 0; */ | |||||
| } | } | ||||
| .posi_logo { | .posi_logo { | ||||
| position: relative; | |||||
| width: 92%; | width: 92%; | ||||
| padding: 30rpx 4% 0; | |||||
| display: flex; | display: flex; | ||||
| position: relative; | |||||
| } | |||||
| .shiji { | |||||
| font-size: 24rpx !important; | |||||
| color: #919191 !important; | |||||
| letter-spacing: 0; | |||||
| padding: 20rpx 0; | |||||
| background: #fff; | |||||
| z-index: 10; | |||||
| margin: 0 auto; | |||||
| } | } | ||||
| .posi_logo view:nth-child(1) { | .posi_logo view:nth-child(1) { | ||||
| width: 126rpx; | |||||
| height: 126rpx; | |||||
| overflow: hidden; | |||||
| flex: 2; | |||||
| border: 2rpx solid #e7e7e7; | |||||
| /* width: 100rpx; *//* margin-right: 16rpx; */ | |||||
| border-radius: 16rpx; | border-radius: 16rpx; | ||||
| /* height: 100rpx; */ | |||||
| } | } | ||||
| .posi_logo view:nth-child(1) image { | .posi_logo view:nth-child(1) image { | ||||
| width: 100%; | |||||
| height: 100%; | |||||
| } | |||||
| .posi_logo view:nth-child(2) { | |||||
| position: relative; | |||||
| display: flex; | |||||
| flex-direction: column; | |||||
| flex: 8; | |||||
| padding-left: 30rpx; | |||||
| display: block; | |||||
| width: 100rpx; | |||||
| height: 100rpx; | |||||
| border-radius: 16rpx; | |||||
| margin-right: 16rpx; | |||||
| border: 1px solid #e5e5e5; | |||||
| } | } | ||||
| .posi_logo view:nth-child(2) text:nth-child(1) { | |||||
| font-size: 30rpx; | |||||
| width: 320rpx; | |||||
| .name{ | |||||
| font-size: 32rpx; | |||||
| color: #333; | |||||
| letter-spacing: 0; | |||||
| width: 500rpx; | |||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| } | } | ||||
| .timevalidity i{ | |||||
| font-style: normal; | |||||
| font-size: 28rpx; | |||||
| .posi_logo view:nth-child(2) view:nth-child(1) { | |||||
| font-size: 32rpx; | |||||
| color: #333; | |||||
| letter-spacing: 0; | |||||
| } | |||||
| .shopVoList { | |||||
| display: flex !important; | |||||
| padding-left: 0 !important; | |||||
| flex-direction: row !important; | |||||
| } | } | ||||
| .posi_logo view:nth-child(2) text:nth-child(2) { | |||||
| font-size: 24rpx; | |||||
| color: #b8b8b8; | |||||
| padding-top: 10rpx; | |||||
| width: 386rpx; | |||||
| white-space: wrap; | |||||
| text-overflow: ellipsis; | |||||
| overflow: hidden; | |||||
| height: 78rpx; | |||||
| .shopVoList text { | |||||
| font-size: 20rpx !important; | |||||
| color: #b8b8b8 !important; | |||||
| } | } | ||||
| .tit { | .tit { | ||||
| @@ -373,4 +373,13 @@ page { | |||||
| color: red!important; | color: red!important; | ||||
| border: 1px solid red; | border: 1px solid red; | ||||
| padding: 3rpx; | padding: 3rpx; | ||||
| } | |||||
| .bottom { | |||||
| text-align: center; | |||||
| height: 70rpx; | |||||
| line-height: 70rpx; | |||||
| color: #999; | |||||
| font-size: 32rpx; | |||||
| background: #fff; | |||||
| margin-top: 20rpx; | |||||
| } | } | ||||
| @@ -4,7 +4,6 @@ page{ | |||||
| .market { | .market { | ||||
| width: 100%; | width: 100%; | ||||
| height: 100%; | height: 100%; | ||||
| /* background: #f5f5f5; */ | |||||
| } | } | ||||
| button::after{ border: none; } | button::after{ border: none; } | ||||
| @@ -32,10 +31,9 @@ button::after{ border: none; } | |||||
| .tabs { | .tabs { | ||||
| width: 100% !important; | width: 100% !important; | ||||
| height: 88rpx; | |||||
| height: 96rpx; | |||||
| text-align: center; | text-align: center; | ||||
| position: fixed; | position: fixed; | ||||
| /* top: 0; */ | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| z-index: 100000; | z-index: 100000; | ||||
| @@ -67,7 +65,6 @@ button::after{ border: none; } | |||||
| height: 140rpx; | height: 140rpx; | ||||
| line-height: 140rpx; | line-height: 140rpx; | ||||
| text-align: center; | text-align: center; | ||||
| /* padding: 30rpx 0 0; */ | |||||
| color: #FFFFFF; | color: #FFFFFF; | ||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| @@ -117,7 +114,6 @@ button::after{ border: none; } | |||||
| .info view:nth-child(1) { | .info view:nth-child(1) { | ||||
| display: flex; | display: flex; | ||||
| justify-content: space-between; | justify-content: space-between; | ||||
| /* padding: 0 2%; */ | |||||
| } | } | ||||
| .info { | .info { | ||||
| @@ -35,8 +35,10 @@ page{ | |||||
| .c-right{ | .c-right{ | ||||
| width: 510rpx; | width: 510rpx; | ||||
| float: left; | float: left; | ||||
| line-height: 120rpx; | |||||
| line-height: 50rpx; | |||||
| color: #3C3C3C; | color: #3C3C3C; | ||||
| font-size: 32rpx; | |||||
| margin-top: 10rpx; | |||||
| } | } | ||||
| .detail-text{ | .detail-text{ | ||||
| font-size:30rpx; | font-size:30rpx; | ||||
| @@ -70,7 +70,7 @@ | |||||
| 今日好物推荐, | 今日好物推荐, | ||||
| <text>'{{xslist[0].title}}'</text>原价 <text>{{xslist[0].priceStr}}</text> 现价... | <text>'{{xslist[0].title}}'</text>原价 <text>{{xslist[0].priceStr}}</text> 现价... | ||||
| </view> | </view> | ||||
| <view class='qg' style='border-color:{{qg}}'><text>抢购</text></view> | |||||
| <view class='qg' style='border-color:{{qg}}'>抢购</view> | |||||
| </view> | </view> | ||||
| <!-- 专题 --> | <!-- 专题 --> | ||||
| <!-- <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | <!-- <view class='product' wx:if="{{showTopic}}" bindtap='gotoTopic'> | ||||
| @@ -426,6 +426,7 @@ progress{ | |||||
| border-radius:12rpx; | border-radius:12rpx; | ||||
| margin-top: 18rpx; | margin-top: 18rpx; | ||||
| margin-bottom:18rpx; | margin-bottom:18rpx; | ||||
| position: relative; | |||||
| } | } | ||||
| .toutiao view:nth-child(2){ | .toutiao view:nth-child(2){ | ||||
| font-size:26rpx; | font-size:26rpx; | ||||
| @@ -459,20 +460,21 @@ progress{ | |||||
| .toutiao .qg{ | .toutiao .qg{ | ||||
| width: 80rpx; | width: 80rpx; | ||||
| height: 44rpx; | height: 44rpx; | ||||
| line-height: 36rpx; | |||||
| line-height: 44rpx; | |||||
| border-radius:18rpx; | border-radius:18rpx; | ||||
| border:2rpx solid; | border:2rpx solid; | ||||
| float: right; | |||||
| text-align: center; | |||||
| margin: 20rpx 20rpx 20rpx 0; | |||||
| } | |||||
| .toutiao .qg>text{ | |||||
| width: 100%; | |||||
| position: absolute; | |||||
| top: 0; | |||||
| bottom: 0; | |||||
| right: 20rpx; | |||||
| margin: auto; | |||||
| font-size:24rpx; | font-size:24rpx; | ||||
| font-family:PingFangSC-Medium; | font-family:PingFangSC-Medium; | ||||
| font-weight:500; | font-weight:500; | ||||
| color:#FD782D; | color:#FD782D; | ||||
| text-align: center; | |||||
| } | } | ||||
| i-tabs i-tabs-scroll{ | i-tabs i-tabs-scroll{ | ||||
| background: #F4F5F9!important; | background: #F4F5F9!important; | ||||
| @@ -72,7 +72,10 @@ button::after{ border: none; } | |||||
| font-weight:500; | font-weight:500; | ||||
| color:rgba(134,134,134,1); | color:rgba(134,134,134,1); | ||||
| line-height: 48rpx; | line-height: 48rpx; | ||||
| padding: 0 30rpx; | |||||
| padding: 0 80rpx 0 30rpx; | |||||
| overflow: hidden; | |||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| } | } | ||||
| .des{ | .des{ | ||||
| width: 100%; | width: 100%; | ||||
| @@ -61,7 +61,7 @@ | |||||
| <view class='price'> | <view class='price'> | ||||
| <view class='price01'> | <view class='price01'> | ||||
| <view class='price-text'style="display: inline;font-size: 24rpx;">拼团价¥</view> | <view class='price-text'style="display: inline;font-size: 24rpx;">拼团价¥</view> | ||||
| <view class='price-num'>{{item.salePrice/100}}</view> | |||||
| <view class='price-num'>{{item.salePrice/100}}3232323232</view> | |||||
| <!-- <view class='price-unit'>元</view> --> | <!-- <view class='price-unit'>元</view> --> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -13,7 +13,6 @@ page { | |||||
| } | } | ||||
| .content-box{ | .content-box{ | ||||
| height: auto; | height: auto; | ||||
| /* padding-bottom: 200rpx; */ | |||||
| padding: 0 16rpx 200rpx; | padding: 0 16rpx 200rpx; | ||||
| } | } | ||||
| .loading { | .loading { | ||||
| @@ -166,9 +165,6 @@ image{ | |||||
| font-weight:500; | font-weight:500; | ||||
| color:#FD782D; | color:#FD782D; | ||||
| line-height:44rpx; | line-height:44rpx; | ||||
| width: 50%; | |||||
| white-space: nowrap; | |||||
| text-overflow: ellipsis; | |||||
| } | } | ||||
| .spell-centerH .price02{ | .spell-centerH .price02{ | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| @@ -176,7 +172,7 @@ image{ | |||||
| font-weight:500; | font-weight:500; | ||||
| text-decoration:line-through; | text-decoration:line-through; | ||||
| color:rgba(140,140,140,1); | color:rgba(140,140,140,1); | ||||
| line-height: 30rpx; | |||||
| line-height: 44rpx; | |||||
| margin-top: 15rpx; | margin-top: 15rpx; | ||||
| } | } | ||||
| .spell-centerH .price-num{ | .spell-centerH .price-num{ | ||||
| @@ -192,7 +188,7 @@ image{ | |||||
| .spell-centerHr .price-num{ | .spell-centerHr .price-num{ | ||||
| display: inline-block; | display: inline-block; | ||||
| font-size: 32rpx; | font-size: 32rpx; | ||||
| width: 95rpx; | |||||
| width: 100rpx; | |||||
| overflow:hidden; | overflow:hidden; | ||||
| text-overflow:ellipsis; | text-overflow:ellipsis; | ||||
| white-space:nowrap; | white-space:nowrap; | ||||
| @@ -204,7 +200,7 @@ image{ | |||||
| } | } | ||||
| .spell-centerH .price-numHr{ | .spell-centerH .price-numHr{ | ||||
| font-size:32rpx; | font-size:32rpx; | ||||
| line-height: 32rpx; | |||||
| line-height: 44rpx; | |||||
| } | } | ||||
| .content .price-unit{ | .content .price-unit{ | ||||
| font-size:24rpx; | font-size:24rpx; | ||||