xt / xcx-book · Commits

Go to a project

Commit 27ba5793962510bc8652a1eb41070e6ef4726638

Authored by pengye
1 parent 47d1ad49
build: skipped

优惠券过期提醒、优惠券状态通知，加订阅消息提示

Inline Side-by-side
Showing 38 changed files with 333 additions and 140 deletions
@@ -4,6 +4,8 @@ import App from '../../utils/api'; @@ -4,6 +4,8 @@ import App from '../../utils/api';
4 const subscribe=[ 4 const subscribe=[
5 'ZwAkHfP8xUvBZKJn4VXsjRxUDTuCMjWqd8lTsdCPdks',//包厢预订通知 状态、预订门店、包厢名称、备注 5 'ZwAkHfP8xUvBZKJn4VXsjRxUDTuCMjWqd8lTsdCPdks',//包厢预订通知 状态、预订门店、包厢名称、备注
6 'Pf1iEkCA8TnfeqEMkf-_338U78d4Js36pk6sbB0yem0',//消费金额反馈提醒 消费总额、包间名称、餐厅名称、预订日期 6 'Pf1iEkCA8TnfeqEMkf-_338U78d4Js36pk6sbB0yem0',//消费金额反馈提醒 消费总额、包间名称、餐厅名称、预订日期
  7 + 'oFnUM-ncr7zqHt7TeQRAGj5ifwqaR89t9yK7Bqj5bUU',//优惠券过期提醒
  8 + '0MfK1XrA3a-6hAeE_NHYTXedr5q4KnUlO3Q2fykjN8M',//优惠券状态通知
7 ] 9 ]
8 Component({ 10 Component({
9 /** 11 /**
@@ -79,7 +81,7 @@ Component({ @@ -79,7 +81,7 @@ Component({
79 },800) 81 },800)
80 this.triggerEvent('event',{type:'success'}) 82 this.triggerEvent('event',{type:'success'})
81 }else{ 83 }else{
82 - util.toast('订阅失败，请在设置中打开','none') 84 + util.toast('订阅失败，请在设置-消息管理中打开','none')
83 this.triggerEvent('event',{type:'fail'}) 85 this.triggerEvent('event',{type:'fail'})
84 } 86 }
85 }, 87 },
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 总计：<text>￥{{totalize}}</text>元 107 总计：<text>￥{{totalize}}</text>元
108 </view> 108 </view>
109 <button 109 <button
110 - class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (this.data.detail.grant_last && (detail.grant_last*1)<(num*1)))?'btns btnsDisabled':'btns'}}" 110 + class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (detail.grant_last && (detail.grant_last*1)<(num*1)))?'btns btnsDisabled':'btns'}}"
111 bindtap="submitOrder">提交订单 111 bindtap="submitOrder">提交订单
112 </button> 112 </button>
113 </view> 113 </view>
@@ -73,7 +73,9 @@ @@ -73,7 +73,9 @@
73 </view> 73 </view>
74 <view slot="modalContent"> 74 <view slot="modalContent">
75 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 75 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
76 - <view bindtap="closegiveCouponModal" class="couponBtn font36r">我知道了</view> 76 + <subscribe ids="{{[2,3]}}" bindtap="closegiveCouponModal">
  77 + <view class="couponBtn font36r">我知道了</view>
  78 + </subscribe>
77 <view class="couponText font24r" bindtap="certificate">点击查看详情</view> 79 <view class="couponText font24r" bindtap="certificate">点击查看详情</view>
78 </view> 80 </view>
79 </my-modal> 81 </my-modal>
@@ -161,12 +161,18 @@ Page({ @@ -161,12 +161,18 @@ Page({
161 if(that.data.opt.types == '1'){ 161 if(that.data.opt.types == '1'){
162 console.log('StyleType',this.data.StyleType); 162 console.log('StyleType',this.data.StyleType);
163 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 163 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
164 - let style =arr.includes(parseInt(this.data.StyleType)) 164 + let StyleType = this.data.StyleType;
  165 + let style =arr.includes(parseInt(StyleType))
165 if (!style) { 166 if (!style) {
166 - url = `/pack-invitation/pages/detail_owner_invitation${that.data.StyleType}?id=${that.data.opt.detail.oid}`; 167 + url = `/pack-invitation/pages/detail_owner_invitation${StyleType}?id=${that.data.opt.detail.oid}`;
167 } else { 168 } else {
168 url = `/pack-invitation/pages/detail_owner_invitation9?id=${that.data.opt.detail.oid}`; 169 url = `/pack-invitation/pages/detail_owner_invitation9?id=${that.data.opt.detail.oid}`;
169 } 170 }
  171 + if(StyleType == '18' || StyleType == '21') url = `/pack-invitation/pages/detail_owner_invitation11?id=${that.data.opt.detail.oid}`;
  172 + if(StyleType == '19' || StyleType == '22') url = `/pack-invitation/pages/detail_owner_invitation12?id=${that.data.opt.detail.oid}`;
  173 + if(StyleType == '20') url = `/pack-invitation/pages/detail_owner_invitation10?id=${that.data.opt.detail.oid}`;
  174 + if(StyleType == '18' || StyleType == '19') url += '&bookType=1';
  175 + if(StyleType == '21' || StyleType == '22') url += '&bookType=2';
170 } 176 }
171 if (that.data.opt.types == '2') { 177 if (that.data.opt.types == '2') {
172 let data={} 178 let data={}
@@ -359,13 +365,19 @@ Page({ @@ -359,13 +365,19 @@ Page({
359 // 1 邀请函 2 提前点餐 3商家端分享 365 // 1 邀请函 2 提前点餐 3商家端分享
360 if (this.data.opt.types == '1') { 366 if (this.data.opt.types == '1') {
361 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 367 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
  368 + let StyleType = this.data.StyleType
362 let style =arr.includes(parseInt(this.data.StyleType)) 369 let style =arr.includes(parseInt(this.data.StyleType))
363 let url = ''; 370 let url = '';
364 if (!style) { 371 if (!style) {
365 - url = `/pack-invitation/pages/detail_owner_invitation${this.data.StyleType}?id=${this.data.opt.detail.oid}`; 372 + url = `/pack-invitation/pages/detail_owner_invitation${StyleType}?id=${this.data.opt.detail.oid}`;
366 } else { 373 } else {
367 url = `/pack-invitation/pages/detail_owner_invitation9?id=${this.data.opt.detail.oid}`; 374 url = `/pack-invitation/pages/detail_owner_invitation9?id=${this.data.opt.detail.oid}`;
368 } 375 }
  376 + if(StyleType == '18' || StyleType == '21') url = `/pack-invitation/pages/detail_owner_invitation11?id=${this.data.opt.detail.oid}`;
  377 + if(StyleType == '19' || StyleType == '22') url = `/pack-invitation/pages/detail_owner_invitation12?id=${this.data.opt.detail.oid}`;
  378 + if(StyleType == '20') url = `/pack-invitation/pages/detail_owner_invitation10?id=${this.data.opt.detail.oid}`;
  379 + if(StyleType == '18' || StyleType == '19') url += '&bookType=1';
  380 + if(StyleType == '21' || StyleType == '22') url += '&bookType=2';
369 return wx.reLaunch({ 381 return wx.reLaunch({
370 url 382 url
371 }) 383 })
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTextStyle": "black", 4 "navigationBarTextStyle": "black",
5 "usingComponents": { 5 "usingComponents": {
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
7 - "my-modal": "/components/modal/modal" 7 + "my-modal": "/components/modal/modal",
  8 + "subscribe": "/components/userinfo/subscribe"
8 } 9 }
9 } 10 }
@@ -84,7 +84,9 @@ @@ -84,7 +84,9 @@
84 <view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view> 84 <view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view>
85 </view> 85 </view>
86 </view> 86 </view>
87 - <button class="font32r btnsPay" bindtap="certificate">完成</button> 87 + <subscribe ids="{{[2,3]}}" bindtap="certificate">
  88 + <button class="font32r btnsPay">完成</button>
  89 + </subscribe>
88 </view> 90 </view>
89 </view> 91 </view>
90 </my-modal> 92 </my-modal>
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "usingComponents": { 4 "usingComponents": {
5 "nav": "/components/nav/nav", 5 "nav": "/components/nav/nav",
6 "my-modal": "/components/modal/modal", 6 "my-modal": "/components/modal/modal",
7 - "toast": "/components/toast/index" 7 + "toast": "/components/toast/index",
  8 + "subscribe": "/components/userinfo/subscribe"
8 } 9 }
9 } 10 }
@@ -160,7 +160,11 @@ @@ -160,7 +160,11 @@
160 <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}"> 160 <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}">
161 <view bindtap="callPhone">预订包间</view> 161 <view bindtap="callPhone">预订包间</view>
162 </view> 162 </view>
163 - <view wx:if="{{resultCoupon == '0' && detail.grant_last>0}}" class="btn font36r" bindtap="submitOrder">领取到卡包</view> 163 + <block wx:if="{{resultCoupon == '0' && detail.grant_last>0}}">
  164 + <subscribe ids="{{[2,3]}}" bindtap="submitOrder">
  165 + <view class="btn font36r">领取到卡包</view>
  166 + </subscribe>
  167 + </block>
164 </view> 168 </view>
165 </block> 169 </block>
166 <block wx:else> 170 <block wx:else>
@@ -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 "my-modal": "/components/modal/modal", 7 "my-modal": "/components/modal/modal",
8 - "scroll-number": "/components/scroll-number/index" 8 + "scroll-number": "/components/scroll-number/index",
  9 + "subscribe": "/components/userinfo/subscribe"
9 } 10 }
10 } 11 }
@@ -329,7 +329,9 @@ @@ -329,7 +329,9 @@
329 </view> 329 </view>
330 </view> --> 330 </view> -->
331 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 331 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
332 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 332 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  333 + <view class="couponBtn font36r">我知道了</view>
  334 + </subscribe>
333 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 335 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
334 </view> 336 </view>
335 </my-modal> 337 </my-modal>
@@ -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 "my-modal": "/components/modal/modal", 7 "my-modal": "/components/modal/modal",
8 - "scroll-number": "/components/scroll-number/index" 8 + "scroll-number": "/components/scroll-number/index",
  9 + "subscribe": "/components/userinfo/subscribe"
9 } 10 }
10 } 11 }
@@ -496,7 +496,9 @@ @@ -496,7 +496,9 @@
496 </view> 496 </view>
497 </view> --> 497 </view> -->
498 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 498 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
499 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 499 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  500 + <view class="couponBtn font36r">我知道了</view>
  501 + </subscribe>
500 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 502 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
501 </view> 503 </view>
502 </my-modal> 504 </my-modal>
@@ -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 "my-modal": "/components/modal/modal", 7 "my-modal": "/components/modal/modal",
8 - "scroll-number": "/components/scroll-number/index" 8 + "scroll-number": "/components/scroll-number/index",
  9 + "subscribe": "/components/userinfo/subscribe"
9 } 10 }
10 } 11 }
@@ -421,7 +421,9 @@ @@ -421,7 +421,9 @@
421 </view> 421 </view>
422 </view> --> 422 </view> -->
423 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 423 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
424 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 424 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  425 + <view class="couponBtn font36r">我知道了</view>
  426 + </subscribe>
425 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 427 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
426 </view> 428 </view>
427 </my-modal> 429 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -371,7 +371,9 @@ @@ -371,7 +371,9 @@
371 </view> 371 </view>
372 </view> --> 372 </view> -->
373 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 373 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
374 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 374 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  375 + <view class="couponBtn font36r">我知道了</view>
  376 + </subscribe>
375 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 377 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
376 </view> 378 </view>
377 </my-modal> 379 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -376,7 +376,9 @@ @@ -376,7 +376,9 @@
376 </view> 376 </view>
377 </view> --> 377 </view> -->
378 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 378 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
379 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 379 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  380 + <view class="couponBtn font36r">我知道了</view>
  381 + </subscribe>
380 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 382 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
381 </view> 383 </view>
382 </my-modal> 384 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -359,7 +359,9 @@ @@ -359,7 +359,9 @@
359 </view> 359 </view>
360 </view> --> 360 </view> -->
361 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 361 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
362 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 362 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  363 + <view class="couponBtn font36r">我知道了</view>
  364 + </subscribe>
363 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 365 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
364 </view> 366 </view>
365 </my-modal> 367 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -358,7 +358,9 @@ @@ -358,7 +358,9 @@
358 </view> 358 </view>
359 </view> --> 359 </view> -->
360 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 360 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
361 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 361 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  362 + <view class="couponBtn font36r">我知道了</view>
  363 + </subscribe>
362 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 364 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
363 </view> 365 </view>
364 </my-modal> 366 </my-modal>
@@ -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 "my-modal": "/components/modal/modal", 8 "my-modal": "/components/modal/modal",
9 - "scroll-number": "/components/scroll-number/index" 9 + "scroll-number": "/components/scroll-number/index",
  10 + "subscribe": "/components/userinfo/subscribe"
10 } 11 }
11 } 12 }
@@ -346,7 +346,9 @@ @@ -346,7 +346,9 @@
346 </view> 346 </view>
347 </view> --> 347 </view> -->
348 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 348 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
349 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 349 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  350 + <view class="couponBtn font36r">我知道了</view>
  351 + </subscribe>
350 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 352 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
351 </view> 353 </view>
352 </my-modal> 354 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -371,7 +371,9 @@ @@ -371,7 +371,9 @@
371 </view> 371 </view>
372 </view> --> 372 </view> -->
373 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 373 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
374 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 374 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  375 + <view class="couponBtn font36r">我知道了</view>
  376 + </subscribe>
375 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 377 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
376 </view> 378 </view>
377 </my-modal> 379 </my-modal>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  11 + "subscribe": "/components/userinfo/subscribe"
11 } 12 }
12 } 13 }
@@ -370,7 +370,9 @@ @@ -370,7 +370,9 @@
370 </view> 370 </view>
371 </view> --> 371 </view> -->
372 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 372 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
373 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 373 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  374 + <view class="couponBtn font36r">我知道了</view>
  375 + </subscribe>
374 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 376 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
375 </view> 377 </view>
376 </my-modal> 378 </my-modal>
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  10 + "subscribe": "/components/userinfo/subscribe"
10 } 11 }
11 } 12 }
@@ -369,7 +369,9 @@ @@ -369,7 +369,9 @@
369 </view> 369 </view>
370 </view> --> 370 </view> -->
371 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 371 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
372 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 372 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  373 + <view class="couponBtn font36r">我知道了</view>
  374 + </subscribe>
373 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view> 375 <view class="couponText font24r" bindtap="gotoSellerGift" data-form="2">查看更多</view>
374 </view> 376 </view>
375 </my-modal> 377 </my-modal>
@@ -70,13 +70,19 @@ Page({ @@ -70,13 +70,19 @@ Page({
70 }).then(res => { 70 }).then(res => {
71 if(res.data && res.data.type){ 71 if(res.data && res.data.type){
72 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17]; 72 let arr = [9, 10, 11, 12, 13, 14, 15, 16, 17];
73 - let style =arr.includes(parseInt(res.data.type)) 73 + let StyleType = res.data.type
  74 + let style =arr.includes(parseInt(StyleType))
74 let url = ''; 75 let url = '';
75 if (!style) { 76 if (!style) {
76 - url = `/pack-invitation/pages/detail_owner_invitation${res.data.type}?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`; 77 + url = `/pack-invitation/pages/detail_owner_invitation${StyleType}?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
77 } else { 78 } else {
78 url = `/pack-invitation/pages/detail_owner_invitation9?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`; 79 url = `/pack-invitation/pages/detail_owner_invitation9?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
79 } 80 }
  81 + if(StyleType == '18' || StyleType == '21') url = `/pack-invitation/pages/detail_owner_invitation11?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
  82 + if(StyleType == '19' || StyleType == '22') url = `/pack-invitation/pages/detail_owner_invitation12?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
  83 + if(StyleType == '20') url = `/pack-invitation/pages/detail_owner_invitation10?id=${this.detail.id}&hasInvitation=1&hasSellerShare=1&tplid=1`;
  84 + if(StyleType == '18' || StyleType == '19') url += '&bookType=1';
  85 + if(StyleType == '21' || StyleType == '22') url += '&bookType=2';
80 wx.navigateTo({ 86 wx.navigateTo({
81 url 87 url
82 }) 88 })
@@ -146,10 +146,13 @@ Page({ @@ -146,10 +146,13 @@ Page({
146 if (opt.hasInvitation == 1 && configType) { 146 if (opt.hasInvitation == 1 && configType) {
147 let style =arr.includes(parseInt(configType)) 147 let style =arr.includes(parseInt(configType))
148 if (!style) { 148 if (!style) {
149 - url = '/pack-invitation/pages/detail_owner_invitation' + configType;  
150 - } else {  
151 - url = '/pack-invitation/pages/detail_owner_invitation9';  
152 - } 149 + url = '/pack-invitation/pages/detail_owner_invitation' + configType;
  150 + } else {
  151 + url = '/pack-invitation/pages/detail_owner_invitation9';
  152 + }
  153 + if(configType == '18' || configType == '21') url = '/pack-invitation/pages/detail_owner_invitation11';
  154 + if(configType == '19' || configType == '22') url = '/pack-invitation/pages/detail_owner_invitation12';
  155 + if(configType == '20') url = '/pack-invitation/pages/detail_owner_invitation10';
153 } else { 156 } else {
154 url = '/pack-invitation/pages/detail_owner_invitation1'; 157 url = '/pack-invitation/pages/detail_owner_invitation1';
155 } 158 }
@@ -176,6 +179,8 @@ Page({ @@ -176,6 +179,8 @@ Page({
176 if(opt.uid && opt.uid!=''){ 179 if(opt.uid && opt.uid!=''){
177 url+='&uid='+opt.uid; 180 url+='&uid='+opt.uid;
178 } 181 }
  182 + if(configType == '18' || configType == '19') url += '&bookType=1';
  183 + if(configType == '21' || configType == '22') url += '&bookType=2';
179 console.log('wx.redirectTo', url, res); 184 console.log('wx.redirectTo', url, res);
180 this.redirectTo({url: url}); 185 this.redirectTo({url: url});
181 }).catch(res => { 186 }).catch(res => {
@@ -164,19 +164,93 @@ Page({ @@ -164,19 +164,93 @@ Page({
164 id 164 id
165 }).then(res => { 165 }).then(res => {
166 if (res.data.length > 0) { 166 if (res.data.length > 0) {
167 - let couponData = res.data[0]  
168 - couponData.use = couponData.use ? util.determine(couponData.use) : '';  
169 - couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';  
170 - if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {  
171 - let cash = couponData.use.cash * 1;  
172 - let price = couponData.price * 1;  
173 - couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : ''; 167 + let detail = res.data[0]
  168 + let data = detail.expiration_date ? util.determine(detail.expiration_date) : '';
  169 + detail.use = detail.use ? util.determine(detail.use) : '';
  170 + detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
  171 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  172 + let cash = detail.use.cash * 1;
  173 + let price = detail.price * 1;
  174 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  175 + }
  176 + detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
  177 + detail.arule = detail.arule ? util.determine(detail.arule) : '';
  178 + detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';
  179 + detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';
  180 + if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {
  181 + let cash = detail.use.cash * 1;
  182 + let price = detail.price * 1;
  183 + detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
  184 + }
  185 + let num = detail.grant_num*1-detail.grant_last*1;
  186 + if (num > 0) {
  187 + detail.receiveNumText = ''
  188 + if (num >= 0 && num <= 100) {
  189 + detail.receiveNumText = num.toString();
  190 + } else if (num >= 101 && num <= 199) {
  191 + detail.receiveNumText = '100+';
  192 + } else if (num >= 200 && num <= 299) {
  193 + detail.receiveNumText = '200+';
  194 + } else {
  195 + detail.receiveNumText = Math.floor(num / 100) * 100 + '+';
  196 + }
  197 + }
  198 + if(num == 0){
  199 + let str = detail.grant_num*1
  200 + detail.receiveNumText = ''
  201 + if (str >= 0 && str <= 100) {
  202 + detail.receiveNumText = str.toString();
  203 + } else if (str >= 101 && str <= 199) {
  204 + detail.receiveNumText = '100+';
  205 + } else if (str >= 200 && str <= 299) {
  206 + detail.receiveNumText = '200+';
  207 + } else {
  208 + detail.receiveNumText = Math.floor(str / 100) * 100 + '+';
  209 + }
  210 + }
  211 + if (detail.exp_date && detail.exp_date.week_data) {
  212 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  213 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  214 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  215 + if (mor) mor = '早餐：' + mor
  216 + if (noon) noon = '午餐：' + noon
  217 + if (nig) nig = '晚餐：' + nig
  218 + detail.morText = mor;
  219 + detail.noonText = noon;
  220 + detail.nigText = nig;
  221 + }
  222 + detail.resultCoupon = '1'; // 显示已领取
  223 + detail.cdate = detail.cdate * 1;
  224 + detail.useStime = '';
  225 + detail.useEtime = '';
  226 + let condition = detail.aexpiration
  227 + if (condition.valid_forever === '0' && condition.stime && condition.etime) {
  228 + detail.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');
  229 + detail.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');
  230 + }
  231 + if (condition.valid_forever === '1') {
  232 + detail.foreverText = '永久有效';
  233 + }
  234 + if (condition.valid_forever === '0' && condition.today) {
  235 + let obj = this.setTimeRange(detail.cdate, 0, parseInt(condition.today) - 1);
  236 + detail.useStime = obj.useStime;
  237 + detail.useEtime = obj.useEtime;
  238 + }
  239 + if (condition.valid_forever === '0' && condition.tomorrow) {
  240 + let obj = this.setTimeRange(detail.cdate, 1, condition.tomorrow * 1);
  241 + detail.useStime = obj.useStime;
  242 + detail.useEtime = obj.useEtime;
  243 + }
  244 + if (condition.valid_forever === '0' && condition.sday && condition.eday) {
  245 + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);
  246 + detail.useStime = obj.useStime;
  247 + detail.useEtime = obj.useEtime;
174 } 248 }
175 // showCoupon 代表赠送的券没过有效期 && 是开启状态 249 // showCoupon 代表赠送的券没过有效期 && 是开启状态
176 - couponData.showCoupon = (this.data.dataStr<(couponData.etime*1) && couponData.is_open=='1') ? '1' : '0';  
177 - console.log('邀请函--------------------评价赠送的优惠券',couponData); 250 + detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0';
  251 + console.log('邀请函--------------------评价赠送的优惠券',detail);
178 this.setData({ 252 this.setData({
179 - couponData:res.data[0] 253 + couponData:detail
180 }) 254 })
181 } 255 }
182 }) 256 })
@@ -3,109 +3,133 @@ @@ -3,109 +3,133 @@
3 <nav id='nav'>商家有礼</nav> 3 <nav id='nav'>商家有礼</nav>
4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
5 <view class="title" wx:if="{{options.form == '1'}}"> 5 <view class="title" wx:if="{{options.form == '1'}}">
6 - <view class="sign"></view><text class="font32r">专属优惠券</text> 6 + <view class="sign"></view><text class="font28r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
10 <view class="couponWrap"> 10 <view class="couponWrap">
11 - <view class="itemLeft">  
12 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>  
13 - <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>  
14 - <view class="priceText" wx:if="{{item.price}}">  
15 - <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>  
16 - </view>  
17 - <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view> 11 + <view class="itemLeft">
  12 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  13 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  14 + <view class="priceText" wx:if="{{item.price}}">
  15 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
18 </view> 16 </view>
19 - <view class="couponLine"></view>  
20 - <view class="itemRight">  
21 - <view class="btns">  
22 - <text class="font32r anameText">{{item.aname}}</text>  
23 - <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">  
24 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>  
25 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">  
26 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
27 - </view>  
28 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">  
29 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}  
30 - </view>  
31 - </block>  
32 - <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">  
33 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
34 - <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>  
35 - <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>  
36 - <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>  
37 - <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>  
38 - <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>  
39 - <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>  
40 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>  
41 - </block>  
42 - </view>  
43 - <view class="btnBox" wx:if="{{item.is_type == '3'}}" >  
44 - <view class="font24r orderingFood orderingFood1">已领取</view>  
45 - <view class="grantNum" wx:if="{{item.receiveNumText}}">  
46 - <view class="font24r">已被领取</view>  
47 - <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 17 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
  18 + </view>
  19 + <view class="couponLine"></view>
  20 + <view class="itemRight">
  21 + <view class="btns">
  22 + <text class="font32r anameText">{{item.aname}}</text>
  23 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  24 + <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
  25 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  26 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
48 </view> 27 </view>
  28 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  29 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  30 + </view>
  31 + </block>
  32 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  33 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  34 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  35 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  36 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  37 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  38 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  39 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  40 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  41 + </block>
  42 + </view>
  43 + <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
  44 + <view class="font24r orderingFood orderingFood1">已领取</view>
  45 + <view class="grantNum" wx:if="{{item.receiveNumText}}">
  46 + <view class="font24r">已被领取</view>
  47 + <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
49 </view> 48 </view>
50 - <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">  
51 - 立即抢购  
52 - </view> 49 + </view>
  50 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood orderingFood2">
  51 + 抢购
53 </view> 52 </view>
54 </view> 53 </view>
  54 + </view>
55 </navigator> 55 </navigator>
56 </block> 56 </block>
57 </view> 57 </view>
58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}"> 58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}">
59 <view class="title"> 59 <view class="title">
60 - <view class="sign"></view><text class="font32r">会员充值优惠</text> 60 + <view class="sign"></view><text class="font28r">会员充值优惠</text>
61 </view> 61 </view>
62 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 62 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
63 - <view class="rechargeItems"> 63 + <view class="couponWrap">
64 <view class="itemLeft"> 64 <view class="itemLeft">
65 - <view class="itemTop font36r">  
66 - {{recharge_data.rname}} 65 + <view class="priceText" wx:if="{{recharge_data.recharge_money}}">
  66 + <view class="icons font24r">￥</view><text class="font48r">{{recharge_data.recharge_money}}</text>
67 </view> 67 </view>
68 - <view class="itemBottom font24r" wx:if="{{priceInfo}}">  
69 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
70 - </view>  
71 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
72 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}} 68 + </view>
  69 + <view class="couponLine"></view>
  70 + <view class="itemRight">
  71 + <view class="btns">
  72 + <view class="bottom font24r" wx:if="{{priceInfo}}">
  73 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  74 + </view>
  75 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  76 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
  77 + </view>
  78 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  79 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
  80 + </view>
73 </view> 81 </view>
74 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
75 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。 82 + <view class="font24r orderingFood orderingFood2">
  83 + 充值
76 </view> 84 </view>
77 </view> 85 </view>
78 - <view class="font24r orderingFood">  
79 - 充值  
80 - </view>  
81 </view> 86 </view>
82 </navigator> 87 </navigator>
83 </view> 88 </view>
84 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据--> 89 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据-->
85 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}"> 90 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}">
86 <view class="title"> 91 <view class="title">
87 - <view class="sign"></view><text class="font32r">反馈有礼</text> 92 + <view class="sign"></view><text class="font28r">反馈有礼</text>
88 </view> 93 </view>
89 - <view class="preferentialItems" bindtap="evaluateFun"> 94 + <view class="couponWrap" bindtap="evaluateFun">
90 <view class="itemLeft"> 95 <view class="itemLeft">
91 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text> 96 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
  97 + <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
92 <view class="priceText" wx:if="{{couponData.price}}"> 98 <view class="priceText" wx:if="{{couponData.price}}">
93 - <text class="icons font40r">￥</text><text>{{couponData.price}}</text> 99 + <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text>
94 </view> 100 </view>
  101 + <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
95 </view> 102 </view>
  103 + <view class="couponLine"></view>
96 <view class="itemRight"> 104 <view class="itemRight">
97 <view class="btns"> 105 <view class="btns">
98 - <text class="font40r">{{couponData.aname}}</text>  
99 - <view class="font24r orderingFood">  
100 - 领取  
101 - </view>  
102 - </view>  
103 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>  
104 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">  
105 - 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}} 106 + <text class="font32r anameText">{{couponData.aname}}</text>
  107 + <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
  108 + <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>
  109 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  110 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  111 + </view>
  112 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  113 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  114 + </view>
  115 + </block>
  116 + <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
  117 + <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>
  118 + <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
  119 + <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>
  120 + <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
  121 + <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
  122 + <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
  123 + <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  124 + <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
  125 + </block>
106 </view> 126 </view>
107 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">  
108 - 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}} 127 + <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
  128 + <view class="font24r orderingFood">免费领取</view>
  129 + <view class="grantNum" wx:if="{{couponData.receiveNumText}}">
  130 + <view class="font24r">已被领取</view>
  131 + <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
  132 + </view>
109 </view> 133 </view>
110 </view> 134 </view>
111 </view> 135 </view>
@@ -4,31 +4,32 @@ page { @@ -4,31 +4,32 @@ page {
4 } 4 }
5 5
6 .box { 6 .box {
7 - margin: 24rpx; 7 + margin: 12rpx;
8 border-radius: 10rpx; 8 border-radius: 10rpx;
9 background: #fff; 9 background: #fff;
10 - padding: 40rpx 20rpx; 10 + padding: 12rpx;
11 margin-bottom: 24rpx; 11 margin-bottom: 24rpx;
12 } 12 }
13 13
14 .title { 14 .title {
15 display: flex; 15 display: flex;
16 align-items: center; 16 align-items: center;
17 - border-bottom: 2rpx solid #dbdbdb;  
18 padding: 0 0 12rpx 24rpx; 17 padding: 0 0 12rpx 24rpx;
19 - margin-bottom: 30rpx;  
20 } 18 }
21 19
22 .sign { 20 .sign {
23 width: 6rpx; 21 width: 6rpx;
24 height: 30rpx; 22 height: 30rpx;
25 border-radius: 16rpx; 23 border-radius: 16rpx;
26 - background: #0143a3; 24 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
27 } 25 }
28 26
29 .title text { 27 .title text {
30 margin-left: 10rpx; 28 margin-left: 10rpx;
31 - color: #000; 29 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  30 + -webkit-background-clip: text;
  31 + -webkit-text-fill-color: transparent;
  32 + font-weight: 600;
32 } 33 }
33 34
34 .couponWrap .nodate{ 35 .couponWrap .nodate{
@@ -50,7 +51,6 @@ page { @@ -50,7 +51,6 @@ page {
50 min-height: 160rpx; 51 min-height: 160rpx;
51 padding-bottom: 10rpx; 52 padding-bottom: 10rpx;
52 border-radius: 20rpx; 53 border-radius: 20rpx;
53 - border: 2rpx solid #ff7e06;  
54 } 54 }
55 55
56 56
@@ -93,7 +93,10 @@ page { @@ -93,7 +93,10 @@ page {
93 height: 44rpx; 93 height: 44rpx;
94 width: max-content; 94 width: max-content;
95 flex-shrink: 0; 95 flex-shrink: 0;
96 - background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%); 96 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  97 +}
  98 +.orderingFood2 {
  99 + width: 74rpx !important;
97 } 100 }
98 .couponWrap .icons { 101 .couponWrap .icons {
99 color: #F6231B !important; 102 color: #F6231B !important;
@@ -252,7 +255,7 @@ page { @@ -252,7 +255,7 @@ page {
252 border-radius: 20rpx; 255 border-radius: 20rpx;
253 line-height: 44rpx; 256 line-height: 44rpx;
254 height: 44rpx; 257 height: 44rpx;
255 - background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%); 258 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
256 width: max-content; 259 width: max-content;
257 flex-shrink: 0; 260 flex-shrink: 0;
258 } 261 }
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
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 + "scroll-number": "/components/scroll-number/index",
  10 + "subscribe": "/components/userinfo/subscribe"
10 } 11 }
11 } 12 }
@@ -253,6 +253,8 @@ @@ -253,6 +253,8 @@
253 </view> 253 </view>
254 </view> --> 254 </view> -->
255 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 255 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
256 - <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 256 + <subscribe ids="{{[2,3]}}" bindtap="closeCouponModal">
  257 + <view class="couponBtn font36r">我知道了</view>
  258 + </subscribe>
257 </view> 259 </view>
258 </my-modal> 260 </my-modal>
@@ -6,6 +6,41 @@ @@ -6,6 +6,41 @@
6 "miniprogram": { 6 "miniprogram": {
7 "list": [ 7 "list": [
8 { 8 {
  9 + "name": "免费券付费券付款页",
  10 + "pathName": "pack-activity/pack/buyFreeCoupon",
  11 + "query": "sid=17948",
  12 + "launchMode": "default",
  13 + "scene": null
  14 + },
  15 + {
  16 + "name": "4352-----新邀请函入口页",
  17 + "pathName": "pages/customer/detail_owner_invitation_new",
  18 + "query": "id=1460829&uid=27201&hasSellerShare=1&paymentId=",
  19 + "launchMode": "default",
  20 + "scene": null
  21 + },
  22 + {
  23 + "name": "pack-cookbook/pages/favourableList",
  24 + "pathName": "pack-cookbook/pages/favourableList",
  25 + "query": "sellerName=长安&sellerid=4352&oid=1374502&types=1",
  26 + "launchMode": "default",
  27 + "scene": null
  28 + },
  29 + {
  30 + "name": "pack-activity/pack/confirmPayment",
  31 + "pathName": "pack-activity/pack/confirmPayment",
  32 + "query": "type=2&types=1&detail=",
  33 + "launchMode": "default",
  34 + "scene": null
  35 + },
  36 + {
  37 + "name": "pack-activity/pack/vipRecharge",
  38 + "pathName": "pack-activity/pack/vipRecharge",
  39 + "query": "id=86&name=长安&sid=4352&oid=1374502&types=1&StyleType=8",
  40 + "launchMode": "default",
  41 + "scene": null
  42 + },
  43 + {
9 "name": "新首页", 44 "name": "新首页",
10 "pathName": "pages/reserveNew/coupon_sellerList", 45 "pathName": "pages/reserveNew/coupon_sellerList",
11 "query": "", 46 "query": "",
@@ -48,13 +83,6 @@ @@ -48,13 +83,6 @@
48 "scene": 1044 83 "scene": 1044
49 }, 84 },
50 { 85 {
51 - "name": "4352-----新邀请函入口页",  
52 - "pathName": "pages/customer/detail_owner_invitation_new",  
53 - "query": "id=1374502&uid=27201&hasSellerShare=1&paymentId=",  
54 - "launchMode": "default",  
55 - "scene": null  
56 - },  
57 - {  
58 "name": "在线预订包间", 86 "name": "在线预订包间",
59 "pathName": "pages/reserve/reserve", 87 "pathName": "pages/reserve/reserve",
60 "query": "id=4352&activeTab=reserve", 88 "query": "id=4352&activeTab=reserve",
@@ -90,13 +118,6 @@ @@ -90,13 +118,6 @@
90 "scene": null 118 "scene": null
91 }, 119 },
92 { 120 {
93 - "name": "免费券付费券付款页",  
94 - "pathName": "pack-activity/pack/buyFreeCoupon",  
95 - "query": "sid=8",  
96 - "launchMode": "default",  
97 - "scene": null  
98 - },  
99 - {  
100 "name": "收藏页", 121 "name": "收藏页",
101 "pathName": "pages/me/follow", 122 "pathName": "pages/me/follow",
102 "query": "", 123 "query": "",