xt / xcx-book · Commits

Go to a project

Commit 88a294e3c5c88e48b1e7425f5fc9d6c1282b7594

Authored by pengye
1 parent d464e07e
build: skipped

邀请函、商家详情弹框领券，不展示券信息，只展示券总额，券总额加数字动画

Inline Side-by-side
Showing 41 changed files with 371 additions and 88 deletions
  1 +// components/scroll-number/index.js
  2 +Component({
  3 + externalClasses: ['container-class', 'item-class', 'dot-class'],
  4 + properties: {
  5 + value: {
  6 + type: String,
  7 + value: ''
  8 + },
  9 + /** 一次滚动耗时 单位ms */
  10 + duration: {
  11 + type: Number,
  12 + value: 1600
  13 + },
  14 + /** 每个数字之间的延迟滚动 */
  15 + delay: {
  16 + type: Number,
  17 + value: 200
  18 + }
  19 + },
  20 + data: {
  21 + valArr: [],
  22 + aniArr: [], // 动画列表，和valArr对应
  23 + numArr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], // 所有数字
  24 + itemHeight: 0 // 数字项的高度
  25 + },
  26 + observers: {
  27 + value: function (newVal) {
  28 + // 监听value变化，格式化为valArr
  29 + setTimeout(() => {
  30 + let valArr = []
  31 + if (newVal) {
  32 + valArr = newVal.split('').map(o => {
  33 + return {
  34 + val: o,
  35 + isNaN: isNaN(o)
  36 + }
  37 + })
  38 + }
  39 + this.setData({
  40 + valArr: valArr
  41 + })
  42 + this.getNumberHeight()
  43 + }, 0);
  44 + }
  45 + },
  46 + methods: {
  47 + /** 计算数字高度 */
  48 + getNumberHeight() {
  49 + if (this.data.itemHeight > 0) {
  50 + this.startScrollAni()
  51 + return
  52 + }
  53 + const query = this.createSelectorQuery()
  54 + query.select('.number-item').boundingClientRect()
  55 + query.exec((res) => {
  56 + this.setData({
  57 + itemHeight: res[0].height
  58 + })
  59 + this.startScrollAni()
  60 + })
  61 + },
  62 + /** 开始滚动动画 */
  63 + startScrollAni() {
  64 + if (this.data.itemHeight <= 0) return
  65 + const aniArr = []
  66 + this.data.valArr.forEach((item, index) => {
  67 + if (!item.isNaN) {
  68 + aniArr.push(`transition-delay: ${this.data.delay * index}ms; top: ${-this.data.itemHeight * (this.data.numArr[parseInt(item.val)] + 10)}px;`)
  69 + } else {
  70 + aniArr.push(null)
  71 + }
  72 + })
  73 + this.setData({
  74 + aniArr: aniArr
  75 + })
  76 + }
  77 + }
  78 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
  1 +<!--components/scroll-number/index.wxml-->
  2 +<view class="scroll-number container-class">
  3 + <block wx:for="{{valArr}}" wx:key="index">
  4 + <view wx:if="{{item.isNaN}}" class="scroll-number-item number-dot dot-class">{{item.val}}</view>
  5 + <view wx:else class="scroll-number-item number-item item-class">
  6 + <view class="scroll-ani" style="transition-duration: {{duration}}ms; {{aniArr[index]}}">
  7 + <view wx:for="{{numArr}}" wx:for-item="num" wx:for-index="idx" wx:key="idx" class="num{{num}}">{{num}}</view>
  8 + <view wx:for="{{numArr}}" wx:for-item="num" wx:for-index="idx" wx:key="idx" class="num{{num}}">{{num}}</view>
  9 + </view>
  10 + </view>
  11 + </block>
  12 +</view>
  1 +/* components/scroll-number/index.wxss */
  2 +.scroll-number {
  3 + display: flex;
  4 + align-items: flex-end;
  5 + color: #ffc806;
  6 + font-weight: 600;
  7 + font-size: 80rpx;
  8 + margin-left: 14rpx;
  9 +}
  10 +
  11 +.scroll-number-item {
  12 + color: #FFC806;
  13 + font-size: 80rpx;
  14 + font-weight: bold;
  15 + font-family: Microsoft YaHei;
  16 +}
  17 +
  18 +.number-item {
  19 + border-radius: 8rpx;
  20 + width: 56rpx;
  21 + height: 72rpx;
  22 + line-height: 72rpx;
  23 + overflow: hidden;
  24 + text-align: center;
  25 + position: relative;
  26 +}
  27 +
  28 +.number-dot {
  29 + margin: 0 12rpx;
  30 +}
  31 +
  32 +.scroll-ani {
  33 + position: absolute;
  34 + top: 0;
  35 + left: 0;
  36 + width: 100%;
  37 + height: 100%;
  38 + transition: all 2s ease-in 0s;
  39 +}
@@ -300,11 +300,17 @@ checkbox::before { @@ -300,11 +300,17 @@ checkbox::before {
300 justify-content: center; 300 justify-content: center;
301 } 301 }
302 302
303 -.couponTotal text { 303 +.counterText {
304 color: #ffc806; 304 color: #ffc806;
305 font-weight: 600; 305 font-weight: 600;
306 - font-size: 100rpx;  
307 - margin: 0 14rpx; 306 + font-size: 80rpx;
  307 + margin-right: 14rpx;
  308 +}
  309 +
  310 +.couponInfo {
  311 + color: #DFDFDF;
  312 + text-align: center;
  313 + margin-bottom: 30rpx;
308 } 314 }
309 315
310 .couponBtn { 316 .couponBtn {
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "usingComponents": { 4 "usingComponents": {
5 "nav": "/components/nav/nav", 5 "nav": "/components/nav/nav",
6 "painter":"/components/painter/painter", 6 "painter":"/components/painter/painter",
7 - "my-modal": "/components/modal/modal" 7 + "my-modal": "/components/modal/modal",
  8 + "scroll-number": "/components/scroll-number/index"
8 } 9 }
9 } 10 }
@@ -322,13 +322,17 @@ @@ -322,13 +322,17 @@
322 </view> 322 </view>
323 </my-modal> 323 </my-modal>
324 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 324 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
325 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 325 + <view slot="modalName" class="titleModal titleModal2">
326 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 326 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
327 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 327 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
328 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 328 + <view class="couponTotal" wx:if="{{totalPrice}}">
  329 + 赠送给您
  330 + <scroll-number value="{{totalPrice}}"></scroll-number>
  331 + <text class="counterText1">元</text>代金券
  332 + </view>
329 </view> 333 </view>
330 <view slot="modalContent"> 334 <view slot="modalContent">
331 - <view class="couponBox"> 335 + <!-- <view class="couponBox">
332 <view wx:for="{{couponArr}}" class="couponItems"> 336 <view wx:for="{{couponArr}}" class="couponItems">
333 <view class="couponNum font20r">×{{item.number}}</view> 337 <view class="couponNum font20r">×{{item.number}}</view>
334 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 338 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -336,7 +340,8 @@ @@ -336,7 +340,8 @@
336 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 340 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
337 <view class="font28r couponCondition" wx:else>无门槛</view> 341 <view class="font28r couponCondition" wx:else>无门槛</view>
338 </view> 342 </view>
339 - </view> 343 + </view> -->
  344 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
340 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 345 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
341 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 346 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
342 </view> 347 </view>
@@ -844,11 +844,17 @@ @@ -844,11 +844,17 @@
844 justify-content: center; 844 justify-content: center;
845 } 845 }
846 846
847 -.couponTotal text { 847 +.counterText {
848 color: #ffc806; 848 color: #ffc806;
849 font-weight: 600; 849 font-weight: 600;
850 font-size: 80rpx; 850 font-size: 80rpx;
851 - margin: 0 14rpx; 851 + margin-right: 14rpx;
  852 +}
  853 +
  854 +.couponInfo {
  855 + color: #DFDFDF;
  856 + text-align: center;
  857 + margin-bottom: 30rpx;
852 } 858 }
853 859
854 .couponBox { 860 .couponBox {
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "usingComponents": { 4 "usingComponents": {
5 "nav": "/components/nav/nav", 5 "nav": "/components/nav/nav",
6 "painter":"/components/painter/painter", 6 "painter":"/components/painter/painter",
7 - "my-modal": "/components/modal/modal" 7 + "my-modal": "/components/modal/modal",
  8 + "scroll-number": "/components/scroll-number/index"
8 } 9 }
9 } 10 }
@@ -483,13 +483,17 @@ @@ -483,13 +483,17 @@
483 </view> 483 </view>
484 </my-modal> 484 </my-modal>
485 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 485 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
486 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 486 + <view slot="modalName" class="titleModal titleModal2">
487 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 487 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
488 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 488 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
489 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 489 + <view class="couponTotal" wx:if="{{totalPrice}}">
  490 + 赠送给您
  491 + <scroll-number value="{{totalPrice}}"></scroll-number>
  492 + <text class="counterText1">元</text>代金券
  493 + </view>
490 </view> 494 </view>
491 <view slot="modalContent"> 495 <view slot="modalContent">
492 - <view class="couponBox"> 496 + <!-- <view class="couponBox">
493 <view wx:for="{{couponArr}}" class="couponItems"> 497 <view wx:for="{{couponArr}}" class="couponItems">
494 <view class="couponNum font20r">×{{item.number}}</view> 498 <view class="couponNum font20r">×{{item.number}}</view>
495 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 499 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -497,7 +501,8 @@ @@ -497,7 +501,8 @@
497 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 501 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
498 <view class="font28r couponCondition" wx:else>无门槛</view> 502 <view class="font28r couponCondition" wx:else>无门槛</view>
499 </view> 503 </view>
500 - </view> 504 + </view> -->
  505 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
501 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 506 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
502 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 507 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
503 </view> 508 </view>
@@ -942,11 +942,17 @@ @@ -942,11 +942,17 @@
942 justify-content: center; 942 justify-content: center;
943 } 943 }
944 944
945 -.couponTotal text { 945 +.counterText {
946 color: #ffc806; 946 color: #ffc806;
947 font-weight: 600; 947 font-weight: 600;
948 font-size: 80rpx; 948 font-size: 80rpx;
949 - margin: 0 14rpx; 949 + margin-right: 14rpx;
  950 +}
  951 +
  952 +.couponInfo {
  953 + color: #DFDFDF;
  954 + text-align: center;
  955 + margin-bottom: 30rpx;
950 } 956 }
951 957
952 .couponBox { 958 .couponBox {
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "usingComponents": { 4 "usingComponents": {
5 "nav": "/components/nav/nav", 5 "nav": "/components/nav/nav",
6 "painter": "/components/painter/painter", 6 "painter": "/components/painter/painter",
7 - "my-modal": "/components/modal/modal" 7 + "my-modal": "/components/modal/modal",
  8 + "scroll-number": "/components/scroll-number/index"
8 } 9 }
9 } 10 }
@@ -456,13 +456,17 @@ @@ -456,13 +456,17 @@
456 </view> 456 </view>
457 </my-modal> 457 </my-modal>
458 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 458 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
459 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 459 + <view slot="modalName" class="titleModal titleModal2">
460 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 460 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
461 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 461 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
462 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 462 + <view class="couponTotal" wx:if="{{totalPrice}}">
  463 + 赠送给您
  464 + <scroll-number value="{{totalPrice}}"></scroll-number>
  465 + <text class="counterText1">元</text>代金券
  466 + </view>
463 </view> 467 </view>
464 <view slot="modalContent"> 468 <view slot="modalContent">
465 - <view class="couponBox"> 469 + <!-- <view class="couponBox">
466 <view wx:for="{{couponArr}}" class="couponItems"> 470 <view wx:for="{{couponArr}}" class="couponItems">
467 <view class="couponNum font20r">×{{item.number}}</view> 471 <view class="couponNum font20r">×{{item.number}}</view>
468 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 472 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -470,7 +474,8 @@ @@ -470,7 +474,8 @@
470 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 474 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
471 <view class="font28r couponCondition" wx:else>无门槛</view> 475 <view class="font28r couponCondition" wx:else>无门槛</view>
472 </view> 476 </view>
473 - </view> 477 + </view> -->
  478 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
474 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 479 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
475 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 480 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
476 </view> 481 </view>
@@ -996,11 +996,17 @@ @@ -996,11 +996,17 @@
996 justify-content: center; 996 justify-content: center;
997 } 997 }
998 998
999 -.couponTotal text { 999 +.counterText {
1000 color: #ffc806; 1000 color: #ffc806;
1001 font-weight: 600; 1001 font-weight: 600;
1002 font-size: 80rpx; 1002 font-size: 80rpx;
1003 - margin: 0 14rpx; 1003 + margin-right: 14rpx;
  1004 +}
  1005 +
  1006 +.couponInfo {
  1007 + color: #DFDFDF;
  1008 + text-align: center;
  1009 + margin-bottom: 30rpx;
1004 } 1010 }
1005 1011
1006 .couponBox { 1012 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -350,13 +350,17 @@ @@ -350,13 +350,17 @@
350 </view> 350 </view>
351 </my-modal> 351 </my-modal>
352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
353 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 353 + <view slot="modalName" class="titleModal titleModal2">
354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
356 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 356 + <view class="couponTotal" wx:if="{{totalPrice}}">
  357 + 赠送给您
  358 + <scroll-number value="{{totalPrice}}"></scroll-number>
  359 + <text class="counterText1">元</text>代金券
  360 + </view>
357 </view> 361 </view>
358 <view slot="modalContent"> 362 <view slot="modalContent">
359 - <view class="couponBox"> 363 + <!-- <view class="couponBox">
360 <view wx:for="{{couponArr}}" class="couponItems"> 364 <view wx:for="{{couponArr}}" class="couponItems">
361 <view class="couponNum font20r">×{{item.number}}</view> 365 <view class="couponNum font20r">×{{item.number}}</view>
362 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 366 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -364,7 +368,8 @@ @@ -364,7 +368,8 @@
364 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 368 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
365 <view class="font28r couponCondition" wx:else>无门槛</view> 369 <view class="font28r couponCondition" wx:else>无门槛</view>
366 </view> 370 </view>
367 - </view> 371 + </view> -->
  372 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
368 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 373 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
369 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 374 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
370 </view> 375 </view>
@@ -856,11 +856,17 @@ @@ -856,11 +856,17 @@
856 justify-content: center; 856 justify-content: center;
857 } 857 }
858 858
859 -.couponTotal text { 859 +.counterText {
860 color: #ffc806; 860 color: #ffc806;
861 font-weight: 600; 861 font-weight: 600;
862 font-size: 80rpx; 862 font-size: 80rpx;
863 - margin: 0 14rpx; 863 + margin-right: 14rpx;
  864 +}
  865 +
  866 +.couponInfo {
  867 + color: #DFDFDF;
  868 + text-align: center;
  869 + margin-bottom: 30rpx;
864 } 870 }
865 871
866 .couponBox { 872 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -355,13 +355,17 @@ @@ -355,13 +355,17 @@
355 </view> 355 </view>
356 </my-modal> 356 </my-modal>
357 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 357 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
358 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 358 + <view slot="modalName" class="titleModal titleModal2">
359 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 359 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
360 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 360 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
361 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 361 + <view class="couponTotal" wx:if="{{totalPrice}}">
  362 + 赠送给您
  363 + <scroll-number value="{{totalPrice}}"></scroll-number>
  364 + <text class="counterText1">元</text>代金券
  365 + </view>
362 </view> 366 </view>
363 <view slot="modalContent"> 367 <view slot="modalContent">
364 - <view class="couponBox"> 368 + <!-- <view class="couponBox">
365 <view wx:for="{{couponArr}}" class="couponItems"> 369 <view wx:for="{{couponArr}}" class="couponItems">
366 <view class="couponNum font20r">×{{item.number}}</view> 370 <view class="couponNum font20r">×{{item.number}}</view>
367 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 371 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -369,7 +373,8 @@ @@ -369,7 +373,8 @@
369 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 373 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
370 <view class="font28r couponCondition" wx:else>无门槛</view> 374 <view class="font28r couponCondition" wx:else>无门槛</view>
371 </view> 375 </view>
372 - </view> 376 + </view> -->
  377 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
373 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 378 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
374 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 379 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
375 </view> 380 </view>
@@ -888,11 +888,17 @@ @@ -888,11 +888,17 @@
888 justify-content: center; 888 justify-content: center;
889 } 889 }
890 890
891 -.couponTotal text { 891 +.counterText {
892 color: #ffc806; 892 color: #ffc806;
893 font-weight: 600; 893 font-weight: 600;
894 font-size: 80rpx; 894 font-size: 80rpx;
895 - margin: 0 14rpx; 895 + margin-right: 14rpx;
  896 +}
  897 +
  898 +.couponInfo {
  899 + color: #DFDFDF;
  900 + text-align: center;
  901 + margin-bottom: 30rpx;
896 } 902 }
897 903
898 .couponBox { 904 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -338,13 +338,17 @@ @@ -338,13 +338,17 @@
338 </view> 338 </view>
339 </my-modal> 339 </my-modal>
340 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 340 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
341 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 341 + <view slot="modalName" class="titleModal titleModal2">
342 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 342 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
343 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 343 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
344 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 344 + <view class="couponTotal" wx:if="{{totalPrice}}">
  345 + 赠送给您
  346 + <scroll-number value="{{totalPrice}}"></scroll-number>
  347 + <text class="counterText1">元</text>代金券
  348 + </view>
345 </view> 349 </view>
346 <view slot="modalContent"> 350 <view slot="modalContent">
347 - <view class="couponBox"> 351 + <!-- <view class="couponBox">
348 <view wx:for="{{couponArr}}" class="couponItems"> 352 <view wx:for="{{couponArr}}" class="couponItems">
349 <view class="couponNum font20r">×{{item.number}}</view> 353 <view class="couponNum font20r">×{{item.number}}</view>
350 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 354 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -352,7 +356,8 @@ @@ -352,7 +356,8 @@
352 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 356 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
353 <view class="font28r couponCondition" wx:else>无门槛</view> 357 <view class="font28r couponCondition" wx:else>无门槛</view>
354 </view> 358 </view>
355 - </view> 359 + </view> -->
  360 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
356 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 361 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
357 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 362 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
358 </view> 363 </view>
@@ -878,11 +878,17 @@ @@ -878,11 +878,17 @@
878 justify-content: center; 878 justify-content: center;
879 } 879 }
880 880
881 -.couponTotal text { 881 +.counterText {
882 color: #ffc806; 882 color: #ffc806;
883 font-weight: 600; 883 font-weight: 600;
884 font-size: 80rpx; 884 font-size: 80rpx;
885 - margin: 0 14rpx; 885 + margin-right: 14rpx;
  886 +}
  887 +
  888 +.couponInfo {
  889 + color: #DFDFDF;
  890 + text-align: center;
  891 + margin-bottom: 30rpx;
886 } 892 }
887 893
888 .couponBox { 894 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -337,13 +337,17 @@ @@ -337,13 +337,17 @@
337 </view> 337 </view>
338 </my-modal> 338 </my-modal>
339 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 339 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
340 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 340 + <view slot="modalName" class="titleModal titleModal2">
341 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 341 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
342 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 342 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
343 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 343 + <view class="couponTotal" wx:if="{{totalPrice}}">
  344 + 赠送给您
  345 + <scroll-number value="{{totalPrice}}"></scroll-number>
  346 + <text class="counterText1">元</text>代金券
  347 + </view>
344 </view> 348 </view>
345 <view slot="modalContent"> 349 <view slot="modalContent">
346 - <view class="couponBox"> 350 + <!-- <view class="couponBox">
347 <view wx:for="{{couponArr}}" class="couponItems"> 351 <view wx:for="{{couponArr}}" class="couponItems">
348 <view class="couponNum font20r">×{{item.number}}</view> 352 <view class="couponNum font20r">×{{item.number}}</view>
349 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 353 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -351,7 +355,8 @@ @@ -351,7 +355,8 @@
351 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 355 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
352 <view class="font28r couponCondition" wx:else>无门槛</view> 356 <view class="font28r couponCondition" wx:else>无门槛</view>
353 </view> 357 </view>
354 - </view> 358 + </view> -->
  359 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
355 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 360 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
356 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 361 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
357 </view> 362 </view>
@@ -877,11 +877,17 @@ @@ -877,11 +877,17 @@
877 justify-content: center; 877 justify-content: center;
878 } 878 }
879 879
880 -.couponTotal text { 880 +.counterText {
881 color: #ffc806; 881 color: #ffc806;
882 font-weight: 600; 882 font-weight: 600;
883 font-size: 80rpx; 883 font-size: 80rpx;
884 - margin: 0 14rpx; 884 + margin-right: 14rpx;
  885 +}
  886 +
  887 +.couponInfo {
  888 + color: #DFDFDF;
  889 + text-align: center;
  890 + margin-bottom: 30rpx;
885 } 891 }
886 892
887 .couponBox { 893 .couponBox {
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 "usingComponents": { 5 "usingComponents": {
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 - "my-modal": "/components/modal/modal" 8 + "my-modal": "/components/modal/modal",
  9 + "scroll-number": "/components/scroll-number/index"
9 } 10 }
10 } 11 }
@@ -325,13 +325,17 @@ @@ -325,13 +325,17 @@
325 </view> 325 </view>
326 </my-modal> 326 </my-modal>
327 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 327 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
328 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 328 + <view slot="modalName" class="titleModal titleModal2">
329 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 329 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
330 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 330 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
331 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 331 + <view class="couponTotal" wx:if="{{totalPrice}}">
  332 + 赠送给您
  333 + <scroll-number value="{{totalPrice}}"></scroll-number>
  334 + <text class="counterText1">元</text>代金券
  335 + </view>
332 </view> 336 </view>
333 <view slot="modalContent"> 337 <view slot="modalContent">
334 - <view class="couponBox"> 338 + <!-- <view class="couponBox">
335 <view wx:for="{{couponArr}}" class="couponItems"> 339 <view wx:for="{{couponArr}}" class="couponItems">
336 <view class="couponNum font20r">×{{item.number}}</view> 340 <view class="couponNum font20r">×{{item.number}}</view>
337 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 341 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -339,7 +343,8 @@ @@ -339,7 +343,8 @@
339 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 343 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
340 <view class="font28r couponCondition" wx:else>无门槛</view> 344 <view class="font28r couponCondition" wx:else>无门槛</view>
341 </view> 345 </view>
342 - </view> 346 + </view> -->
  347 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
343 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 348 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
344 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 349 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
345 </view> 350 </view>
@@ -1027,11 +1027,17 @@ @@ -1027,11 +1027,17 @@
1027 justify-content: center; 1027 justify-content: center;
1028 } 1028 }
1029 1029
1030 -.couponTotal text { 1030 +.counterText {
1031 color: #ffc806; 1031 color: #ffc806;
1032 font-weight: 600; 1032 font-weight: 600;
1033 font-size: 80rpx; 1033 font-size: 80rpx;
1034 - margin: 0 14rpx; 1034 + margin-right: 14rpx;
  1035 +}
  1036 +
  1037 +.couponInfo {
  1038 + color: #DFDFDF;
  1039 + text-align: center;
  1040 + margin-bottom: 30rpx;
1035 } 1041 }
1036 1042
1037 .couponBox { 1043 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -350,13 +350,17 @@ @@ -350,13 +350,17 @@
350 </view> 350 </view>
351 </my-modal> 351 </my-modal>
352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 352 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
353 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 353 + <view slot="modalName" class="titleModal titleModal2">
354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 354 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 355 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
356 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 356 + <view class="couponTotal" wx:if="{{totalPrice}}">
  357 + 赠送给您
  358 + <scroll-number value="{{totalPrice}}"></scroll-number>
  359 + <text class="counterText1">元</text>代金券
  360 + </view>
357 </view> 361 </view>
358 <view slot="modalContent"> 362 <view slot="modalContent">
359 - <view class="couponBox"> 363 + <!-- <view class="couponBox">
360 <view wx:for="{{couponArr}}" class="couponItems"> 364 <view wx:for="{{couponArr}}" class="couponItems">
361 <view class="couponNum font20r">×{{item.number}}</view> 365 <view class="couponNum font20r">×{{item.number}}</view>
362 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 366 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -364,7 +368,8 @@ @@ -364,7 +368,8 @@
364 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 368 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
365 <view class="font28r couponCondition" wx:else>无门槛</view> 369 <view class="font28r couponCondition" wx:else>无门槛</view>
366 </view> 370 </view>
367 - </view> 371 + </view> -->
  372 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
368 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 373 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
369 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 374 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
370 </view> 375 </view>
@@ -876,11 +876,17 @@ @@ -876,11 +876,17 @@
876 justify-content: center; 876 justify-content: center;
877 } 877 }
878 878
879 -.couponTotal text { 879 +.counterText {
880 color: #ffc806; 880 color: #ffc806;
881 font-weight: 600; 881 font-weight: 600;
882 font-size: 80rpx; 882 font-size: 80rpx;
883 - margin: 0 14rpx; 883 + margin-right: 14rpx;
  884 +}
  885 +
  886 +.couponInfo {
  887 + color: #DFDFDF;
  888 + text-align: center;
  889 + margin-bottom: 30rpx;
884 } 890 }
885 891
886 .couponBox { 892 .couponBox {
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "painter":"/components/painter/painter", 7 "painter":"/components/painter/painter",
8 "titleStyle":"/components/titleStyle/titleStyle", 8 "titleStyle":"/components/titleStyle/titleStyle",
9 - "my-modal": "/components/modal/modal" 9 + "my-modal": "/components/modal/modal",
  10 + "scroll-number": "/components/scroll-number/index"
10 } 11 }
11 } 12 }
@@ -349,13 +349,17 @@ @@ -349,13 +349,17 @@
349 </my-modal> 349 </my-modal>
350 350
351 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 351 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
352 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 352 + <view slot="modalName" class="titleModal titleModal2">
353 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 353 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
354 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 354 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
355 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 355 + <view class="couponTotal" wx:if="{{totalPrice}}">
  356 + 赠送给您
  357 + <scroll-number value="{{totalPrice}}"></scroll-number>
  358 + <text class="counterText1">元</text>代金券
  359 + </view>
356 </view> 360 </view>
357 <view slot="modalContent"> 361 <view slot="modalContent">
358 - <view class="couponBox"> 362 + <!-- <view class="couponBox">
359 <view wx:for="{{couponArr}}" class="couponItems"> 363 <view wx:for="{{couponArr}}" class="couponItems">
360 <view class="couponNum font20r">×{{item.number}}</view> 364 <view class="couponNum font20r">×{{item.number}}</view>
361 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 365 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -363,7 +367,8 @@ @@ -363,7 +367,8 @@
363 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 367 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
364 <view class="font28r couponCondition" wx:else>无门槛</view> 368 <view class="font28r couponCondition" wx:else>无门槛</view>
365 </view> 369 </view>
366 - </view> 370 + </view> -->
  371 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
367 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 372 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
368 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 373 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
369 </view> 374 </view>
@@ -876,11 +876,17 @@ @@ -876,11 +876,17 @@
876 justify-content: center; 876 justify-content: center;
877 } 877 }
878 878
879 -.couponTotal text { 879 +.counterText {
880 color: #ffc806; 880 color: #ffc806;
881 font-weight: 600; 881 font-weight: 600;
882 font-size: 80rpx; 882 font-size: 80rpx;
883 - margin: 0 14rpx; 883 + margin-right: 14rpx;
  884 +}
  885 +
  886 +.couponInfo {
  887 + color: #DFDFDF;
  888 + text-align: center;
  889 + margin-bottom: 30rpx;
884 } 890 }
885 891
886 .couponBox { 892 .couponBox {
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 "nav": "/components/nav/nav", 5 "nav": "/components/nav/nav",
6 "painter":"/components/painter/painter", 6 "painter":"/components/painter/painter",
7 "titleStyle":"/components/titleStyle/titleStyle", 7 "titleStyle":"/components/titleStyle/titleStyle",
8 - "my-modal": "/components/modal/modal" 8 + "my-modal": "/components/modal/modal",
  9 + "scroll-number": "/components/scroll-number/index"
9 } 10 }
10 } 11 }
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 src="https://nosqn.colorcun.com/sellerGift.png" mode=""/> 10 src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
11 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 11 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
12 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 12 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
13 - <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;"> 13 + <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">
14 <view class="infoTop"> 14 <view class="infoTop">
15 <view class="infoTopName"> 15 <view class="infoTopName">
16 <text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text> 16 <text space="nbsp" class="font28r" wx:if="{{reserve && reserve.swich_slogan == '1' && home && home.slogan}}">{{home.slogan}}</text>
@@ -348,13 +348,17 @@ @@ -348,13 +348,17 @@
348 </view> 348 </view>
349 </my-modal> 349 </my-modal>
350 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 350 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
351 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 351 + <view slot="modalName" class="titleModal titleModal2">
352 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 352 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
353 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view> 353 <view class="nameInfo">{{seller.name||reserve.seller_name}}</view>
354 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 354 + <view class="couponTotal" wx:if="{{totalPrice}}">
  355 + 赠送给您
  356 + <scroll-number value="{{totalPrice}}"></scroll-number>
  357 + <text class="counterText1">元</text>代金券
  358 + </view>
355 </view> 359 </view>
356 <view slot="modalContent"> 360 <view slot="modalContent">
357 - <view class="couponBox"> 361 + <!-- <view class="couponBox">
358 <view wx:for="{{couponArr}}" class="couponItems"> 362 <view wx:for="{{couponArr}}" class="couponItems">
359 <view class="couponNum font20r">×{{item.number}}</view> 363 <view class="couponNum font20r">×{{item.number}}</view>
360 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 364 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -362,7 +366,8 @@ @@ -362,7 +366,8 @@
362 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 366 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
363 <view class="font28r couponCondition" wx:else>无门槛</view> 367 <view class="font28r couponCondition" wx:else>无门槛</view>
364 </view> 368 </view>
365 - </view> 369 + </view> -->
  370 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
366 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 371 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
367 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 372 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
368 </view> 373 </view>
@@ -992,11 +992,17 @@ @@ -992,11 +992,17 @@
992 justify-content: center; 992 justify-content: center;
993 } 993 }
994 994
995 -.couponTotal text { 995 +.counterText {
996 color: #ffc806; 996 color: #ffc806;
997 font-weight: 600; 997 font-weight: 600;
998 font-size: 80rpx; 998 font-size: 80rpx;
999 - margin: 0 14rpx; 999 + margin-right: 14rpx;
  1000 +}
  1001 +
  1002 +.couponInfo {
  1003 + color: #DFDFDF;
  1004 + text-align: center;
  1005 + margin-bottom: 30rpx;
1000 } 1006 }
1001 1007
1002 .couponBox { 1008 .couponBox {
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 "usingComponents": { 5 "usingComponents": {
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 "titleStyle":"/components/titleStyle/titleStyle", 7 "titleStyle":"/components/titleStyle/titleStyle",
8 - "my-modal": "/components/modal/modal" 8 + "my-modal": "/components/modal/modal",
  9 + "scroll-number": "/components/scroll-number/index"
9 } 10 }
10 } 11 }
@@ -232,13 +232,17 @@ @@ -232,13 +232,17 @@
232 </view> 232 </view>
233 </view> 233 </view>
234 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 234 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
235 - <view slot="modalName" class="titleModal {{(couponArr.length == '2' || couponArr.length < '2') ? 'titleModal2 ' : (couponArr.length == '4' || couponArr.length < '4') ? 'titleModal3 ' : (couponArr.length > '4') ? 'titleModal4' : '' }}"> 235 + <view slot="modalName" class="titleModal titleModal2">
236 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/> 236 <image bindtap="closeCouponModal" class="closeImg" src="https://qn.colorcun.com/closeOutline.png" mode=""/>
237 <view class="nameInfo">{{seller.sellName}}</view> 237 <view class="nameInfo">{{seller.sellName}}</view>
238 - <view class="couponTotal">赠送给您<text>{{totalPrice}}元</text>代金券</view> 238 + <view class="couponTotal" wx:if="{{totalPrice}}">
  239 + 赠送给您
  240 + <scroll-number value="{{totalPrice}}"></scroll-number>
  241 + <text class="counterText1">元</text>代金券
  242 + </view>
239 </view> 243 </view>
240 <view slot="modalContent"> 244 <view slot="modalContent">
241 - <view class="couponBox"> 245 + <!-- <view class="couponBox">
242 <view wx:for="{{couponArr}}" class="couponItems"> 246 <view wx:for="{{couponArr}}" class="couponItems">
243 <view class="couponNum font20r">×{{item.number}}</view> 247 <view class="couponNum font20r">×{{item.number}}</view>
244 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view> 248 <view class="font36r couponPrice">¥<text>{{item.price}}</text></view>
@@ -246,7 +250,8 @@ @@ -246,7 +250,8 @@
246 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view> 250 <view class="font28r couponCondition" wx:if="{{item.desc!='0'}}">消费满{{item.desc}}元可用</view>
247 <view class="font28r couponCondition" wx:else>无门槛</view> 251 <view class="font28r couponCondition" wx:else>无门槛</view>
248 </view> 252 </view>
249 - </view> 253 + </view> -->
  254 + <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
250 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 255 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
251 </view> 256 </view>
252 </my-modal> 257 </my-modal>
@@ -526,11 +526,17 @@ @@ -526,11 +526,17 @@
526 justify-content: center; 526 justify-content: center;
527 } 527 }
528 528
529 -.couponTotal text { 529 +.counterText {
530 color: #ffc806; 530 color: #ffc806;
531 font-weight: 600; 531 font-weight: 600;
532 font-size: 80rpx; 532 font-size: 80rpx;
533 - margin: 0 14rpx; 533 + margin-right: 14rpx;
  534 +}
  535 +
  536 +.couponInfo {
  537 + color: #DFDFDF;
  538 + text-align: center;
  539 + margin-bottom: 30rpx;
534 } 540 }
535 541
536 .couponBox { 542 .couponBox {