Showing
8 changed files
with
52 additions
and
77 deletions
| @@ -995,20 +995,6 @@ Page({ | @@ -995,20 +995,6 @@ Page({ | ||
| 995 | } | 995 | } |
| 996 | let data = detail.expiration_date; | 996 | let data = detail.expiration_date; |
| 997 | detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0'; | 997 | detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0'; |
| 998 | - this.getDetailFun(detail) | ||
| 999 | - } | ||
| 1000 | - }) | ||
| 1001 | - }, | ||
| 1002 | - // 免费券显示是否领取 | ||
| 1003 | - getDetailFun(detail) { | ||
| 1004 | - App.Activity.ActivityListByOpenid({ | ||
| 1005 | - aid: detail.id, | ||
| 1006 | - sellerid:this.data.seller.sid, | ||
| 1007 | - }).then(res => { | ||
| 1008 | - if (res.ret == 200) { | ||
| 1009 | - if(res.data.length>0){ | ||
| 1010 | - detail.resultCoupon = '1';//显示已领取 | ||
| 1011 | - } | ||
| 1012 | console.log('邀请函--------------------评价赠送的优惠券', detail); | 998 | console.log('邀请函--------------------评价赠送的优惠券', detail); |
| 1013 | this.setData({ | 999 | this.setData({ |
| 1014 | couponData: detail, | 1000 | couponData: detail, |
| @@ -213,11 +213,12 @@ | @@ -213,11 +213,12 @@ | ||
| 213 | <view class="labelBox" wx:if="{{reserve.textInfo}}"> | 213 | <view class="labelBox" wx:if="{{reserve.textInfo}}"> |
| 214 | <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> | 214 | <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> |
| 215 | </view> | 215 | </view> |
| 216 | - <swiper wx:if="{{reserve.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 216 | + <swiper wx:if="{{reserve.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 217 | <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index"> | 217 | <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index"> |
| 218 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image> | 218 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image> |
| 219 | </swiper-item> | 219 | </swiper-item> |
| 220 | </swiper> | 220 | </swiper> |
| 221 | + <image wx:if="{{reserve.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{reserve.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{reserve.imgsInfo[0]}}" data-imgs="{{reserve.imgsInfo}}"></image> | ||
| 221 | <block wx:for="{{reserve.videosInfo}}" wx:key="index"> | 222 | <block wx:for="{{reserve.videosInfo}}" wx:key="index"> |
| 222 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 223 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 223 | </block> | 224 | </block> |
| @@ -228,11 +229,12 @@ | @@ -228,11 +229,12 @@ | ||
| 228 | <view class="labelBox" wx:if="{{store.textInfo}}"> | 229 | <view class="labelBox" wx:if="{{store.textInfo}}"> |
| 229 | <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> | 230 | <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> |
| 230 | </view> | 231 | </view> |
| 231 | - <swiper wx:if="{{store.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 232 | + <swiper wx:if="{{store.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 232 | <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index"> | 233 | <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index"> |
| 233 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image> | 234 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image> |
| 234 | </swiper-item> | 235 | </swiper-item> |
| 235 | </swiper> | 236 | </swiper> |
| 237 | + <image wx:if="{{store.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{store.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{store.imgsInfo[0]}}" data-imgs="{{store.imgsInfo}}"></image> | ||
| 236 | <block wx:for="{{store.videosInfo}}" wx:key="index"> | 238 | <block wx:for="{{store.videosInfo}}" wx:key="index"> |
| 237 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 239 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 238 | </block> | 240 | </block> |
| @@ -243,11 +245,12 @@ | @@ -243,11 +245,12 @@ | ||
| 243 | <view class="labelBox" wx:if="{{signboard.textInfo}}"> | 245 | <view class="labelBox" wx:if="{{signboard.textInfo}}"> |
| 244 | <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> | 246 | <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> |
| 245 | </view> | 247 | </view> |
| 246 | - <swiper wx:if="{{signboard.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 248 | + <swiper wx:if="{{signboard.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 247 | <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index"> | 249 | <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index"> |
| 248 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image> | 250 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image> |
| 249 | </swiper-item> | 251 | </swiper-item> |
| 250 | </swiper> | 252 | </swiper> |
| 253 | + <image wx:if="{{signboard.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{signboard.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{signboard.imgsInfo[0]}}" data-imgs="{{signboard.imgsInfo}}"></image> | ||
| 251 | <block wx:for="{{signboard.videosInfo}}"> | 254 | <block wx:for="{{signboard.videosInfo}}"> |
| 252 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 255 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 253 | </block> | 256 | </block> |
| @@ -264,11 +267,12 @@ | @@ -264,11 +267,12 @@ | ||
| 264 | <view class="labelBox" wx:if="{{chef.textInfo}}"> | 267 | <view class="labelBox" wx:if="{{chef.textInfo}}"> |
| 265 | <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> | 268 | <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> |
| 266 | </view> | 269 | </view> |
| 267 | - <swiper wx:if="{{chef.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 270 | + <swiper wx:if="{{chef.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 268 | <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index"> | 271 | <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index"> |
| 269 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image> | 272 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image> |
| 270 | </swiper-item> | 273 | </swiper-item> |
| 271 | </swiper> | 274 | </swiper> |
| 275 | + <image wx:if="{{chef.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{chef.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{chef.imgsInfo[0]}}" data-imgs="{{chef.imgsInfo}}"></image> | ||
| 272 | <block wx:for="{{chef.videosInfo}}" wx:key="index"> | 276 | <block wx:for="{{chef.videosInfo}}" wx:key="index"> |
| 273 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 277 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 274 | </block> | 278 | </block> |
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | .noBirthday{ | 29 | .noBirthday{ |
| 30 | - background: url('https://qn.colorcun.com/invitation10Bj_1.png') no-repeat; | 30 | + background: url('https://nosqn.colorcun.com/invitation10Bj_1.png') no-repeat; |
| 31 | background-size: cover; | 31 | background-size: cover; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| @@ -202,7 +202,7 @@ | @@ -202,7 +202,7 @@ | ||
| 202 | background: #fff; | 202 | background: #fff; |
| 203 | color: #cc9b6a; | 203 | color: #cc9b6a; |
| 204 | padding: 10rpx 0; | 204 | padding: 10rpx 0; |
| 205 | - border-radius: 22rpx; | 205 | + border-radius: 198rpx; |
| 206 | display: flex; | 206 | display: flex; |
| 207 | align-items: center; | 207 | align-items: center; |
| 208 | justify-content: center; | 208 | justify-content: center; |
| @@ -219,7 +219,7 @@ | @@ -219,7 +219,7 @@ | ||
| 219 | margin: 20rpx; | 219 | margin: 20rpx; |
| 220 | padding: 20rpx 20rpx 40rpx 20rpx; | 220 | padding: 20rpx 20rpx 40rpx 20rpx; |
| 221 | background: #fff7ef; | 221 | background: #fff7ef; |
| 222 | - border-radius: 20rpx 20rpx 0rpx 0rpx; | 222 | + border-radius: 20rpx; |
| 223 | display: flex; | 223 | display: flex; |
| 224 | align-items: center; | 224 | align-items: center; |
| 225 | flex-direction: column; | 225 | flex-direction: column; |
| @@ -428,11 +428,11 @@ | @@ -428,11 +428,11 @@ | ||
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | .preferentialCoupon .orderingFood { | 430 | .preferentialCoupon .orderingFood { |
| 431 | - padding: 0 20rpx; | 431 | + padding: 0 34rpx; |
| 432 | color: #fff; | 432 | color: #fff; |
| 433 | border: none; | 433 | border: none; |
| 434 | text-align: center; | 434 | text-align: center; |
| 435 | - border-radius: 20rpx; | 435 | + border-radius: 198rpx; |
| 436 | line-height: 44rpx; | 436 | line-height: 44rpx; |
| 437 | height: 44rpx; | 437 | height: 44rpx; |
| 438 | width: max-content; | 438 | width: max-content; |
| @@ -490,6 +490,7 @@ | @@ -490,6 +490,7 @@ | ||
| 490 | background: transparent; | 490 | background: transparent; |
| 491 | color: #CC9B6A; | 491 | color: #CC9B6A; |
| 492 | font-weight: 600; | 492 | font-weight: 600; |
| 493 | + padding: 0 20rpx; | ||
| 493 | } | 494 | } |
| 494 | 495 | ||
| 495 | .discountText { | 496 | .discountText { |
| @@ -559,7 +560,7 @@ | @@ -559,7 +560,7 @@ | ||
| 559 | } | 560 | } |
| 560 | 561 | ||
| 561 | .cook { | 562 | .cook { |
| 562 | - border-radius: 24rpx; | 563 | + border-radius: 198rpx; |
| 563 | background: #fff; | 564 | background: #fff; |
| 564 | color: #cc9b6a; | 565 | color: #cc9b6a; |
| 565 | padding: 4rpx 36rpx; | 566 | padding: 4rpx 36rpx; |
| @@ -594,6 +595,7 @@ | @@ -594,6 +595,7 @@ | ||
| 594 | color: #fff; | 595 | color: #fff; |
| 595 | margin-left: 40rpx; | 596 | margin-left: 40rpx; |
| 596 | flex: 1; | 597 | flex: 1; |
| 598 | + font-weight: 600; | ||
| 597 | } | 599 | } |
| 598 | 600 | ||
| 599 | .detailBanner { | 601 | .detailBanner { |
| @@ -609,6 +611,12 @@ | @@ -609,6 +611,12 @@ | ||
| 609 | border-radius: 10rpx; | 611 | border-radius: 10rpx; |
| 610 | } | 612 | } |
| 611 | 613 | ||
| 614 | +.detailBannerImg1 { | ||
| 615 | + width: 100%; | ||
| 616 | + border-radius: 10rpx; | ||
| 617 | + margin-top: 20rpx; | ||
| 618 | +} | ||
| 619 | + | ||
| 612 | .boxBlock { | 620 | .boxBlock { |
| 613 | width: 100%; | 621 | width: 100%; |
| 614 | border-radius: 10rpx; | 622 | border-radius: 10rpx; |
| @@ -940,7 +948,7 @@ | @@ -940,7 +948,7 @@ | ||
| 940 | .couponBtn { | 948 | .couponBtn { |
| 941 | width: 80%; | 949 | width: 80%; |
| 942 | margin: 0 auto; | 950 | margin: 0 auto; |
| 943 | - border-radius: 42rpx; | 951 | + border-radius: 198rpx; |
| 944 | background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%); | 952 | background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%); |
| 945 | font-weight: 400; | 953 | font-weight: 400; |
| 946 | color: #fff; | 954 | color: #fff; |
| @@ -1051,27 +1051,11 @@ Page({ | @@ -1051,27 +1051,11 @@ Page({ | ||
| 1051 | entry.sort((a, b) => a.id - b.id); | 1051 | entry.sort((a, b) => a.id - b.id); |
| 1052 | } | 1052 | } |
| 1053 | } | 1053 | } |
| 1054 | - this.getDetailFun(detail) | ||
| 1055 | - this.setData({ | ||
| 1056 | - titleList: entry, | ||
| 1057 | - activeTitle: entry.length > 0 ? entry[0].id : '', | ||
| 1058 | - }) | ||
| 1059 | - } | ||
| 1060 | - }) | ||
| 1061 | - }, | ||
| 1062 | - // 免费券显示是否领取 | ||
| 1063 | - getDetailFun(detail) { | ||
| 1064 | - App.Activity.ActivityListByOpenid({ | ||
| 1065 | - aid: detail.id, | ||
| 1066 | - sellerid:this.data.seller.sid, | ||
| 1067 | - }).then(res => { | ||
| 1068 | - if (res.ret == 200) { | ||
| 1069 | - if(res.data.length>0){ | ||
| 1070 | - detail.resultCoupon = '1';//显示已领取 | ||
| 1071 | - } | ||
| 1072 | console.log('邀请函--------------------评价赠送的优惠券', detail); | 1054 | console.log('邀请函--------------------评价赠送的优惠券', detail); |
| 1073 | this.setData({ | 1055 | this.setData({ |
| 1056 | + titleList: entry, | ||
| 1074 | couponData: detail, | 1057 | couponData: detail, |
| 1058 | + activeTitle: entry.length > 0 ? entry[0].id : '', | ||
| 1075 | }) | 1059 | }) |
| 1076 | } | 1060 | } |
| 1077 | }) | 1061 | }) |
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | <view class="contentData font32r">{{seller.addr || reserve.seller.map_address}}</view> | 76 | <view class="contentData font32r">{{seller.addr || reserve.seller.map_address}}</view> |
| 77 | <view class="positioning" bindtap="looklocation"> | 77 | <view class="positioning" bindtap="looklocation"> |
| 78 | <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" /> | 78 | <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" /> |
| 79 | - {{bookType == '1' ? '导航' : '导航到店'}} | 79 | + 导航 |
| 80 | </view> | 80 | </view> |
| 81 | </view> | 81 | </view> |
| 82 | </view> | 82 | </view> |
| @@ -269,11 +269,12 @@ | @@ -269,11 +269,12 @@ | ||
| 269 | <view class="labelBox" wx:if="{{reserve.textInfo}}"> | 269 | <view class="labelBox" wx:if="{{reserve.textInfo}}"> |
| 270 | <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> | 270 | <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> |
| 271 | </view> | 271 | </view> |
| 272 | - <swiper wx:if="{{reserve.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 272 | + <swiper wx:if="{{reserve.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 273 | <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index"> | 273 | <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index"> |
| 274 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image> | 274 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image> |
| 275 | </swiper-item> | 275 | </swiper-item> |
| 276 | </swiper> | 276 | </swiper> |
| 277 | + <image wx:if="{{reserve.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{reserve.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{reserve.imgsInfo[0]}}" data-imgs="{{reserve.imgsInfo}}"></image> | ||
| 277 | <block wx:for="{{reserve.videosInfo}}" wx:key="index"> | 278 | <block wx:for="{{reserve.videosInfo}}" wx:key="index"> |
| 278 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 279 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 279 | </block> | 280 | </block> |
| @@ -288,11 +289,12 @@ | @@ -288,11 +289,12 @@ | ||
| 288 | <view class="labelBox" wx:if="{{signboard.textInfo}}"> | 289 | <view class="labelBox" wx:if="{{signboard.textInfo}}"> |
| 289 | <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> | 290 | <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> |
| 290 | </view> | 291 | </view> |
| 291 | - <swiper wx:if="{{signboard.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 292 | + <swiper wx:if="{{signboard.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 292 | <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index"> | 293 | <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index"> |
| 293 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image> | 294 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image> |
| 294 | </swiper-item> | 295 | </swiper-item> |
| 295 | </swiper> | 296 | </swiper> |
| 297 | + <image wx:if="{{signboard.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{signboard.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{signboard.imgsInfo[0]}}" data-imgs="{{signboard.imgsInfo}}"></image> | ||
| 296 | <block wx:for="{{signboard.videosInfo}}"> | 298 | <block wx:for="{{signboard.videosInfo}}"> |
| 297 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 299 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 298 | </block> | 300 | </block> |
| @@ -313,11 +315,12 @@ | @@ -313,11 +315,12 @@ | ||
| 313 | <view class="labelBox" wx:if="{{store.textInfo}}"> | 315 | <view class="labelBox" wx:if="{{store.textInfo}}"> |
| 314 | <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> | 316 | <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> |
| 315 | </view> | 317 | </view> |
| 316 | - <swiper wx:if="{{store.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 318 | + <swiper wx:if="{{store.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 317 | <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index"> | 319 | <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index"> |
| 318 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image> | 320 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image> |
| 319 | </swiper-item> | 321 | </swiper-item> |
| 320 | </swiper> | 322 | </swiper> |
| 323 | + <image wx:if="{{store.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{store.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{store.imgsInfo[0]}}" data-imgs="{{store.imgsInfo}}"></image> | ||
| 321 | <block wx:for="{{store.videosInfo}}" wx:key="index"> | 324 | <block wx:for="{{store.videosInfo}}" wx:key="index"> |
| 322 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 325 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 323 | </block> | 326 | </block> |
| @@ -332,11 +335,12 @@ | @@ -332,11 +335,12 @@ | ||
| 332 | <view class="labelBox" wx:if="{{chef.textInfo}}"> | 335 | <view class="labelBox" wx:if="{{chef.textInfo}}"> |
| 333 | <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> | 336 | <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> |
| 334 | </view> | 337 | </view> |
| 335 | - <swiper wx:if="{{chef.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> | 338 | + <swiper wx:if="{{chef.imgsInfo.length>1}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff"> |
| 336 | <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index"> | 339 | <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index"> |
| 337 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image> | 340 | <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image> |
| 338 | </swiper-item> | 341 | </swiper-item> |
| 339 | </swiper> | 342 | </swiper> |
| 343 | + <image wx:if="{{chef.imgsInfo.length == '1'}}" mode="widthFix" class="detailBannerImg1" src="{{chef.imgsInfo[0]}}" bindtap="lookImgs" data-url="{{chef.imgsInfo[0]}}" data-imgs="{{chef.imgsInfo}}"></image> | ||
| 340 | <block wx:for="{{chef.videosInfo}}" wx:key="index"> | 344 | <block wx:for="{{chef.videosInfo}}" wx:key="index"> |
| 341 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> | 345 | <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video> |
| 342 | </block> | 346 | </block> |
| @@ -73,7 +73,7 @@ | @@ -73,7 +73,7 @@ | ||
| 73 | padding: 0 20rpx; | 73 | padding: 0 20rpx; |
| 74 | line-height: 48rpx; | 74 | line-height: 48rpx; |
| 75 | font-family: PingFang SC; | 75 | font-family: PingFang SC; |
| 76 | - border-radius: 40rpx; | 76 | + border-radius: 198rpx; |
| 77 | background: transparent; | 77 | background: transparent; |
| 78 | color: #fff; | 78 | color: #fff; |
| 79 | background: #AE2D2D; | 79 | background: #AE2D2D; |
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | background: #AE2D2D; | 206 | background: #AE2D2D; |
| 207 | color: #fff; | 207 | color: #fff; |
| 208 | padding: 10rpx 0; | 208 | padding: 10rpx 0; |
| 209 | - border-radius: 22rpx; | 209 | + border-radius: 198rpx; |
| 210 | display: flex; | 210 | display: flex; |
| 211 | align-items: center; | 211 | align-items: center; |
| 212 | justify-content: center; | 212 | justify-content: center; |
| @@ -469,7 +469,7 @@ | @@ -469,7 +469,7 @@ | ||
| 469 | color: #fff; | 469 | color: #fff; |
| 470 | border: none; | 470 | border: none; |
| 471 | text-align: center; | 471 | text-align: center; |
| 472 | - border-radius: 20rpx; | 472 | + border-radius: 198rpx; |
| 473 | line-height: 44rpx; | 473 | line-height: 44rpx; |
| 474 | height: 44rpx; | 474 | height: 44rpx; |
| 475 | width: max-content; | 475 | width: max-content; |
| @@ -660,7 +660,7 @@ | @@ -660,7 +660,7 @@ | ||
| 660 | } | 660 | } |
| 661 | 661 | ||
| 662 | .cook { | 662 | .cook { |
| 663 | - border-radius: 24rpx; | 663 | + border-radius: 198rpx; |
| 664 | background: #fff; | 664 | background: #fff; |
| 665 | color: #AE2D2D; | 665 | color: #AE2D2D; |
| 666 | padding: 4rpx 36rpx; | 666 | padding: 4rpx 36rpx; |
| @@ -679,6 +679,11 @@ | @@ -679,6 +679,11 @@ | ||
| 679 | border-radius: 10rpx; | 679 | border-radius: 10rpx; |
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | +.detailBannerImg1 { | ||
| 683 | + width: 100%; | ||
| 684 | + border-radius: 10rpx; | ||
| 685 | +} | ||
| 686 | + | ||
| 682 | .boxBlock { | 687 | .boxBlock { |
| 683 | width: 100%; | 688 | width: 100%; |
| 684 | border-radius: 10rpx; | 689 | border-radius: 10rpx; |
| @@ -1132,7 +1137,7 @@ | @@ -1132,7 +1137,7 @@ | ||
| 1132 | } | 1137 | } |
| 1133 | 1138 | ||
| 1134 | .viewBox2 .evaluateCoupon { | 1139 | .viewBox2 .evaluateCoupon { |
| 1135 | - background: #EFEFEF; | 1140 | + background: #fff; |
| 1136 | padding: 40rpx 20rpx 40rpx 20rpx; | 1141 | padding: 40rpx 20rpx 40rpx 20rpx; |
| 1137 | } | 1142 | } |
| 1138 | 1143 |
| @@ -1061,27 +1061,11 @@ Page({ | @@ -1061,27 +1061,11 @@ Page({ | ||
| 1061 | entry.sort((a, b) => a.id - b.id); | 1061 | entry.sort((a, b) => a.id - b.id); |
| 1062 | } | 1062 | } |
| 1063 | } | 1063 | } |
| 1064 | - this.getDetailFun(detail) | ||
| 1065 | - this.setData({ | ||
| 1066 | - titleList: entry, | ||
| 1067 | - activeTitle: entry.length > 0 ? entry[0].id : '', | ||
| 1068 | - }) | ||
| 1069 | - } | ||
| 1070 | - }) | ||
| 1071 | - }, | ||
| 1072 | - // 免费券显示是否领取 | ||
| 1073 | - getDetailFun(detail) { | ||
| 1074 | - App.Activity.ActivityListByOpenid({ | ||
| 1075 | - aid: detail.id, | ||
| 1076 | - sellerid:this.data.seller.sid, | ||
| 1077 | - }).then(res => { | ||
| 1078 | - if (res.ret == 200) { | ||
| 1079 | - if(res.data.length>0){ | ||
| 1080 | - detail.resultCoupon = '1';//显示已领取 | ||
| 1081 | - } | ||
| 1082 | console.log('邀请函--------------------评价赠送的优惠券', detail); | 1064 | console.log('邀请函--------------------评价赠送的优惠券', detail); |
| 1083 | this.setData({ | 1065 | this.setData({ |
| 1066 | + titleList: entry, | ||
| 1084 | couponData: detail, | 1067 | couponData: detail, |
| 1068 | + activeTitle: entry.length > 0 ? entry[0].id : '', | ||
| 1085 | }) | 1069 | }) |
| 1086 | } | 1070 | } |
| 1087 | }) | 1071 | }) |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | 39 | ||
| 40 | .infoTop .infoTopText3 { | 40 | .infoTop .infoTopText3 { |
| 41 | font-weight: 500; | 41 | font-weight: 500; |
| 42 | - margin-top: 16rpx; | 42 | + margin: 16rpx 0 30rpx 0; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | .infoTopBj2 { | 45 | .infoTopBj2 { |
| @@ -80,7 +80,7 @@ | @@ -80,7 +80,7 @@ | ||
| 80 | padding: 0 20rpx; | 80 | padding: 0 20rpx; |
| 81 | line-height: 48rpx; | 81 | line-height: 48rpx; |
| 82 | font-family: PingFang SC; | 82 | font-family: PingFang SC; |
| 83 | - border-radius: 40rpx; | 83 | + border-radius: 198rpx; |
| 84 | background: transparent; | 84 | background: transparent; |
| 85 | color: #000; | 85 | color: #000; |
| 86 | background: #E8CEA8; | 86 | background: #E8CEA8; |
| @@ -213,7 +213,7 @@ | @@ -213,7 +213,7 @@ | ||
| 213 | background: #E8CEA8; | 213 | background: #E8CEA8; |
| 214 | color: #000; | 214 | color: #000; |
| 215 | padding: 10rpx 0; | 215 | padding: 10rpx 0; |
| 216 | - border-radius: 22rpx; | 216 | + border-radius: 198rpx; |
| 217 | display: flex; | 217 | display: flex; |
| 218 | align-items: center; | 218 | align-items: center; |
| 219 | justify-content: center; | 219 | justify-content: center; |
| @@ -353,7 +353,7 @@ | @@ -353,7 +353,7 @@ | ||
| 353 | width: 84%; | 353 | width: 84%; |
| 354 | padding: 12rpx 0; | 354 | padding: 12rpx 0; |
| 355 | background: #D2541C; | 355 | background: #D2541C; |
| 356 | - border-radius: 42rpx; | 356 | + border-radius: 48rpx; |
| 357 | color: #fff; | 357 | color: #fff; |
| 358 | text-align: center; | 358 | text-align: center; |
| 359 | font-size: 32rpx; | 359 | font-size: 32rpx; |
| @@ -558,7 +558,7 @@ | @@ -558,7 +558,7 @@ | ||
| 558 | color: #fff; | 558 | color: #fff; |
| 559 | border: none; | 559 | border: none; |
| 560 | text-align: center; | 560 | text-align: center; |
| 561 | - border-radius: 20rpx; | 561 | + border-radius: 198rpx; |
| 562 | line-height: 44rpx; | 562 | line-height: 44rpx; |
| 563 | height: 44rpx; | 563 | height: 44rpx; |
| 564 | width: max-content; | 564 | width: max-content; |
| @@ -677,7 +677,7 @@ | @@ -677,7 +677,7 @@ | ||
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | .cook { | 679 | .cook { |
| 680 | - border-radius: 24rpx; | 680 | + border-radius: 198rpx; |
| 681 | background: #fff; | 681 | background: #fff; |
| 682 | color: #D2541C; | 682 | color: #D2541C; |
| 683 | padding: 4rpx 36rpx; | 683 | padding: 4rpx 36rpx; |
-
Please register or login to post a comment