xt / xcx-book · Commits

Go to a project

Commit 269458ccdea0eb600d0ab9e0da4469d3f97b8a2e

Authored by pengye
1 parent acf47e30
build: skipped

邀请函18到22模板调整

Inline Side-by-side
Showing 9 changed files with 1349 additions and 1389 deletions
@@ -24,11 +24,9 @@ Page({ @@ -24,11 +24,9 @@ Page({
24 signboard: {}, 24 signboard: {},
25 store: {}, 25 store: {},
26 recharge_data: {}, 26 recharge_data: {},
  27 + activeData: {},
27 coupon_dataList: [], 28 coupon_dataList: [],
28 seller: {}, 29 seller: {},
29 - priceInfo: '',  
30 - scoreInfo: '',  
31 - certificate: '',  
32 dataStr: Date.now() * 1 / 1000, 30 dataStr: Date.now() * 1 / 1000,
33 swich_phone: '0', //是否显示前台电话 31 swich_phone: '0', //是否显示前台电话
34 is_comments: '0', 32 is_comments: '0',
@@ -673,10 +671,8 @@ Page({ @@ -673,10 +671,8 @@ Page({
673 couponList = this.addCoupons(coupon_data_free,couponList); 671 couponList = this.addCoupons(coupon_data_free,couponList);
674 // 根据券ID获取券详情 672 // 根据券ID获取券详情
675 this.getActivityByIdFun(couponList) 673 this.getActivityByIdFun(couponList)
676 - // 根据充值ID获取充值详情  
677 - if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {  
678 - this.getRechargeDetail(marketing.recharge_data.id)  
679 - } 674 + // 获取所有充值活动
  675 + this.getRechargeDetail()
680 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 676 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
681 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 677 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
682 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 678 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
@@ -864,35 +860,58 @@ Page({ @@ -864,35 +860,58 @@ Page({
864 } 860 }
865 }, 861 },
866 // 根据充值ID获取充值详情 862 // 根据充值ID获取充值详情
867 - getRechargeDetail(id) {  
868 - App.Activity.GetNewRecharge({  
869 - id 863 + getRechargeDetail() {
  864 + App.Activity.GetNewRechargeList({
  865 + sellerid: this.data.detail.seller.id,
870 }).then(res => { 866 }).then(res => {
871 if (res.data) { 867 if (res.data) {
872 - let detail = res.data  
873 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
874 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
875 - let priceInfo, scoreInfo, certificate;  
876 - detail.recharge_list = recharge_list;  
877 - detail.exp_date = exp_date;  
878 - if (recharge_list.is_price == '1') priceInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.price + '元余额';  
879 - if (recharge_list.is_score == '1') scoreInfo = '会员充值满' + detail.recharge_money + '元赠送' + recharge_list.score + '积分';  
880 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
881 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : '' 868 + let arr = []
  869 + res.data.forEach(i => {
  870 + if (i.status != '1') {
  871 + arr.push(i)
  872 + }
  873 + })
  874 + let recharge_data = arr;
  875 + recharge_data.forEach(item => {
  876 + item.recharge_list = item.recharge_list ? JSON.parse(item.recharge_list) : '';
  877 + let recharge_list = item.recharge_list;
  878 + item.priceInfo = '';
  879 + item.scoreInfo = '';
  880 + item.certificate = '';
  881 + if (recharge_list.is_price == '1') item.priceInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.price + '元余额';
  882 + if (recharge_list.is_score == '1') item.scoreInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.score + '积分';
  883 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) item.certificate = recharge_list.coupons_names.join('、');
  884 + item.timeStr = util.unixtoTime(item.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(item.etime, 'YYYY-MM-DD')
  885 + })
  886 + // 筛选出 未过期的 && 开启状态的充值活动
  887 + recharge_data = recharge_data.filter(item => {
  888 + return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
  889 + })
882 console.log('邀请函--------------充值', recharge_data); 890 console.log('邀请函--------------充值', recharge_data);
883 this.setData({ 891 this.setData({
884 recharge_data, 892 recharge_data,
885 - scoreInfo,  
886 - priceInfo,  
887 - certificate 893 + activeData: recharge_data.length > 0 ? recharge_data[0] : {},
888 }) 894 })
889 } else { 895 } else {
890 this.setData({ 896 this.setData({
891 - recharge_data: {}, 897 + recharge_data: [],
  898 + activeData: {},
892 }) 899 })
893 } 900 }
894 }) 901 })
895 }, 902 },
  903 + // 选择充值活动
  904 + checkRechargeData(e) {
  905 + let id = e.currentTarget.dataset['id'];
  906 + let obj = this.data.recharge_data.filter(item => {
  907 + return item.id == id
  908 + })
  909 + if (obj && obj.length > 0) {
  910 + this.setData({
  911 + activeData: obj[0]
  912 + })
  913 + }
  914 + },
896 // 获取评价赠送的券最新详情 915 // 获取评价赠送的券最新详情
897 getEvaluateFun(id) { 916 getEvaluateFun(id) {
898 App.Activity.GetActivityById({ 917 App.Activity.GetActivityById({
@@ -1221,7 +1240,6 @@ Page({ @@ -1221,7 +1240,6 @@ Page({
1221 }, 1240 },
1222 // 计算免费券有效期的起始、结束日期 1241 // 计算免费券有效期的起始、结束日期
1223 setTimeRange(cdate, startOffset, endOffset) { 1242 setTimeRange(cdate, startOffset, endOffset) {
1224 - console.log(cdate, startOffset, endOffset);  
1225 const startDate = new Date((cdate + startOffset * 86400) * 1000); 1243 const startDate = new Date((cdate + startOffset * 86400) * 1000);
1226 startDate.setHours(0, 0, 0, 0); 1244 startDate.setHours(0, 0, 0, 0);
1227 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD'); 1245 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD');
@@ -1408,14 +1426,10 @@ Page({ @@ -1408,14 +1426,10 @@ Page({
1408 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : ''; 1426 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : '';
1409 } 1427 }
1410 intel.imgsInfo = imgs; 1428 intel.imgsInfo = imgs;
1411 - intel.videoImgsInfo = imgs.map(url => ({  
1412 - type: "1",  
1413 - content: url,  
1414 - }));  
1415 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') { 1429 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') {
1416 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n'); 1430 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n');
1417 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content); 1431 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content);
1418 - intel.videoImgsInfo = intel.content.filter(item => ((item.type === "1" || item.type === "3") && item.content)); 1432 + intel.videosInfo = intel.content.filter(item => (item.type === "3" && item.content));
1419 } 1433 }
1420 return intel 1434 return intel
1421 }, 1435 },
@@ -16,209 +16,187 @@ @@ -16,209 +16,187 @@
16 </view> 16 </view>
17 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}"> 17 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}">
18 <view class="record font28r">预订贵宾：</view> 18 <view class="record font28r">预订贵宾：</view>
19 - <view class="contentData font28r">{{detail.rnameStr}}</view> 19 + <view class="contentData font32r">{{detail.rnameStr}}</view>
20 </view> 20 </view>
21 <view class="infoItem" wx:if="{{seller.date}}"> 21 <view class="infoItem" wx:if="{{seller.date}}">
22 <view class="record font28r">用餐日期：</view> 22 <view class="record font28r">用餐日期：</view>
23 - <view class="contentData font28r">{{seller.date}}</view> 23 + <view class="contentData font32r">{{seller.date}}</view>
24 </view> 24 </view>
25 <view class="infoItem" wx:if="{{seller.tablesText}}"> 25 <view class="infoItem" wx:if="{{seller.tablesText}}">
26 <view class="record font28r">用餐位置：</view> 26 <view class="record font28r">用餐位置：</view>
27 - <view class="contentData font28r">{{seller.tablesText}}</view> 27 + <view class="contentData font32r">{{seller.tablesText}}</view>
28 </view> 28 </view>
29 <view class="infoItem" wx:if="{{seller.soltName}}"> 29 <view class="infoItem" wx:if="{{seller.soltName}}">
30 <view class="record font28r">用餐时间：</view> 30 <view class="record font28r">用餐时间：</view>
31 <view class="arrivalBox"> 31 <view class="arrivalBox">
32 - <view class="contentData font28r">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view> 32 + <view class="contentData font32r contentFlex">{{seller.soltName}}<text class="marLeft font32r">{{temp_ddate}}</text></view>
33 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}"> 33 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}">
34 <view class="picker"> 34 <view class="picker">
35 - <button>修改到店时间</button> 35 + <image class="arrivalImg" src="https://nosqn.colorcun.com/editDdateTime3.png" mode=""/>
36 </view> 36 </view>
37 </picker> 37 </picker>
38 </view> 38 </view>
39 </view> 39 </view>
40 <view class="infoItem" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}"> 40 <view class="infoItem" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}">
41 <view class="record font28r">前台电话：</view> 41 <view class="record font28r">前台电话：</view>
42 - <view class="contentData font28r"> 42 + <view class="contentData font32r">
43 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block> 43 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block>
44 </view> 44 </view>
45 </view> 45 </view>
46 </view> 46 </view>
47 <view class="addressBox"> 47 <view class="addressBox">
  48 + <map style="width:100%; height:240rpx;" longitude="{{seller.long}}" latitude="{{seller.lat}}" scale="15" markers="{{markers}}" bindmarkertap="navRoad" data-marker="{{markers[0]}}" show-location />
48 <view class="positioning" bindtap="looklocation"> 49 <view class="positioning" bindtap="looklocation">
49 <image src="https://qn.colorcun.com/invitation10Dw.png" mode="aspectFill" /> 50 <image src="https://qn.colorcun.com/invitation10Dw.png" mode="aspectFill" />
50 <text space="nbsp" class="font32r positioningText">{{seller.addr || reserve.seller.map_address}}</text> 51 <text space="nbsp" class="font32r positioningText">{{seller.addr || reserve.seller.map_address}}</text>
51 </view> 52 </view>
52 - <map style="width:100%; height:300rpx;" longitude="{{seller.long}}" latitude="{{seller.lat}}" scale="15" markers="{{markers}}" bindmarkertap="navRoad" data-marker="{{markers[0]}}" show-location />  
53 </view> 53 </view>
54 <view class="receptionBox" wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 54 <view class="receptionBox" wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
55 <view class="peopleInfo"> 55 <view class="peopleInfo">
56 - <image bindtap="lookImgs" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>  
57 - <view class="font26r">{{staffinfo.name}}</view>  
58 - <view class="font26r">{{staffinfo.position}}</view> 56 + <image bindtap="lookImgs" wx:if="{{staffinfo.photo}}" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
  57 + <view class="noHeaderimg" wx:else></view>
  58 + <view class="font28r">{{staffinfo.name}}</view>
  59 + <view class="font28r">{{staffinfo.position}}</view>
59 </view> 60 </view>
60 <view class="handleInfo"> 61 <view class="handleInfo">
61 <view class="font40r">尊敬的贵宾您好！</view> 62 <view class="font40r">尊敬的贵宾您好！</view>
62 <view class="font26r texts">很荣幸能为您提供专属接待和服务</view> 63 <view class="font26r texts">很荣幸能为您提供专属接待和服务</view>
63 <view class="contactBtns"> 64 <view class="contactBtns">
64 - <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call"> 65 + <view wx:if="{{staffinfo.phone}}" class="font24r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call">
65 <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text> 66 <image src="https://qn.colorcun.com/invitation10Phone1.png" mode="" /><text>联系我</text>
66 </view> 67 </view>
67 - <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="copyWeChat"> 68 + <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">
68 <image src="https://qn.colorcun.com/invitation10Wx2.png" mode="" /><text>加微信</text> 69 <image src="https://qn.colorcun.com/invitation10Wx2.png" mode="" /><text>加微信</text>
69 </view> 70 </view>
70 </view> 71 </view>
71 </view> 72 </view>
72 </view> 73 </view>
  74 + <text space="nbsp" wx:if="{{marketing.wecomle}}" class="welcomeInfo font32r">{{marketing.wecomle}}</text>
73 <!-- 优惠券 --> 75 <!-- 优惠券 -->
74 - <view class="publicModule couponBoxWrap" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 76 + <view class="publicModule preferentialCoupon" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
75 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" /> 77 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" />
76 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 78 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
77 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 79 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
78 <view class="preferentialItems"> 80 <view class="preferentialItems">
79 - <view class="purchase"> 81 + <view class="itemLeft">
  82 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font20r">{{item.discount}}折</text>
  83 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
80 <view class="priceText" wx:if="{{item.price}}"> 84 <view class="priceText" wx:if="{{item.price}}">
81 - <view class="icons">￥<text class="priceText">{{item.price}}</text></view> 85 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
82 </view> 86 </view>
83 - <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
84 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>  
85 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view> 87 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
86 </view> 88 </view>
87 - <view class="certificateInfo">  
88 - <view class="preferentialDetails">  
89 - <view class="information">  
90 - <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
91 - <text class="ticketName font24r">{{item.aname}}</text>  
92 - </view>  
93 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}</text>  
94 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">  
95 - 无限制  
96 - </view>  
97 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">  
98 - 会员生日当天可用  
99 - </view>  
100 - <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">  
101 - <text class="font24r">消费要求</text>  
102 - </view>  
103 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="limitation showDesc font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
104 - <view wx:if="{{item.useStime && item.useEtime}}" class="font24r nodate showDesc">{{item.useStime}} 至 {{item.useEtime}}</view>  
105 - <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">  
106 - <text class="font24r">不可用日期</text>  
107 - </view>  
108 - </view>  
109 - <view class="limitationBtn" wx:if="{{item.is_type != '3'}}">  
110 - <view class="font24r couponBtn">立即抢购</view> 89 + <view class="couponLine"></view>
  90 + <view class="itemRight">
  91 + <view class="btns">
  92 + <text class="font32r anameText">{{item.aname}}</text>
  93 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  94 + <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>
  95 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  96 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  97 + </view>
  98 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  99 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  100 + </view>
  101 + </block>
  102 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  103 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  104 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  105 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  106 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  107 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  108 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  109 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  110 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  111 + </block>
111 </view> 112 </view>
112 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 113 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
113 - <view class="font24r orderingFood">已领取</view> 114 + <view class="font24r orderingFood orderingFood1">已领取</view>
114 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 115 <view class="grantNum" wx:if="{{item.receiveNumText}}">
115 <view class="font24r">已被领取</view> 116 <view class="font24r">已被领取</view>
116 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 117 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
117 </view> 118 </view>
118 </view> 119 </view>
  120 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">
  121 + 抢购
  122 + </view>
119 </view> 123 </view>
120 </view> 124 </view>
121 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottomLimitation limitation font24r">  
122 - <text></text>  
123 - <view>消费满{{item.desc}}元可用</view>  
124 - </view>  
125 - <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r">  
126 - <text></text>{{item.morText}}  
127 - </view>  
128 - <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">  
129 - <text></text>{{item.noonText}}  
130 - </view>  
131 - <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">  
132 - <text></text>{{item.nigText}}  
133 - </view>  
134 </navigator> 125 </navigator>
135 </block> 126 </block>
136 </view> 127 </view>
137 <!-- 充值 --> 128 <!-- 充值 -->
138 - <view class="publicModule preferentialCoupon" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data) || (hasValueRecharge && marketing.is_link=='1')}}"> 129 + <view class="publicModule preferentialCoupon" wx:if="{{(hasValueRecharge && marketing.is_recharge=='1' && recharge_data.length>0) || (hasValueRecharge && marketing.is_link=='1')}}">
139 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" /> 130 <image class="titleImg6" src="https://qn.colorcun.com/invitation10Title2.png" mode="" />
140 - <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">  
141 - <view class="rechargeItems">  
142 - <image class="checkImg" src="https://qn.colorcun.com/invitation10vector1.png" mode="" />  
143 - <view class="rechargeTitle font36r">{{recharge_data.rname}}</view>  
144 - <view class="limitation font24r" wx:if="{{priceInfo}}">  
145 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}} 131 + <block wx:for="{{recharge_data}}" wx:key="index">
  132 + <view class="rechargeItems {{item.id == activeData.id ? 'rechargeActive' : ''}}" bindtap="checkRechargeData" data-id="{{item.id}}">
  133 + <image class="checkImg" wx:if="{{item.id == activeData.id}}" src="https://qn.colorcun.com/invitation10vector2.png" mode="" />
  134 + <view class="rechargeTitle font36r">{{item.rname}}</view>
  135 + <view class="limitation font24r" wx:if="{{item.priceInfo}}">
  136 + {{item.priceInfo}}{{(item.recharge_list.is_coupons=='0' && item.recharge_list.is_score=='0')?'。':';'}}
146 </view> 137 </view>
147 - <view class="limitation font24r" wx:if="{{scoreInfo}}">  
148 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}} 138 + <view class="limitation font24r" wx:if="{{item.scoreInfo}}">
  139 + {{item.scoreInfo}}{{item.recharge_list.is_coupons=='0'?'。':';'}}
149 </view> 140 </view>
150 - <view class="limitation font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
151 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。 141 + <view class="limitation font24r" wx:if="{{item.recharge_list.is_coupons=='1'}}">
  142 + {{item.recharge_list.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
152 </view> 143 </view>
153 </view> 144 </view>
154 - <view class="rechargeBtn">  
155 - <view class="font28r">立即充值</view>  
156 - </view>  
157 - </navigator> 145 + </block>
  146 + <view class="rechargeBtn">
  147 + <navigator wx:if="{{activeData.id}}" url="/pack-activity/pack/vipRecharge?id={{activeData.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
  148 + 立即充值
  149 + </navigator>
  150 + </view>
158 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 151 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
159 了解更多会员优惠政策 152 了解更多会员优惠政策
160 </view> 153 </view>
161 </view> 154 </view>
162 <!-- 评价券 --> 155 <!-- 评价券 -->
163 - <view class="publicModule couponBoxWrap" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}"> 156 + <view class="publicModule preferentialCoupon" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
164 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" /> 157 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title3.png" mode="" />
165 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view> 158 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view>
166 - <view class="couponInfo" bindtap="evaluateFun">  
167 - <view class="preferentialItems">  
168 - <view class="purchase">  
169 - <view class="priceText" wx:if="{{couponData.price}}">  
170 - <view class="icons">￥<text class="priceText">{{couponData.price}}</text></view>  
171 - </view>  
172 - <image class="certificateImg" src="{{(couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
173 - <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountInfo">{{couponData.discount}}折</text> 159 + <view class="preferentialItems" bindtap="evaluateFun">
  160 + <view class="itemLeft">
  161 + <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
  162 + <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  163 + <view class="priceText" wx:if="{{couponData.price}}">
  164 + <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text>
174 </view> 165 </view>
175 - <view class="certificateInfo">  
176 - <view class="preferentialDetails">  
177 - <view class="information">  
178 - <text class="discountText font20r">{{couponData.use.is_cash=='1'?'代金券':couponData.use.is_discount=='1'?'超值折扣':couponData.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
179 - <text class="ticketName font24r">{{couponData.aname}}</text>  
180 - </view>  
181 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="limitation font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}</text>  
182 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">  
183 - 无限制  
184 - </view>  
185 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">  
186 - 会员生日当天可用  
187 - </view>  
188 - <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">  
189 - <text class="font24r">消费要求</text>  
190 - </view>  
191 - <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="limitation showDesc font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>  
192 - <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="font24r nodate showDesc">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>  
193 - <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">  
194 - <text class="font24r">不可用日期</text> 166 + <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
  167 + </view>
  168 + <view class="couponLine"></view>
  169 + <view class="itemRight">
  170 + <view class="btns">
  171 + <text class="font32r anameText">{{couponData.aname}}</text>
  172 + <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
  173 + <view 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+'。':'。'}}</view>
  174 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  175 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
195 </view> 176 </view>
196 - </view>  
197 - <view class="limitationBtn" wx:if="{{couponData.is_type != '3'}}">  
198 - <view class="font24r couponBtn">立即抢购</view>  
199 - </view>  
200 - <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >  
201 - <view class="font24r orderingFood">{{couponData.resultCoupon == '1'?'已领取':'立即领取'}}</view>  
202 - <view class="grantNum" wx:if="{{couponData.receiveNumText}}">  
203 - <view class="font24r">已被领取</view>  
204 - <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view> 177 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  178 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
205 </view> 179 </view>
  180 + </block>
  181 + <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
  182 + <view wx:if="{{(couponData.useStime && couponData.useEtime) ||couponDataitem.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>
  183 + <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
  184 + <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>
  185 + <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
  186 + <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
  187 + <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
  188 + <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  189 + <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
  190 + </block>
  191 + </view>
  192 + <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
  193 + <view class="font24r orderingFood orderingFood2">免费领取</view>
  194 + <view class="grantNum" wx:if="{{couponData.receiveNumText}}">
  195 + <view class="font24r">已被领取</view>
  196 + <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
206 </view> 197 </view>
207 </view> 198 </view>
208 </view> 199 </view>
209 - <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottomLimitation limitation font24r">  
210 - <text></text>  
211 - <view>消费满{{couponData.desc}}元可用</view>  
212 - </view>  
213 - <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r">  
214 - <text></text>{{couponData.morText}}  
215 - </view>  
216 - <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">  
217 - <text></text>{{couponData.noonText}}  
218 - </view>  
219 - <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">  
220 - <text></text>{{couponData.nigText}}  
221 - </view>  
222 </view> 200 </view>
223 </view> 201 </view>
224 <!-- 评价没有券 --> 202 <!-- 评价没有券 -->
@@ -234,43 +212,49 @@ @@ -234,43 +212,49 @@
234 </view> 212 </view>
235 </view> 213 </view>
236 <!-- 停车指引 --> 214 <!-- 停车指引 -->
237 - <view class="publicModule" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}"> 215 + <view class="publicModule" wx:if="{{reserve && (reserve.textInfo || reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}">
238 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title4.png" mode="" /> 216 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title4.png" mode="" />
239 <view class="labelBox" wx:if="{{reserve.textInfo}}"> 217 <view class="labelBox" wx:if="{{reserve.textInfo}}">
240 <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> 218 <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text>
241 </view> 219 </view>
242 - <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
243 - <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index">  
244 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
245 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image> 220 + <swiper wx:if="{{reserve.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  221 + <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index">
  222 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image>
246 </swiper-item> 223 </swiper-item>
247 </swiper> 224 </swiper>
  225 + <block wx:for="{{reserve.videosInfo}}" wx:key="index">
  226 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  227 + </block>
248 </view> 228 </view>
249 <!-- 餐厅介绍 --> 229 <!-- 餐厅介绍 -->
250 - <view class="publicModule" wx:if="{{store && (store.textInfo || store.videoImgsInfo.length>0)}}"> 230 + <view class="publicModule" wx:if="{{store && (store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0)}}">
251 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title5.png" mode="" /> 231 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title5.png" mode="" />
252 <view class="labelBox" wx:if="{{store.textInfo}}"> 232 <view class="labelBox" wx:if="{{store.textInfo}}">
253 <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> 233 <text class="texts font28r" space="nbsp">{{store.textInfo}}</text>
254 </view> 234 </view>
255 - <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
256 - <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index">  
257 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
258 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image> 235 + <swiper wx:if="{{store.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  236 + <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index">
  237 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image>
259 </swiper-item> 238 </swiper-item>
260 </swiper> 239 </swiper>
  240 + <block wx:for="{{store.videosInfo}}" wx:key="index">
  241 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  242 + </block>
261 </view> 243 </view>
262 <!-- 招牌菜品 --> 244 <!-- 招牌菜品 -->
263 - <view class="publicModule" wx:if="{{(signboard && signboard.textInfo || signboard.videoImgsInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}"> 245 + <view class="publicModule" wx:if="{{(signboard && signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}">
264 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title6.png" mode="" /> 246 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title6.png" mode="" />
265 <view class="labelBox" wx:if="{{signboard.textInfo}}"> 247 <view class="labelBox" wx:if="{{signboard.textInfo}}">
266 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> 248 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text>
267 </view> 249 </view>
268 - <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
269 - <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index">  
270 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
271 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image> 250 + <swiper wx:if="{{signboard.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  251 + <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index">
  252 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image>
272 </swiper-item> 253 </swiper-item>
273 </swiper> 254 </swiper>
  255 + <block wx:for="{{signboard.videosInfo}}">
  256 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  257 + </block>
274 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}"> 258 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
275 <view class="font32r">提前点餐 到店不用等</view> 259 <view class="font32r">提前点餐 到店不用等</view>
276 <view bindtap="cookbook" class="font28r cook" style="position: relative;"> 260 <view bindtap="cookbook" class="font28r cook" style="position: relative;">
@@ -279,17 +263,19 @@ @@ -279,17 +263,19 @@
279 </view> 263 </view>
280 </view> 264 </view>
281 <!-- 主厨介绍 --> 265 <!-- 主厨介绍 -->
282 - <view class="publicModule" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}"> 266 + <view class="publicModule" wx:if="{{chef && (chef.textInfo || chef.imgsInfo.length>0 || chef.videosInfo.length>0)}}">
283 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title7.png" mode="" /> 267 <image class="titleImg4" src="https://qn.colorcun.com/invitation10Title7.png" mode="" />
284 <view class="labelBox" wx:if="{{chef.textInfo}}"> 268 <view class="labelBox" wx:if="{{chef.textInfo}}">
285 <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> 269 <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text>
286 </view> 270 </view>
287 - <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
288 - <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index">  
289 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
290 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image> 271 + <swiper wx:if="{{chef.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  272 + <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index">
  273 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image>
291 </swiper-item> 274 </swiper-item>
292 </swiper> 275 </swiper>
  276 + <block wx:for="{{chef.videosInfo}}" wx:key="index">
  277 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  278 + </block>
293 </view> 279 </view>
294 <view class="businessBox font24r"> 280 <view class="businessBox font24r">
295 周到安排提供技术支持<text bindtap="call" data-phone="4000009690">4000009690</text>，餐厅入驻请点击 281 周到安排提供技术支持<text bindtap="call" data-phone="4000009690">4000009690</text>，餐厅入驻请点击
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
53 } 53 }
54 54
55 .infoItem .record { 55 .infoItem .record {
  56 + font-weight: 500;
56 flex-shrink: 0; 57 flex-shrink: 0;
57 font-family: PingFang SC; 58 font-family: PingFang SC;
58 color: #CC9B6A; 59 color: #CC9B6A;
@@ -85,7 +86,7 @@ @@ -85,7 +86,7 @@
85 } 86 }
86 87
87 .addressBox { 88 .addressBox {
88 - margin: 0 40rpx 32rpx 40rpx; 89 + margin: 0 40rpx;
89 } 90 }
90 91
91 .positioning { 92 .positioning {
@@ -96,7 +97,15 @@ @@ -96,7 +97,15 @@
96 color: #111; 97 color: #111;
97 padding: 20rpx; 98 padding: 20rpx;
98 box-sizing: border-box; 99 box-sizing: border-box;
99 - margin-bottom: 20rpx; 100 + margin: 20rpx 0 32rpx 0;
  101 +}
  102 +
  103 +.welcomeInfo {
  104 + text-align: center;
  105 + color: #000;
  106 + margin: 32rpx 0;
  107 + display: block;
  108 + font-weight: 600;
100 } 109 }
101 110
102 .positioning image { 111 .positioning image {
@@ -105,6 +114,16 @@ @@ -105,6 +114,16 @@
105 margin-right: 20rpx; 114 margin-right: 20rpx;
106 } 115 }
107 116
  117 +.contentFlex {
  118 + flex: inherit;
  119 +}
  120 +
  121 +.picker {
  122 + display: flex;
  123 + align-items: center;
  124 + justify-content: center;
  125 +}
  126 +
108 .positioningText { 127 .positioningText {
109 line-height: 50rpx; 128 line-height: 50rpx;
110 font-family: PingFang SC; 129 font-family: PingFang SC;
@@ -133,6 +152,13 @@ @@ -133,6 +152,13 @@
133 border-radius: 50%; 152 border-radius: 50%;
134 } 153 }
135 154
  155 +.noHeaderimg{
  156 + width: 108rpx;
  157 + height: 108rpx;
  158 + background: #BFBFBF;
  159 + border-radius: 50%;
  160 +}
  161 +
136 .peopleInfo { 162 .peopleInfo {
137 display: flex; 163 display: flex;
138 flex-direction: column; 164 flex-direction: column;
@@ -162,7 +188,8 @@ @@ -162,7 +188,8 @@
162 .handleInfo .texts { 188 .handleInfo .texts {
163 margin: 22rpx 0; 189 margin: 22rpx 0;
164 letter-spacing: 3rpx; 190 letter-spacing: 3rpx;
165 - line-height: 36rpx 191 + line-height: 36rpx;
  192 + font-weight: 500;
166 } 193 }
167 194
168 .contactBtns { 195 .contactBtns {
@@ -179,6 +206,7 @@ @@ -179,6 +206,7 @@
179 display: flex; 206 display: flex;
180 align-items: center; 207 align-items: center;
181 justify-content: center; 208 justify-content: center;
  209 + font-weight: 600 !important;
182 } 210 }
183 211
184 .brownFont image { 212 .brownFont image {
@@ -212,127 +240,6 @@ @@ -212,127 +240,6 @@
212 height: 100rpx; 240 height: 100rpx;
213 } 241 }
214 242
215 -.preferentialItems {  
216 - width: 100%;  
217 - display: flex;  
218 - min-height: 160rpx;  
219 -}  
220 -  
221 -.purchase {  
222 - position: relative;  
223 - width: 30%;  
224 - display: flex;  
225 - flex-direction: column;  
226 - justify-content: center;  
227 - align-items: center;  
228 - background: #CC9B6A;  
229 - border-radius: 10rpx;  
230 -}  
231 -  
232 -.discountText {  
233 - text-align: center;  
234 - color: #FFEFC5;  
235 - border-radius: 6rpx;  
236 - font-family: PingFang SC;  
237 - background: #FD4D59;  
238 - width: max-content;  
239 - padding: 6rpx;  
240 - margin-right: 8rpx;  
241 -}  
242 -  
243 -.priceText {  
244 - font-family: PingFang SC;  
245 - color: #fff;  
246 - font-weight: 500;  
247 - margin-top: 6rpx;  
248 - display: flex;  
249 - align-items: center;  
250 - justify-content: center;  
251 - font-size: 52rpx;  
252 - flex-direction: column;  
253 -}  
254 -  
255 -.icons {  
256 - font-family: PingFang SC;  
257 - color: #fff;  
258 - font-size: 20rpx;  
259 - display: flex;  
260 - align-items: baseline;  
261 -}  
262 -  
263 -.certificateInfo {  
264 - width: 70%;  
265 - padding: 20rpx;  
266 - position: relative;  
267 - border-radius: 10rpx;  
268 - display: flex;  
269 - background: #fff;  
270 - align-items: center;  
271 -}  
272 -  
273 -.certificateInfo .nodate{  
274 - padding-left: 20rpx;  
275 -}  
276 -  
277 -.certificateInfo .limitation {  
278 - line-height: 40rpx;  
279 -}  
280 -  
281 -.ticketName {  
282 - display: flex;  
283 - justify-content: space-between;  
284 - align-items: baseline;  
285 - font-weight: 700;  
286 - overflow: hidden;  
287 - word-break: break-all;  
288 - text-overflow: ellipsis;  
289 - display: -webkit-box;  
290 - -webkit-box-orient: vertical;  
291 - -webkit-line-clamp: 1;  
292 - color: #000;  
293 -}  
294 -  
295 -.orderingFood {  
296 - padding: 0 20rpx;  
297 - border-radius: 22rpx;  
298 - text-align: center;  
299 - border-radius: 20rpx;  
300 - line-height: 44rpx;  
301 - height: 44rpx;  
302 - width: max-content;  
303 - margin-top: 24rpx;  
304 - flex-shrink: 0;  
305 - border: 2rpx solid #CC9B6A;  
306 - background: transparent;  
307 - color: #CC9B6A;  
308 -}  
309 -  
310 -.grantNum {  
311 - display: flex;  
312 - flex-direction: column;  
313 - align-items: center;  
314 - color: #999;  
315 - margin-top: 10rpx;  
316 -}  
317 -  
318 -.grantNum text {  
319 - color: #CC9B6A;  
320 - margin-right: 10rpx;  
321 -}  
322 -  
323 -.limitation {  
324 - margin-top: 10rpx;  
325 - color: #666;  
326 - font-family: PingFang SC;  
327 - font-weight: 500;  
328 - display: -webkit-box;  
329 - word-break: break-all;  
330 - word-wrap: break-word;  
331 - overflow: hidden;  
332 - text-align: left;  
333 - line-height: 30rpx;  
334 -}  
335 -  
336 .rechargeItems { 243 .rechargeItems {
337 display: flex; 244 display: flex;
338 min-height: 160rpx; 245 min-height: 160rpx;
@@ -341,6 +248,13 @@ @@ -341,6 +248,13 @@
341 position: relative; 248 position: relative;
342 padding: 20rpx 40rpx; 249 padding: 20rpx 40rpx;
343 flex-direction: column; 250 flex-direction: column;
  251 + background: #fff8f2;
  252 + width: 100%;
  253 + box-sizing: border-box;
  254 + margin-bottom: 24rpx;
  255 +}
  256 +
  257 +.rechargeActive {
344 background: #fff1e7; 258 background: #fff1e7;
345 } 259 }
346 260
@@ -385,6 +299,7 @@ @@ -385,6 +299,7 @@
385 align-items: center; 299 align-items: center;
386 justify-content: center; 300 justify-content: center;
387 margin: 24rpx 0; 301 margin: 24rpx 0;
  302 + width: 100%;
388 } 303 }
389 304
390 .rechargeBtn view { 305 .rechargeBtn view {
@@ -396,24 +311,6 @@ @@ -396,24 +311,6 @@
396 text-align: center; 311 text-align: center;
397 } 312 }
398 313
399 -.couponBoxWrap navigator,  
400 -.couponBoxWrap .couponInfo {  
401 - width: 100%;  
402 - margin-bottom: 20rpx;  
403 - border-radius: 10rpx;  
404 - background: #fff;  
405 -}  
406 -  
407 -.couponBoxWrap .preferentialItems {  
408 - box-shadow: 0rpx 4rpx 8rpx #0000000d;  
409 -}  
410 -  
411 -.couponBoxWrap .showDesc {  
412 - display: flex;  
413 - align-items: center;  
414 - color: #666;  
415 -}  
416 -  
417 .bottomLimitation { 314 .bottomLimitation {
418 padding: 0 20rpx; 315 padding: 0 20rpx;
419 display: flex; 316 display: flex;
@@ -433,80 +330,205 @@ @@ -433,80 +330,205 @@
433 border-radius: 50%; 330 border-radius: 50%;
434 } 331 }
435 332
436 -.couponBoxWrap .certificateInfo {  
437 - flex-direction: row;  
438 - background: #fff;  
439 - align-items: center; 333 +.evaluateTitleText {
  334 + font-weight: 600;
  335 + font-size: 28rpx;
  336 + font-family: PingFang SC;
  337 + margin: 40rpx 0;
  338 +}
  339 +
  340 +.preferentialCoupon {
  341 + padding: 20rpx;
440 } 342 }
441 343
442 -.couponBoxWrap .couponBtn { 344 +.preferentialCoupon navigator{
443 width: 100%; 345 width: 100%;
444 - height: fit-content;  
445 - background: #CC9B6A;  
446 - color: #fff;  
447 } 346 }
448 347
449 -.couponBoxWrap .certificateInfo .preferentialDetails { 348 +.preferentialCoupon .nodate{
  349 + padding-left: 20rpx;
  350 +}
  351 +
  352 +.preferentialItems {
450 width: 100%; 353 width: 100%;
451 - display: flex; 354 + display: flex;
  355 + background: #FFF1E6;
  356 + margin-bottom: 20rpx;
  357 + min-height: 180rpx;
  358 + padding-bottom: 10rpx;
  359 + border-radius: 20rpx;
  360 +}
  361 +
  362 +.itemLeft {
  363 + width: 30%;
  364 + display: flex;
  365 + flex-direction: column;
  366 + justify-content: center;
  367 + position: relative;
  368 +}
  369 +
  370 +.discountText1{
  371 + text-align: center;
  372 + border-radius: 6rpx;
  373 + font-family: PingFang SC;
  374 + background: transparent;
  375 + width: max-content;
  376 + padding: 2rpx 8rpx;
  377 + position: absolute;
  378 + left: 16rpx;
  379 + top: 12rpx;
  380 +}
  381 +
  382 +.discountText2{
  383 + background: #FD4D59;
  384 + color: #fff;
  385 +}
  386 +
  387 +.discountText3{
  388 + color: #FD4D59;
  389 + border: 2rpx solid #FD4D59;
  390 +}
  391 +
  392 +.priceText {
  393 + font-family: 'Abel';
  394 + color: #E34D59;
  395 + font-weight: 500;
  396 + font-size: 64rpx;
  397 + margin-top: 6rpx;
  398 +}
  399 +
  400 +.itemRight {
  401 + width: 70%;
  402 + padding-right: 10rpx;
  403 + margin-left: 18rpx;
  404 +}
  405 +
  406 +.btns {
  407 + margin: 24rpx 20rpx 0 0;
  408 + display: flex;
  409 + justify-content: space-evenly;
  410 + align-items: baseline;
452 flex-direction: column; 411 flex-direction: column;
  412 + height: 90%;
453 } 413 }
454 414
455 -.couponBoxWrap .information { 415 +.preferentialCoupon .itemRight {
  416 + width: 74%;
456 display: flex; 417 display: flex;
457 align-items: center; 418 align-items: center;
458 } 419 }
459 420
460 -.couponBoxWrap .certificateInfo .limitation {  
461 - margin-right: 20rpx;  
462 - flex: 1;  
463 - width: auto; 421 +.preferentialCoupon .itemLeft {
  422 + width: 26%;
464 } 423 }
465 424
466 -.couponBoxWrap .discountInfo {  
467 - font-family: PingFang SC;  
468 - background: #FD4D59;  
469 - position: absolute;  
470 - top: 0;  
471 - left: 100rpx;  
472 - font-size: 16rpx;  
473 - border-radius: 0 0 10rpx 0;  
474 - padding: 0 6rpx;  
475 - height: 28rp;  
476 - line-height: 28rpx; 425 +.preferentialCoupon .couponLine{
  426 + margin: 24rpx 0 4rpx 0;
  427 + border-right: 2rpx dashed #FD4D59;
  428 +}
  429 +
  430 +.preferentialCoupon .orderingFood {
  431 + padding: 0 20rpx;
  432 + color: #fff;
  433 + border: none;
477 text-align: center; 434 text-align: center;
478 - color: #FFEFC5; 435 + border-radius: 20rpx;
  436 + line-height: 44rpx;
  437 + height: 44rpx;
479 width: max-content; 438 width: max-content;
  439 + flex-shrink: 0;
  440 + background: #CC9B6A;
480 } 441 }
481 442
482 -.couponBoxWrap .certificateImg {  
483 - position: absolute;  
484 - top: 0;  
485 - left: 0;  
486 - width: 100rpx;  
487 - height: 28rpx; 443 +.preferentialCoupon .icons {
  444 + color: #FD4D59;
  445 + text-align: center;
488 } 446 }
489 447
490 -.couponBoxWrap .limitationBtn {  
491 - width: 40%; 448 +.preferentialCoupon .priceText {
  449 + display: flex;
  450 + align-items: baseline;
  451 + justify-content: center;
  452 + font-family: PingFang SC;
  453 + color: #FD4D59;
  454 + font-weight: 600;
  455 + font-size: 48rpx;
  456 + margin-top: 6rpx;
  457 +}
  458 +
  459 +.preferentialCoupon .priceText text {
  460 + font-size: 48rpx;
  461 +}
  462 +
  463 +.preferentialCoupon .btns {
  464 + flex: 1;
  465 +}
  466 +.preferentialCoupon .btnBox {
  467 + display: flex;
  468 + flex-direction: column;
  469 +}
  470 +
  471 +.preferentialCoupon .grantNum {
492 display: flex; 472 display: flex;
493 flex-direction: column; 473 flex-direction: column;
494 align-items: center; 474 align-items: center;
  475 + color: #C36607;
  476 + margin-top: 10rpx;
495 } 477 }
496 478
497 -.evaluateTitleText { 479 +.preferentialCoupon .grantNum text {
  480 + color: #F6231B;
  481 + margin-right: 10rpx;
  482 +}
  483 +
  484 +.preferentialCoupon .btns .anameText {
498 font-weight: 600; 485 font-weight: 600;
499 - font-size: 28rpx;  
500 - font-family: PingFang SC;  
501 - margin: 40rpx 0;  
502 } 486 }
503 487
504 -.preferentialCoupon navigator {  
505 - width: 100%; 488 +.preferentialCoupon .orderingFood1 {
  489 + border: 2rpx solid #CC9B6A;
  490 + background: transparent;
  491 + color: #CC9B6A;
  492 + font-weight: 600;
506 } 493 }
507 494
508 -.preferentialCoupon .limitation {  
509 - color: #000; 495 +.discountText {
  496 + text-align: center;
  497 + color: #FFEFC5;
  498 + border-radius: 6rpx;
  499 + font-family: PingFang SC;
  500 + background: #FD4D59;
  501 + width: max-content;
  502 + padding: 6rpx;
  503 + position: absolute;
  504 + left: 16rpx;
  505 + top: 12rpx;
  506 +}
  507 +
  508 +.bottom {
  509 + margin-top: 4rpx;
  510 + width: 100%;
  511 + color: #C36607;
  512 + font-family: PingFang SC;
  513 + font-weight: 500;
  514 + display: -webkit-box;
  515 + word-break: break-all;
  516 + word-wrap: break-word;
  517 + overflow: hidden;
  518 + text-align: left;
  519 +}
  520 +
  521 +.regionItem {
  522 + padding: 40rpx;
  523 +}
  524 +
  525 +.rechargeBtn navigator {
  526 + width: 84%;
  527 + padding: 12rpx 0;
  528 + background: #CC9B6A;
  529 + border-radius: 42rpx;
  530 + color: #fff;
  531 + text-align: center;
510 } 532 }
511 533
512 .labelBox { 534 .labelBox {
@@ -516,7 +538,7 @@ @@ -516,7 +538,7 @@
516 538
517 .labelBox .texts { 539 .labelBox .texts {
518 line-height: 40rpx; 540 line-height: 40rpx;
519 - color: #222; 541 + color: #000;
520 font-family: PingFang SC; 542 font-family: PingFang SC;
521 font-weight: 500; 543 font-weight: 500;
522 display: block; 544 display: block;
@@ -548,11 +570,6 @@ @@ -548,11 +570,6 @@
548 height: 60rpx; 570 height: 60rpx;
549 } 571 }
550 572
551 -.evaluateCoupon .couponBtn {  
552 - color: #cc9b6a;  
553 - background: #fff;  
554 -}  
555 -  
556 .evaluateCoupon .preferentialItems { 573 .evaluateCoupon .preferentialItems {
557 background: #CC9B6A; 574 background: #CC9B6A;
558 align-items: center; 575 align-items: center;
@@ -562,10 +579,13 @@ @@ -562,10 +579,13 @@
562 } 579 }
563 580
564 .evaluateCoupon .couponBtn { 581 .evaluateCoupon .couponBtn {
  582 + color: #cc9b6a;
  583 + background: #fff;
565 width: max-content; 584 width: max-content;
566 height: max-content; 585 height: max-content;
567 padding: 4rpx 20rpx; 586 padding: 4rpx 20rpx;
568 margin-top: 0; 587 margin-top: 0;
  588 + font-weight: 600;
569 } 589 }
570 590
571 .evaluateCoupon .evaluateText { 591 .evaluateCoupon .evaluateText {
@@ -580,6 +600,7 @@ @@ -580,6 +600,7 @@
580 width: 100%; 600 width: 100%;
581 height: 500rpx; 601 height: 500rpx;
582 background: transparent; 602 background: transparent;
  603 + margin-top: 20rpx;
583 } 604 }
584 605
585 .detailBannerImg { 606 .detailBannerImg {
@@ -590,7 +611,8 @@ @@ -590,7 +611,8 @@
590 611
591 .boxBlock { 612 .boxBlock {
592 width: 100%; 613 width: 100%;
593 - height: 500rpx; 614 + border-radius: 10rpx;
  615 + margin-top: 20rpx;
594 } 616 }
595 617
596 .businessBox { 618 .businessBox {
@@ -623,22 +645,13 @@ @@ -623,22 +645,13 @@
623 .arrivalBox { 645 .arrivalBox {
624 display: flex; 646 display: flex;
625 width: 100%; 647 width: 100%;
626 - justify-content: space-between;  
627 align-items: center; 648 align-items: center;
628 } 649 }
629 650
630 -.arrivalBox button {  
631 - display: flex;  
632 - font-size: 24rpx;  
633 - flex-direction: column;  
634 - height: 50rpx;  
635 - padding: 0 18rpx;  
636 - line-height: 48rpx;  
637 - font-family: PingFang SC;  
638 - border-radius: 40rpx;  
639 - background: transparent;  
640 - color: #000;  
641 - border: 2rpx solid #000; 651 +.arrivalBox .arrivalImg {
  652 + width: 40rpx;
  653 + height: 40rpx;
  654 + margin-left: 20rpx;
642 } 655 }
643 656
644 .shareItem, 657 .shareItem,
@@ -25,11 +25,9 @@ Page({ @@ -25,11 +25,9 @@ Page({
25 signboard: {}, 25 signboard: {},
26 store: {}, 26 store: {},
27 recharge_data: {}, 27 recharge_data: {},
  28 + activeData: {},
28 coupon_dataList: [], 29 coupon_dataList: [],
29 seller: {}, 30 seller: {},
30 - priceInfo: '',  
31 - scoreInfo: '',  
32 - certificate: '',  
33 dataStr: Date.now() * 1 / 1000, 31 dataStr: Date.now() * 1 / 1000,
34 swich_phone: '0', //是否显示前台电话 32 swich_phone: '0', //是否显示前台电话
35 is_comments: '0', 33 is_comments: '0',
@@ -116,14 +114,20 @@ Page({ @@ -116,14 +114,20 @@ Page({
116 // 锚点定位 114 // 锚点定位
117 gotoModule(e) { 115 gotoModule(e) {
118 const type = e.currentTarget.dataset['type']; 116 const type = e.currentTarget.dataset['type'];
119 - const query = wx.createSelectorQuery()  
120 - query.select('#module' + type).boundingClientRect()  
121 - query.selectViewport().scrollOffset()  
122 - query.exec(function (res) { 117 + if (type == '0') {
123 wx.pageScrollTo({ 118 wx.pageScrollTo({
124 - scrollTop: res[0].top - 150 119 + scrollTop: 0
125 }); 120 });
126 - }); 121 + } else {
  122 + const query = wx.createSelectorQuery()
  123 + query.select('#module' + type).boundingClientRect()
  124 + query.selectViewport().scrollOffset()
  125 + query.exec(function (res) {
  126 + wx.pageScrollTo({
  127 + scrollTop: res[0].top + res[1].scrollTop - 150
  128 + });
  129 + });
  130 + }
127 }, 131 },
128 // 打开截屏弹框 132 // 打开截屏弹框
129 showModal() { 133 showModal() {
@@ -686,10 +690,8 @@ Page({ @@ -686,10 +690,8 @@ Page({
686 couponList = this.addCoupons(coupon_data_free,couponList); 690 couponList = this.addCoupons(coupon_data_free,couponList);
687 // 根据券ID获取券详情 691 // 根据券ID获取券详情
688 this.getActivityByIdFun(couponList) 692 this.getActivityByIdFun(couponList)
689 - // 根据充值ID获取充值详情  
690 - if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {  
691 - this.getRechargeDetail(marketing.recharge_data.id)  
692 - } 693 + // 获取所有充值活动
  694 + this.getRechargeDetail()
693 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 695 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
694 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 696 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
695 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 697 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
@@ -884,21 +886,33 @@ Page({ @@ -884,21 +886,33 @@ Page({
884 } 886 }
885 }, 887 },
886 // 根据充值ID获取充值详情 888 // 根据充值ID获取充值详情
887 - getRechargeDetail(id) {  
888 - App.Activity.GetNewRecharge({  
889 - id 889 + getRechargeDetail() {
  890 + App.Activity.GetNewRechargeList({
  891 + sellerid: this.data.detail.seller.id,
890 }).then(res => { 892 }).then(res => {
891 if (res.data) { 893 if (res.data) {
892 - let detail = res.data  
893 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
894 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
895 - let priceInfo, scoreInfo, certificate;  
896 - detail.recharge_list = recharge_list;  
897 - detail.exp_date = exp_date;  
898 - if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';  
899 - if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';  
900 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
901 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : '' 894 + let arr = []
  895 + res.data.forEach(i => {
  896 + if (i.status != '1') {
  897 + arr.push(i)
  898 + }
  899 + })
  900 + let recharge_data = arr;
  901 + recharge_data.forEach(item => {
  902 + item.recharge_list = item.recharge_list ? JSON.parse(item.recharge_list) : '';
  903 + let recharge_list = item.recharge_list;
  904 + item.priceInfo = '';
  905 + item.scoreInfo = '';
  906 + item.certificate = '';
  907 + if (recharge_list.is_price == '1') item.priceInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.price + '元余额';
  908 + if (recharge_list.is_score == '1') item.scoreInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.score + '积分';
  909 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) item.certificate = recharge_list.coupons_names.join('、');
  910 + item.timeStr = util.unixtoTime(item.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(item.etime, 'YYYY-MM-DD')
  911 + })
  912 + // 筛选出 未过期的 && 开启状态的充值活动
  913 + recharge_data = recharge_data.filter(item => {
  914 + return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
  915 + })
902 console.log('邀请函--------------充值', recharge_data); 916 console.log('邀请函--------------充值', recharge_data);
903 let entry = this.data.titleList 917 let entry = this.data.titleList
904 if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) { 918 if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {
@@ -909,23 +923,33 @@ Page({ @@ -909,23 +923,33 @@ Page({
909 if (entry.length > 0) { 923 if (entry.length > 0) {
910 entry.sort((a, b) => a.id - b.id); 924 entry.sort((a, b) => a.id - b.id);
911 } 925 }
912 - recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD')  
913 } 926 }
914 this.setData({ 927 this.setData({
915 titleList: entry, 928 titleList: entry,
916 activeTitle: entry.length > 0 ? entry[0].id : '', 929 activeTitle: entry.length > 0 ? entry[0].id : '',
917 recharge_data, 930 recharge_data,
918 - scoreInfo,  
919 - priceInfo,  
920 - certificate 931 + activeData: recharge_data.length > 0 ? recharge_data[0] : {},
921 }) 932 })
922 } else { 933 } else {
923 this.setData({ 934 this.setData({
924 - recharge_data: {}, 935 + recharge_data: [],
  936 + activeData: {},
925 }) 937 })
926 } 938 }
927 }) 939 })
928 }, 940 },
  941 + // 选择充值活动
  942 + checkRechargeData(e) {
  943 + let id = e.currentTarget.dataset['id'];
  944 + let obj = this.data.recharge_data.filter(item => {
  945 + return item.id == id
  946 + })
  947 + if (obj && obj.length > 0) {
  948 + this.setData({
  949 + activeData: obj[0]
  950 + })
  951 + }
  952 + },
929 // 选择标题 953 // 选择标题
930 checkTitleFun(e) { 954 checkTitleFun(e) {
931 console.log('e.currentTargete.currentTarget', e.currentTarget); 955 console.log('e.currentTargete.currentTarget', e.currentTarget);
@@ -1290,7 +1314,6 @@ Page({ @@ -1290,7 +1314,6 @@ Page({
1290 }, 1314 },
1291 // 计算免费券有效期的起始、结束日期 1315 // 计算免费券有效期的起始、结束日期
1292 setTimeRange(cdate, startOffset, endOffset) { 1316 setTimeRange(cdate, startOffset, endOffset) {
1293 - console.log(cdate, startOffset, endOffset);  
1294 const startDate = new Date((cdate + startOffset * 86400) * 1000); 1317 const startDate = new Date((cdate + startOffset * 86400) * 1000);
1295 startDate.setHours(0, 0, 0, 0); 1318 startDate.setHours(0, 0, 0, 0);
1296 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD'); 1319 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD');
@@ -1477,14 +1500,10 @@ Page({ @@ -1477,14 +1500,10 @@ Page({
1477 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : ''; 1500 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : '';
1478 } 1501 }
1479 intel.imgsInfo = imgs; 1502 intel.imgsInfo = imgs;
1480 - intel.videoImgsInfo = imgs.map(url => ({  
1481 - type: "1",  
1482 - content: url,  
1483 - }));  
1484 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') { 1503 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') {
1485 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n'); 1504 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n');
1486 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content); 1505 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content);
1487 - intel.videoImgsInfo = intel.content.filter(item => ((item.type === "1" || item.type === "3") && item.content)); 1506 + intel.videosInfo = intel.content.filter(item => (item.type === "3" && item.content));
1488 } 1507 }
1489 return intel 1508 return intel
1490 }, 1509 },
@@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
9 <view class="reservationInfoBox"> 9 <view class="reservationInfoBox">
10 <view class="reservationInfo reservationInfo{{make}}"> 10 <view class="reservationInfo reservationInfo{{make}}">
11 <view class="infoTop"> 11 <view class="infoTop">
12 - <text wx:if="{{bookType == '2'}}" class="infoTopText1" space="nbsp">INVITATION</text> 12 + <image wx:if="{{bookType == '2'}}" class="infoTopImg1" src="https://nosqn.colorcun.com/invitation11Title2.png" mode=""/>
13 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text> 13 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
14 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text> 14 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
15 - <text wx:if="{{!make || make=='2'}}" class="infoTopText4 font44r" space="nbsp">邀请函</text> 15 + <image wx:if="{{bookType == '1' && (!make || make=='2')}}" class="infoTopText4" src="https://nosqn.colorcun.com/invitation11Title.png" mode=""/>
16 <image wx:if="{{bookType == '1' && make == '1'}}" class="infoTopBj2" src="https://qn.colorcun.com/invitation11Bg2.png" mode="" /> 16 <image wx:if="{{bookType == '1' && make == '1'}}" class="infoTopBj2" src="https://qn.colorcun.com/invitation11Bg2.png" mode="" />
17 </view> 17 </view>
18 <view class="informationBox"> 18 <view class="informationBox">
@@ -21,37 +21,37 @@ @@ -21,37 +21,37 @@
21 </view> 21 </view>
22 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}"> 22 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}">
23 <view class="record font28r">预订贵宾:</view> 23 <view class="record font28r">预订贵宾:</view>
24 - <view class="contentData font28r">{{detail.rnameStr}}</view> 24 + <view class="contentData font32r">{{detail.rnameStr}}</view>
25 </view> 25 </view>
26 <view class="infoItem" wx:if="{{seller.date}}"> 26 <view class="infoItem" wx:if="{{seller.date}}">
27 <view class="record font28r">用餐日期:</view> 27 <view class="record font28r">用餐日期:</view>
28 - <view class="contentData font28r">{{seller.date}}</view> 28 + <view class="contentData font32r">{{seller.date}}</view>
29 </view> 29 </view>
30 <view class="infoItem" wx:if="{{seller.tablesText}}"> 30 <view class="infoItem" wx:if="{{seller.tablesText}}">
31 <view class="record font28r">用餐位置:</view> 31 <view class="record font28r">用餐位置:</view>
32 - <view class="contentData font28r">{{seller.tablesText}}</view> 32 + <view class="contentData font32r">{{seller.tablesText}}</view>
33 </view> 33 </view>
34 <view class="infoItem" wx:if="{{seller.soltName}}"> 34 <view class="infoItem" wx:if="{{seller.soltName}}">
35 <view class="record font28r">用餐时间:</view> 35 <view class="record font28r">用餐时间:</view>
36 <view class="arrivalBox"> 36 <view class="arrivalBox">
37 - <view class="contentData font28r">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view> 37 + <view class="contentData font32r contentFlex">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view>
38 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}"> 38 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}">
39 <view class="picker"> 39 <view class="picker">
40 - <button>修改到店时间</button> 40 + <image class="arrivalImg" src="https://nosqn.colorcun.com/editDdateTime{{bookType == '1' ? '1' : '4'}}.png" mode=""/>
41 </view> 41 </view>
42 </picker> 42 </picker>
43 </view> 43 </view>
44 </view> 44 </view>
45 <view wx:if="{{bookType == '2'}}" class="entrance {{((reserve.swich_booking!='1' || !reserve.book_info) && (!reserve.swich_phone=='0' || !seller.tel || seller.tel.length==0))?'entrance1':''}}"> 45 <view wx:if="{{bookType == '2'}}" class="entrance {{((reserve.swich_booking!='1' || !reserve.book_info) && (!reserve.swich_phone=='0' || !seller.tel || seller.tel.length==0))?'entrance1':''}}">
46 - <view bindtap="gotoModule" data-type="1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.videoImgsInfo.length>0)}}" class="entranceItem"> 46 + <view bindtap="gotoModule" data-type="1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0)}}" class="entranceItem">
47 <image src="https://qn.colorcun.com/invitation12Icon1.png" mode="" /> 47 <image src="https://qn.colorcun.com/invitation12Icon1.png" mode="" />
48 <view class="font24r">餐厅介绍</view> 48 <view class="font24r">餐厅介绍</view>
49 </view> 49 </view>
50 - <view bindtap="gotoModule" data-type="2" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0)}}" class="entranceItem"> 50 + <view bindtap="gotoModule" data-type="2" wx:if="{{signboard && (signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0)}}" class="entranceItem">
51 <image src="https://qn.colorcun.com/invitation12Icon2.png" mode="" /> 51 <image src="https://qn.colorcun.com/invitation12Icon2.png" mode="" />
52 <view class="font24r">招牌菜品</view> 52 <view class="font24r">招牌菜品</view>
53 </view> 53 </view>
54 - <view bindtap="gotoModule" data-type="3" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}" class="entranceItem"> 54 + <view bindtap="gotoModule" data-type="3" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}" class="entranceItem">
55 <image src="https://qn.colorcun.com/invitation12Icon3.png" mode="" /> 55 <image src="https://qn.colorcun.com/invitation12Icon3.png" mode="" />
56 <view class="font24r">停车指引</view> 56 <view class="font24r">停车指引</view>
57 </view> 57 </view>
@@ -59,17 +59,21 @@ @@ -59,17 +59,21 @@
59 <image src="https://qn.colorcun.com/invitation12Icon4.png" mode="" /> 59 <image src="https://qn.colorcun.com/invitation12Icon4.png" mode="" />
60 <view class="font24r">提前点餐</view> 60 <view class="font24r">提前点餐</view>
61 </view> 61 </view>
  62 + <view bindtap="gotoModule" data-type="0" class="entranceItem">
  63 + <image src="https://qn.colorcun.com/invitation12Icon5.png" mode="" />
  64 + <view class="font24r">回到顶部</view>
  65 + </view>
62 </view> 66 </view>
63 <view class="infoItem infoRight" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}"> 67 <view class="infoItem infoRight" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}">
64 <view class="record font28r">前台电话:</view> 68 <view class="record font28r">前台电话:</view>
65 - <view class="contentData font28r"> 69 + <view class="contentData font32r">
66 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block> 70 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block>
67 </view> 71 </view>
68 </view> 72 </view>
69 <view class="infoItem addressInfo"> 73 <view class="infoItem addressInfo">
70 <view class="record font28r">餐厅地址:</view> 74 <view class="record font28r">餐厅地址:</view>
71 <view class="arrivalBox"> 75 <view class="arrivalBox">
72 - <view class="contentData font28r">{{seller.addr || reserve.seller.map_address}}</view> 76 + <view class="contentData font32r">{{seller.addr || reserve.seller.map_address}}</view>
73 <view class="positioning" bindtap="looklocation"> 77 <view class="positioning" bindtap="looklocation">
74 <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" /> 78 <image class="addressImg" src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" />
75 {{bookType == '1' ? '导航' : '导航到店'}} 79 {{bookType == '1' ? '导航' : '导航到店'}}
@@ -86,182 +90,159 @@ @@ -86,182 +90,159 @@
86 </view> 90 </view>
87 <view class="receptionBox" wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 91 <view class="receptionBox" wx:if="{{staffinfo && reserve.swich_manager=='1'}}">
88 <view class="peopleInfo"> 92 <view class="peopleInfo">
89 - <image bindtap="lookImgs" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>  
90 - <view class="font26r">{{staffinfo.name}}</view>  
91 - <view class="font26r">{{staffinfo.position}}</view> 93 + <image bindtap="lookImgs" wx:if="{{staffinfo.photo}}" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
  94 + <view class="noHeaderimg" wx:else></view>
  95 + <view class="font28r">{{staffinfo.name}}</view>
  96 + <view class="font28r">{{staffinfo.position}}</view>
92 </view> 97 </view>
93 <view class="handleInfo"> 98 <view class="handleInfo">
94 <view class="font40r">尊敬的贵宾您好！</view> 99 <view class="font40r">尊敬的贵宾您好！</view>
95 - <view class="font26r texts">很荣幸能为您提供专属接待和服务</view> 100 + <view class="font28r texts">很荣幸能为您提供专属接待和服务</view>
96 <view class="contactBtns"> 101 <view class="contactBtns">
97 - <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call"> 102 + <view wx:if="{{staffinfo.phone}}" class="font24r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call">
98 <image src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Phone.png':'https://qn.colorcun.com/invitation10Phone.png'}}" mode="" /><text>联系我</text> 103 <image src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Phone.png':'https://qn.colorcun.com/invitation10Phone.png'}}" mode="" /><text>联系我</text>
99 </view> 104 </view>
100 - <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="copyWeChat"> 105 + <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">
101 <image src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Wx.png':'https://qn.colorcun.com/invitation10Wx.png'}}" mode="" /><text>加微信</text> 106 <image src="{{bookType == '1'?'https://qn.colorcun.com/invitation11Wx.png':'https://qn.colorcun.com/invitation10Wx.png'}}" mode="" /><text>加微信</text>
102 </view> 107 </view>
103 </view> 108 </view>
104 </view> 109 </view>
105 </view> 110 </view>
106 </view> 111 </view>
107 - <view class="publicModule preferentialCoupon" wx:if="{{titleList.length>0}}"> 112 + <view class="publicModule preferentialCouponBox" wx:if="{{titleList.length>0}}">
108 <view class="tileBox"> 113 <view class="tileBox">
109 - <view wx:for="{{titleList}}" wx:key="index" wx:for-index="index" bindtap="checkTitleFun" data-type="{{item.id}}" class="titleItem {{activeTitle==item.id?'activeTitleItem':''}}">{{item.title}}</view> 114 + <view wx:for="{{titleList}}" wx:key="index" wx:for-index="index" bindtap="checkTitleFun" data-type="{{item.id}}" class="titleItem font28r {{activeTitle==item.id?'activeTitleItem':''}}">{{item.title}}</view>
110 </view> 115 </view>
111 <!-- 优惠券 --> 116 <!-- 优惠券 -->
112 - <view class="regionItem couponBoxWrap" wx:if="{{activeTitle == '1'}}"> 117 + <view class="preferentialCoupon" wx:if="{{activeTitle == '1'}}">
113 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 118 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
114 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 119 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
115 <view class="preferentialItems"> 120 <view class="preferentialItems">
116 - <view class="purchase"> 121 + <view class="itemLeft">
  122 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  123 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
117 <view class="priceText" wx:if="{{item.price}}"> 124 <view class="priceText" wx:if="{{item.price}}">
118 - <view class="icons">￥<text class="priceText">{{item.price}}</text></view> 125 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
119 </view> 126 </view>
120 - <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
121 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>  
122 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view> 127 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
123 </view> 128 </view>
124 - <view class="certificateInfo">  
125 - <view class="preferentialDetails">  
126 - <view class="information">  
127 - <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
128 - <text class="ticketName font24r">{{item.aname}}</text>  
129 - </view>  
130 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}</text>  
131 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">  
132 - 无限制  
133 - </view>  
134 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">  
135 - 会员生日当天可用  
136 - </view>  
137 - <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">  
138 - <text class="font24r">消费要求</text>  
139 - </view>  
140 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="limitation showDesc font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
141 - <view wx:if="{{item.useStime && item.useEtime}}" class="font24r nodate showDesc">{{item.useStime}} 至 {{item.useEtime}}</view>  
142 - <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">  
143 - <text class="font24r">不可用日期</text>  
144 - </view>  
145 - </view>  
146 - <view class="limitationBtn" wx:if="{{item.is_type != '3'}}">  
147 - <view class="font24r couponBtn">立即抢购</view> 129 + <view class="couponLine"></view>
  130 + <view class="itemRight">
  131 + <view class="btns">
  132 + <text class="font32r anameText">{{item.aname}}</text>
  133 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  134 + <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>
  135 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  136 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  137 + </view>
  138 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  139 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  140 + </view>
  141 + </block>
  142 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  143 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  144 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  145 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  146 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  147 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  148 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  149 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  150 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  151 + </block>
148 </view> 152 </view>
149 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 153 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
150 - <view class="font24r orderingFood">已领取</view> 154 + <view class="font24r orderingFood orderingFood1">已领取</view>
151 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 155 <view class="grantNum" wx:if="{{item.receiveNumText}}">
152 <view class="font24r">已被领取</view> 156 <view class="font24r">已被领取</view>
153 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 157 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
154 </view> 158 </view>
155 </view> 159 </view>
  160 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">
  161 + 抢购
  162 + </view>
156 </view> 163 </view>
157 </view> 164 </view>
158 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
159 - <text></text>  
160 - <view>消费满{{item.desc}}元可用</view>  
161 - </view>  
162 - <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
163 - <text></text>{{item.morText}}  
164 - </view>  
165 - <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">  
166 - <text></text>{{item.noonText}}  
167 - </view>  
168 - <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">  
169 - <text></text>{{item.nigText}}  
170 - </view>  
171 </navigator> 165 </navigator>
172 </block> 166 </block>
173 </view> 167 </view>
174 <!-- 充值 --> 168 <!-- 充值 -->
175 <view class="regionItem" wx:if="{{activeTitle == '2'}}"> 169 <view class="regionItem" wx:if="{{activeTitle == '2'}}">
176 - <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">  
177 - <view class="rechargeItems">  
178 - <image class="checkImg" src="https://qn.colorcun.com/invitation10vector.png" mode="" />  
179 - <view class="rechargeTitle">{{recharge_data.recharge_money}}<text class="font24r">元</text></view>  
180 - </view>  
181 - </navigator>  
182 - <view class="limitation" wx:if="{{priceInfo || scoreInfo || recharge_data.recharge_list.is_coupons=='1'}}">  
183 - <view class="limitationTitle font28r">充值优惠详情</view>  
184 - <view class="font24r">  
185 - <text>会员充值满{{recharge_data.recharge_money}}元，</text>  
186 - <text wx:if="{{priceInfo}}">{{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':'，'}}</text>  
187 - <text wx:if="{{scoreInfo}}">{{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':'，'}}</text>  
188 - <text wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">{{recharge_data.recharge_list.is_coupons=='1'?'赠送'+certificate:''}}。</text> 170 + <view class="rechargeBox">
  171 + <block wx:for="{{recharge_data}}" wx:key="index">
  172 + <view class="rechargeItems {{item.id == activeData.id ? 'rechargeActive' : ''}}" bindtap="checkRechargeData" data-id="{{item.id}}">
  173 + <image class="checkImg" wx:if="{{item.id == activeData.id}}" src="https://qn.colorcun.com/invitation10vector.png" mode="" />
  174 + <view class="rechargeTitle">{{item.recharge_money}}<text class="font24r">元</text></view>
  175 + </view>
  176 + </block>
  177 + </view>
  178 + <view class="limitation" wx:if="{{activeData.priceInfo || activeData.scoreInfo || activeData.recharge_list.is_coupons=='1'}}">
  179 + <view class="limitationTitle font32r limitationTitle1">充值优惠详情</view>
  180 + <view class="font28r">
  181 + <text>会员充值满{{activeData.recharge_money}}元，</text>
  182 + <text wx:if="{{activeData.priceInfo}}">{{activeData.priceInfo}}{{(activeData.recharge_list.is_coupons=='0' && activeData.recharge_list.is_score=='0')?'。':'，'}}</text>
  183 + <text wx:if="{{activeData.scoreInfo}}">{{activeData.scoreInfo}}{{activeData.recharge_list.is_coupons=='0'?'。':'，'}}</text>
  184 + <text wx:if="{{activeData.recharge_list.is_coupons=='1'}}">{{activeData.recharge_list.is_coupons=='1'?'赠送'+activeData.certificate:''}}。</text>
189 </view> 185 </view>
190 </view> 186 </view>
191 <view class="limitation"> 187 <view class="limitation">
192 - <view class="limitationTitle font28r">有效期</view>  
193 - <view class="font24r">{{recharge_data.timeStr}}</view> 188 + <view class="limitationTitle font32r">有效期</view>
  189 + <view class="font28r">{{activeData.timeStr}}</view>
194 </view> 190 </view>
195 <view class="limitation"> 191 <view class="limitation">
196 - <view class="limitationTitle font28r">备注</view>  
197 - <view class="font24r">{{recharge_data.explain}}</view> 192 + <view class="limitationTitle font32r">备注</view>
  193 + <view class="font28r">{{activeData.explain}}</view>
198 </view> 194 </view>
199 <view class="rechargeBtn"> 195 <view class="rechargeBtn">
200 - <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="favouredPolicy">更多优惠</view>  
201 - <navigator wx:if="{{recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 196 + <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" bindtap="gotoFavourableList" class="font32r favouredPolicy">更多优惠</view>
  197 + <navigator wx:if="{{activeData.id}}" url="/pack-activity/pack/vipRecharge?id={{activeData.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
202 立即充值 198 立即充值
203 </navigator> 199 </navigator>
204 </view> 200 </view>
205 </view> 201 </view>
206 <!-- 评价券 --> 202 <!-- 评价券 -->
207 - <view class="regionItem certificateBox couponBoxWrap" wx:if="{{activeTitle == '3' && !is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}"> 203 + <view class="preferentialCoupon" wx:if="{{activeTitle == '3' && !is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
208 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view> 204 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view>
209 - <view class="couponInfo" bindtap="evaluateFun">  
210 - <view class="preferentialItems">  
211 - <view class="purchase">  
212 - <view class="priceText" wx:if="{{couponData.price}}">  
213 - <view class="icons">￥<text class="priceText">{{couponData.price}}</text></view>  
214 - </view>  
215 - <image class="certificateImg" src="{{(couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
216 - <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountInfo">{{couponData.discount}}折</text> 205 + <view class="preferentialItems" bindtap="evaluateFun">
  206 + <view class="itemLeft">
  207 + <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
  208 + <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  209 + <view class="priceText" wx:if="{{couponData.price}}">
  210 + <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text>
217 </view> 211 </view>
218 - <view class="certificateInfo">  
219 - <view class="preferentialDetails">  
220 - <view class="information">  
221 - <text class="discountText font20r">{{couponData.use.is_cash=='1'?'代金券':couponData.use.is_discount=='1'?'超值折扣':couponData.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
222 - <text class="ticketName font24r">{{couponData.aname}}</text>  
223 - </view>  
224 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="limitation font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}</text>  
225 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">  
226 - 无限制  
227 - </view>  
228 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">  
229 - 会员生日当天可用  
230 - </view>  
231 - <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">  
232 - <text class="font24r">消费要求</text>  
233 - </view>  
234 - <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="limitation showDesc font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>  
235 - <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="font24r nodate showDesc">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>  
236 - <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">  
237 - <text class="font24r">不可用日期</text> 212 + <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
  213 + </view>
  214 + <view class="couponLine"></view>
  215 + <view class="itemRight">
  216 + <view class="btns">
  217 + <text class="font32r anameText">{{couponData.aname}}</text>
  218 + <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
  219 + <view 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+'。':'。'}}</view>
  220 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  221 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
238 </view> 222 </view>
239 - </view>  
240 - <view class="limitationBtn" wx:if="{{couponData.is_type != '3'}}">  
241 - <view class="font24r couponBtn">立即抢购</view>  
242 - </view>  
243 - <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >  
244 - <view class="font24r orderingFood">{{couponData.resultCoupon == '1'?'已领取':'立即领取'}}</view>  
245 - <view class="grantNum" wx:if="{{couponData.receiveNumText}}">  
246 - <view class="font24r">已被领取</view>  
247 - <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view> 223 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  224 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
248 </view> 225 </view>
  226 + </block>
  227 + <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
  228 + <view wx:if="{{(couponData.useStime && couponData.useEtime) ||couponDataitem.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>
  229 + <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
  230 + <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>
  231 + <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
  232 + <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
  233 + <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
  234 + <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  235 + <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
  236 + </block>
  237 + </view>
  238 + <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
  239 + <view class="font24r orderingFood orderingFood2">免费领取</view>
  240 + <view class="grantNum" wx:if="{{couponData.receiveNumText}}">
  241 + <view class="font24r">已被领取</view>
  242 + <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
249 </view> 243 </view>
250 </view> 244 </view>
251 </view> 245 </view>
252 - <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
253 - <text></text>  
254 - <view>消费满{{couponData.desc}}元可用</view>  
255 - </view>  
256 - <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
257 - <text></text>{{couponData.morText}}  
258 - </view>  
259 - <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">  
260 - <text></text>{{couponData.noonText}}  
261 - </view>  
262 - <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">  
263 - <text></text>{{couponData.nigText}}  
264 - </view>  
265 </view> 246 </view>
266 </view> 247 </view>
267 <view class="regionItem evaluateCoupon" wx:if="{{activeTitle == '3' && is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}"> 248 <view class="regionItem evaluateCoupon" wx:if="{{activeTitle == '3' && is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}">
@@ -283,7 +264,7 @@ @@ -283,7 +264,7 @@
283 </view> 264 </view>
284 <block wx:if="{{bookType == '1'}}"> 265 <block wx:if="{{bookType == '1'}}">
285 <!-- 停车指引 --> 266 <!-- 停车指引 -->
286 - <view class="publicModules" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}"> 267 + <view class="publicModules" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}">
287 <view class="chefText font36r"> 268 <view class="chefText font36r">
288 <view class="line"></view> 269 <view class="line"></view>
289 <view class="font36r chefTextInfo">停车指引</view> 270 <view class="font36r chefTextInfo">停车指引</view>
@@ -292,15 +273,17 @@ @@ -292,15 +273,17 @@
292 <view class="labelBox" wx:if="{{reserve.textInfo}}"> 273 <view class="labelBox" wx:if="{{reserve.textInfo}}">
293 <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text> 274 <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text>
294 </view> 275 </view>
295 - <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
296 - <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index">  
297 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
298 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{reserve.imgsInfo}}"></image> 276 + <swiper wx:if="{{reserve.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  277 + <swiper-item wx:for="{{reserve.imgsInfo}}" wx:key="index">
  278 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.imgsInfo}}"></image>
299 </swiper-item> 279 </swiper-item>
300 </swiper> 280 </swiper>
  281 + <block wx:for="{{reserve.videosInfo}}" wx:key="index">
  282 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  283 + </block>
301 </view> 284 </view>
302 <!-- 招牌菜品 --> 285 <!-- 招牌菜品 -->
303 - <view class="publicModules" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0 || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}"> 286 + <view class="publicModules" wx:if="{{signboard && (signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0 || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}">
304 <view class="chefText font36r"> 287 <view class="chefText font36r">
305 <view class="line"></view> 288 <view class="line"></view>
306 <view class="font36r chefTextInfo">招牌菜品</view> 289 <view class="font36r chefTextInfo">招牌菜品</view>
@@ -309,12 +292,14 @@ @@ -309,12 +292,14 @@
309 <view class="labelBox" wx:if="{{signboard.textInfo}}"> 292 <view class="labelBox" wx:if="{{signboard.textInfo}}">
310 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text> 293 <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text>
311 </view> 294 </view>
312 - <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
313 - <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index">  
314 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
315 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image> 295 + <swiper wx:if="{{signboard.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  296 + <swiper-item wx:for="{{signboard.imgsInfo}}" wx:key="index">
  297 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}"></image>
316 </swiper-item> 298 </swiper-item>
317 </swiper> 299 </swiper>
  300 + <block wx:for="{{signboard.videosInfo}}">
  301 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  302 + </block>
318 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}"> 303 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
319 <view class="font32r">提前点餐 到店不用等</view> 304 <view class="font32r">提前点餐 到店不用等</view>
320 <view wx:if="{{openOrder == '1' && marketing.is_order == '1'}}" bindtap="cookbook" class="font28r cook" style="position: relative;"> 305 <view wx:if="{{openOrder == '1' && marketing.is_order == '1'}}" bindtap="cookbook" class="font28r cook" style="position: relative;">
@@ -323,7 +308,7 @@ @@ -323,7 +308,7 @@
323 </view> 308 </view>
324 </view> 309 </view>
325 <!-- 餐厅介绍 --> 310 <!-- 餐厅介绍 -->
326 - <view class="publicModules" wx:if="{{store && (store.textInfo || store.videoImgsInfo.length>0)}}"> 311 + <view class="publicModules" wx:if="{{store && (store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0)}}">
327 <view class="chefText font36r"> 312 <view class="chefText font36r">
328 <view class="line"></view> 313 <view class="line"></view>
329 <view class="font36r chefTextInfo">餐厅介绍</view> 314 <view class="font36r chefTextInfo">餐厅介绍</view>
@@ -332,15 +317,17 @@ @@ -332,15 +317,17 @@
332 <view class="labelBox" wx:if="{{store.textInfo}}"> 317 <view class="labelBox" wx:if="{{store.textInfo}}">
333 <text class="texts font28r" space="nbsp">{{store.textInfo}}</text> 318 <text class="texts font28r" space="nbsp">{{store.textInfo}}</text>
334 </view> 319 </view>
335 - <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
336 - <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index">  
337 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
338 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image> 320 + <swiper wx:if="{{store.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  321 + <swiper-item wx:for="{{store.imgsInfo}}" wx:key="index">
  322 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.imgsInfo}}"></image>
339 </swiper-item> 323 </swiper-item>
340 </swiper> 324 </swiper>
  325 + <block wx:for="{{store.videosInfo}}" wx:key="index">
  326 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  327 + </block>
341 </view> 328 </view>
342 <!-- 主厨介绍 --> 329 <!-- 主厨介绍 -->
343 - <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}"> 330 + <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.imgsInfo.length>0 || chef.videosInfo.length>0)}}">
344 <view class="chefText font36r"> 331 <view class="chefText font36r">
345 <view class="line"></view> 332 <view class="line"></view>
346 <view class="font36r chefTextInfo">主厨介绍</view> 333 <view class="font36r chefTextInfo">主厨介绍</view>
@@ -349,20 +336,22 @@ @@ -349,20 +336,22 @@
349 <view class="labelBox" wx:if="{{chef.textInfo}}"> 336 <view class="labelBox" wx:if="{{chef.textInfo}}">
350 <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text> 337 <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text>
351 </view> 338 </view>
352 - <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
353 - <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index">  
354 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
355 - <image wx:if="{{item.type=='1'}}" mode="aspectFill" class="detailBannerImg" src="{{item.content}}" bindtap="lookImgs" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image> 339 + <swiper wx:if="{{chef.imgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">
  340 + <swiper-item wx:for="{{chef.imgsInfo}}" wx:key="index">
  341 + <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{chef.imgsInfo}}"></image>
356 </swiper-item> 342 </swiper-item>
357 </swiper> 343 </swiper>
  344 + <block wx:for="{{chef.videosInfo}}" wx:key="index">
  345 + <video class="boxBlock" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>
  346 + </block>
358 </view> 347 </view>
359 </block> 348 </block>
360 <block wx:if="{{bookType == '2'}}"> 349 <block wx:if="{{bookType == '2'}}">
361 <!-- 餐厅介绍 --> 350 <!-- 餐厅介绍 -->
362 - <view class="publicModules" id="module1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.videoImgsInfo.length>0)}}"> 351 + <view class="publicModules" id="module1" wx:if="{{marketing.logo || home.image || (store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0)}}">
363 <view class="titleBox"> 352 <view class="titleBox">
364 <view class="titleLine"></view> 353 <view class="titleLine"></view>
365 - <view class="font32">餐厅介绍</view> 354 + <view class="font36r">餐厅介绍</view>
366 </view> 355 </view>
367 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" /> 356 <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
368 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image> 357 <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
@@ -385,10 +374,10 @@ @@ -385,10 +374,10 @@
385 </view> 374 </view>
386 </view> 375 </view>
387 <!-- 招牌菜品 --> 376 <!-- 招牌菜品 -->
388 - <view class="publicModules publicModules1" id="module2" wx:if="{{(signboard && signboard.textInfo || signboard.videoImgsInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}"> 377 + <view class="publicModules publicModules1" id="module2" wx:if="{{(signboard && signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1')}}">
389 <view class="titleBox"> 378 <view class="titleBox">
390 <view class="titleLine"></view> 379 <view class="titleLine"></view>
391 - <view class="font32">招牌菜品</view> 380 + <view class="font36r">招牌菜品</view>
392 </view> 381 </view>
393 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex"> 382 <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
394 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}" mode="widthFix" /> 383 <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.imgsInfo}}" mode="widthFix" />
@@ -410,10 +399,10 @@ @@ -410,10 +399,10 @@
410 </view> 399 </view>
411 </view> 400 </view>
412 <!-- 停车指引 --> 401 <!-- 停车指引 -->
413 - <view class="publicModules" id="module3" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}"> 402 + <view class="publicModules" id="module3" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}">
414 <view class="titleBox"> 403 <view class="titleBox">
415 <view class="titleLine"></view> 404 <view class="titleLine"></view>
416 - <view class="font32">停车指引</view> 405 + <view class="font36r">停车指引</view>
417 </view> 406 </view>
418 <view class="labelBox" wx:if="{{reserve.park_info}}"> 407 <view class="labelBox" wx:if="{{reserve.park_info}}">
419 <text class="texts" space="nbsp">{{reserve.park_info}}</text> 408 <text class="texts" space="nbsp">{{reserve.park_info}}</text>
@@ -432,10 +421,10 @@ @@ -432,10 +421,10 @@
432 </view> 421 </view>
433 </view> 422 </view>
434 <!-- 主厨介绍 --> 423 <!-- 主厨介绍 -->
435 - <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}"> 424 + <view class="publicModules" wx:if="{{chef && (chef.textInfo || chef.imgsInfo.length>0 || chef.videosInfo.length>0)}}">
436 <view class="titleBox"> 425 <view class="titleBox">
437 <view class="titleLine"></view> 426 <view class="titleLine"></view>
438 - <view class="font32">主厨介绍</view> 427 + <view class="font36r">主厨介绍</view>
439 </view> 428 </view>
440 <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}"> 429 <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
441 <text class="texts" space="nbsp">{{chef.introduce}}</text> 430 <text class="texts" space="nbsp">{{chef.introduce}}</text>
@@ -26,14 +26,12 @@ @@ -26,14 +26,12 @@
26 color: #FFEFC5; 26 color: #FFEFC5;
27 font-weight: 600; 27 font-weight: 600;
28 font-family: PingFang SC; 28 font-family: PingFang SC;
29 - margin-bottom: 32rpx;  
30 display: flex; 29 display: flex;
31 flex-direction: column; 30 flex-direction: column;
32 align-items: center; 31 align-items: center;
33 } 32 }
34 33
35 .infoTop .infoTopText3 { 34 .infoTop .infoTopText3 {
36 - margin-top: 14rpx;  
37 margin: 16rpx 0 32rpx 0; 35 margin: 16rpx 0 32rpx 0;
38 } 36 }
39 37
@@ -62,7 +60,7 @@ @@ -62,7 +60,7 @@
62 } 60 }
63 61
64 .infoItem .record { 62 .infoItem .record {
65 - font-weight: 400; 63 + font-weight: 500;
66 flex-shrink: 0; 64 flex-shrink: 0;
67 font-family: PingFang SC; 65 font-family: PingFang SC;
68 color: #AE2D2D; 66 color: #AE2D2D;
@@ -72,7 +70,7 @@ @@ -72,7 +70,7 @@
72 display: block; 70 display: block;
73 font-size: 24rpx; 71 font-size: 24rpx;
74 height: 50rpx; 72 height: 50rpx;
75 - padding: 0 34rpx; 73 + padding: 0 20rpx;
76 line-height: 48rpx; 74 line-height: 48rpx;
77 font-family: PingFang SC; 75 font-family: PingFang SC;
78 border-radius: 40rpx; 76 border-radius: 40rpx;
@@ -91,6 +89,7 @@ @@ -91,6 +89,7 @@
91 color: #AE2D2D; 89 color: #AE2D2D;
92 margin-top: 24rpx; 90 margin-top: 24rpx;
93 display: block; 91 display: block;
  92 + font-weight: 600;
94 } 93 }
95 94
96 .contentData { 95 .contentData {
@@ -100,6 +99,21 @@ @@ -100,6 +99,21 @@
100 margin-left: 24rpx; 99 margin-left: 24rpx;
101 font-weight: 600; 100 font-weight: 600;
102 color: #AE2D2D; 101 color: #AE2D2D;
  102 + display: -webkit-box;
  103 + word-break: break-all;
  104 + word-wrap: break-word;
  105 + overflow: hidden;
  106 + text-align: left;
  107 +}
  108 +
  109 +.contentFlex {
  110 + flex: inherit;
  111 +}
  112 +
  113 +.picker {
  114 + display: flex;
  115 + align-items: center;
  116 + justify-content: center;
103 } 117 }
104 118
105 .contentDataPhone { 119 .contentDataPhone {
@@ -138,6 +152,13 @@ @@ -138,6 +152,13 @@
138 border-radius: 50%; 152 border-radius: 50%;
139 } 153 }
140 154
  155 +.noHeaderimg {
  156 + width: 108rpx;
  157 + height: 108rpx;
  158 + background: #BFBFBF;
  159 + border-radius: 50%;
  160 +}
  161 +
141 .peopleInfo { 162 .peopleInfo {
142 display: flex; 163 display: flex;
143 flex-direction: column; 164 flex-direction: column;
@@ -150,7 +171,7 @@ @@ -150,7 +171,7 @@
150 171
151 .peopleInfo view { 172 .peopleInfo view {
152 font-family: "PingFang SC"; 173 font-family: "PingFang SC";
153 - font-weight: 400; 174 + font-weight: 600;
154 } 175 }
155 176
156 .handleInfo { 177 .handleInfo {
@@ -171,7 +192,8 @@ @@ -171,7 +192,8 @@
171 .handleInfo .texts { 192 .handleInfo .texts {
172 margin: 22rpx 0; 193 margin: 22rpx 0;
173 letter-spacing: 3rpx; 194 letter-spacing: 3rpx;
174 - line-height: 36rpx 195 + line-height: 36rpx;
  196 + font-weight: 500;
175 } 197 }
176 198
177 .contactBtns { 199 .contactBtns {
@@ -189,6 +211,7 @@ @@ -189,6 +211,7 @@
189 align-items: center; 211 align-items: center;
190 justify-content: center; 212 justify-content: center;
191 box-shadow: 0rpx 4rpx 8rpx #00000040; 213 box-shadow: 0rpx 4rpx 8rpx #00000040;
  214 + font-weight: 600 !important;
192 } 215 }
193 216
194 .brownFont image { 217 .brownFont image {
@@ -204,14 +227,15 @@ @@ -204,14 +227,15 @@
204 width: 100%; 227 width: 100%;
205 padding: 40rpx 0 32rpx 0; 228 padding: 40rpx 0 32rpx 0;
206 background: #fff; 229 background: #fff;
207 - border-radius: 20rpx 20rpx 0 0; 230 + border-radius: 10rpx 10rpx 0 0;
208 } 231 }
209 232
210 .titleItem { 233 .titleItem {
211 - font-weight: 400; 234 + font-weight: 600;
212 background: #FFEFD6; 235 background: #FFEFD6;
213 color: #000; 236 color: #000;
214 padding: 10rpx 16rpx; 237 padding: 10rpx 16rpx;
  238 + border-radius: 6rpx;
215 } 239 }
216 240
217 .activeTitleItem::after { 241 .activeTitleItem::after {
@@ -237,14 +261,15 @@ @@ -237,14 +261,15 @@
237 margin: 20rpx; 261 margin: 20rpx;
238 padding: 0; 262 padding: 0;
239 background: #fff; 263 background: #fff;
240 - border-radius: 20rpx; 264 + border-top-left-radius: 20rpx;
  265 + border-top-right-radius: 20rpx;
241 } 266 }
242 267
243 .publicModules { 268 .publicModules {
244 padding: 40rpx 20rpx; 269 padding: 40rpx 20rpx;
245 margin: 20rpx; 270 margin: 20rpx;
246 background: #fff; 271 background: #fff;
247 - border-radius: 20rpx; 272 + border-radius: 10rpx;
248 display: flex; 273 display: flex;
249 flex-direction: column; 274 flex-direction: column;
250 } 275 }
@@ -265,161 +290,26 @@ @@ -265,161 +290,26 @@
265 290
266 .chefTextInfo { 291 .chefTextInfo {
267 font-family: PingFang SC; 292 font-family: PingFang SC;
268 - font-weight: 400; 293 + font-weight: 600;
269 letter-spacing: 8rpx; 294 letter-spacing: 8rpx;
270 color: #AE2D2D; 295 color: #AE2D2D;
271 } 296 }
272 297
273 -.preferentialCoupon { 298 +.preferentialCouponBox {
274 background: #efefef; 299 background: #efefef;
275 -}  
276 -  
277 -.preferentialCoupon .nodate{  
278 - padding-left: 20rpx;  
279 -}  
280 -  
281 -.preferentialCoupon .limitation {  
282 - display: flex;  
283 - flex-direction: column;  
284 -}  
285 -  
286 -.preferentialCoupon .regionItem {  
287 - padding: 40rpx;  
288 -}  
289 -  
290 -.regionItem {  
291 - width: 100%;  
292 - padding: 40rpx 20rpx;  
293 - box-sizing: border-box;  
294 - background: #EFEFEF;  
295 - border-radius: 20rpx;  
296 -}  
297 -  
298 -.preferentialItems {  
299 - width: 100%;  
300 - display: flex;  
301 - min-height: 160rpx;  
302 -}  
303 -  
304 -.purchase {  
305 - position: relative;  
306 - width: 30%;  
307 - display: flex;  
308 - flex-direction: column;  
309 - justify-content: center;  
310 - align-items: center;  
311 - background: #FFEFD6;  
312 border-radius: 10rpx; 300 border-radius: 10rpx;
313 } 301 }
314 302
315 -.discountText {  
316 - text-align: center;  
317 - color: #FFEFC5;  
318 - border-radius: 6rpx;  
319 - font-family: PingFang SC;  
320 - background: #FD4D59;  
321 - width: max-content;  
322 - padding: 6rpx;  
323 - margin-right: 8rpx;  
324 -}  
325 -  
326 -.priceText {  
327 - font-family: PingFang SC;  
328 - color: #F6231B;  
329 - font-weight: 500;  
330 - margin-top: 6rpx;  
331 - display: flex;  
332 - align-items: center;  
333 - justify-content: center;  
334 - font-size: 52rpx;  
335 - flex-direction: column;  
336 -}  
337 -  
338 -.icons {  
339 - font-family: PingFang SC;  
340 - color: #F6231B;  
341 - font-size: 20rpx;  
342 - display: flex;  
343 - align-items: baseline;  
344 -}  
345 -  
346 -.certificateInfo {  
347 - width: 70%;  
348 - padding: 20rpx;  
349 - position: relative;  
350 - background: #fff;  
351 - border-radius: 10rpx;  
352 - display: flex;  
353 - flex-direction: column;  
354 - justify-content: center;  
355 - align-items: center;  
356 -}  
357 -  
358 -.certificateInfo .limitation {  
359 - line-height: 40rpx;  
360 -}  
361 -  
362 -.ticketName {  
363 - display: flex;  
364 - justify-content: space-between;  
365 - align-items: baseline;  
366 - font-weight: 700;  
367 - overflow: hidden;  
368 - word-break: break-all;  
369 - text-overflow: ellipsis;  
370 - display: -webkit-box;  
371 - -webkit-box-orient: vertical;  
372 - -webkit-line-clamp: 1;  
373 - color: #000;  
374 -}  
375 -  
376 -.orderingFood {  
377 - padding: 0 20rpx;  
378 - border-radius: 22rpx;  
379 - text-align: center;  
380 - border-radius: 20rpx;  
381 - line-height: 44rpx;  
382 - height: 44rpx;  
383 - width: max-content;  
384 - margin-top: 24rpx;  
385 - flex-shrink: 0;  
386 - border: 2rpx solid #AE2D2D;  
387 - background: transparent;  
388 - color: #AE2D2D;  
389 -}  
390 -  
391 -.grantNum {  
392 - display: flex;  
393 - flex-direction: column;  
394 - align-items: center;  
395 - color: #999;  
396 - margin-top: 10rpx;  
397 -}  
398 -  
399 -.grantNum text {  
400 - color: #F6231B;  
401 - margin-right: 10rpx;  
402 -}  
403 -  
404 -.limitation {  
405 - margin-top: 10rpx;  
406 - color: #666;  
407 - font-family: PingFang SC;  
408 - font-weight: 500;  
409 - display: -webkit-box;  
410 - word-break: break-all;  
411 - word-wrap: break-word;  
412 - overflow: hidden;  
413 - text-align: left;  
414 - line-height: 30rpx;  
415 -}  
416 -  
417 .limitationTitle { 303 .limitationTitle {
418 font-weight: 600; 304 font-weight: 600;
419 line-height: 28rpx; 305 line-height: 28rpx;
420 color: #000; 306 color: #000;
421 line-height: 40rpx; 307 line-height: 40rpx;
422 - margin: 40rpx 0 20rpx 0; 308 + margin: 40rpx 0 10rpx 0;
  309 +}
  310 +
  311 +.limitationTitle1 {
  312 + margin-top: 20rpx;
423 } 313 }
424 314
425 .certificateBox .limitationTitle { 315 .certificateBox .limitationTitle {
@@ -433,11 +323,16 @@ @@ -433,11 +323,16 @@
433 border-radius: 20rpx; 323 border-radius: 20rpx;
434 border: 2rpx solid #000000; 324 border: 2rpx solid #000000;
435 position: relative; 325 position: relative;
436 - padding: 20rpx 40rpx; 326 + padding: 20rpx 0;
437 flex-direction: column; 327 flex-direction: column;
438 justify-content: center; 328 justify-content: center;
  329 + background: transparent;
  330 + width: 47%;
  331 + margin-bottom: 20rpx;
  332 +}
  333 +
  334 +.rechargeActive {
439 background: #fff; 335 background: #fff;
440 - width: 35%;  
441 } 336 }
442 337
443 .checkImg { 338 .checkImg {
@@ -451,9 +346,12 @@ @@ -451,9 +346,12 @@
451 .rechargeTitle { 346 .rechargeTitle {
452 font-family: PingFang SC; 347 font-family: PingFang SC;
453 font-weight: 700; 348 font-weight: 700;
454 - letter-spacing: 4rpx; 349 + letter-spacing: 2rpx;
455 font-size: 68rpx; 350 font-size: 68rpx;
456 text-align: center; 351 text-align: center;
  352 + display: flex;
  353 + align-items: baseline;
  354 + justify-content: center;
457 } 355 }
458 356
459 .couponBtn { 357 .couponBtn {
@@ -472,124 +370,222 @@ @@ -472,124 +370,222 @@
472 370
473 .rechargeBtn .favouredPolicy { 371 .rechargeBtn .favouredPolicy {
474 width: 30%; 372 width: 30%;
475 - padding: 12rpx 0; 373 + padding: 10rpx 0;
476 border: 2rpx solid #AE2D2D; 374 border: 2rpx solid #AE2D2D;
477 border-radius: 42rpx; 375 border-radius: 42rpx;
478 color: #AE2D2D; 376 color: #AE2D2D;
479 text-align: center; 377 text-align: center;
  378 + font-weight: 600;
480 } 379 }
481 380
482 -.rechargeBtn navigator {  
483 - width: 63%;  
484 - padding: 12rpx 0;  
485 - background: #AE2D2D;  
486 - border-radius: 42rpx; 381 +.preferentialCoupon {
  382 + padding: 40rpx 20rpx 20rpx 20rpx;
  383 + border-radius: 0 0 10rpx 10rpx;
  384 +}
  385 +
  386 +.preferentialCoupon .nodate{
  387 + padding-left: 20rpx;
  388 +}
  389 +
  390 +.preferentialItems {
  391 + display: flex;
  392 + background: #FFEFD6;
  393 + margin-bottom: 20rpx;
  394 + min-height: 180rpx;
  395 + padding-bottom: 10rpx;
  396 + border-radius: 20rpx;
  397 +}
  398 +
  399 +.itemLeft {
  400 + width: 30%;
  401 + display: flex;
  402 + flex-direction: column;
  403 + justify-content: center;
  404 + position: relative;
  405 +}
  406 +
  407 +.discountText1 {
  408 + text-align: center;
  409 + border-radius: 6rpx;
  410 + font-family: PingFang SC;
  411 + background: transparent;
  412 + width: max-content;
  413 + padding: 2rpx 8rpx;
  414 + position: absolute;
  415 + left: 16rpx;
  416 + top: 12rpx;
  417 +}
  418 +
  419 +.discountText2 {
  420 + background: #FD4D59;
487 color: #fff; 421 color: #fff;
488 - text-align: center;  
489 } 422 }
490 423
491 -.couponBoxWrap navigator,  
492 -.couponBoxWrap .couponInfo {  
493 - width: 100%;  
494 - margin-bottom: 20rpx;  
495 - border-radius: 10rpx;  
496 - background: #fff; 424 +.discountText3 {
  425 + color: #FD4D59;
  426 + border: 2rpx solid #FD4D59;
497 } 427 }
498 428
499 -.bottomLimitationTop{  
500 - margin-top: 20rpx !important; 429 +.priceText {
  430 + font-family: 'Abel';
  431 + color: #E34D59;
  432 + font-weight: 500;
  433 + font-size: 64rpx;
  434 + margin-top: 6rpx;
501 } 435 }
502 436
503 -.couponBoxWrap .preferentialItems {  
504 - box-shadow: 0rpx 4rpx 8rpx #0000000d; 437 +.itemRight {
  438 + width: 70%;
  439 + padding-right: 10rpx;
  440 + margin-left: 18rpx;
505 } 441 }
506 442
507 -.couponBoxWrap .showDesc {  
508 - color: #666; 443 +.btns {
  444 + margin: 24rpx 20rpx 0 0;
  445 + display: flex;
  446 + justify-content: space-evenly;
  447 + align-items: baseline;
  448 + flex-direction: column;
  449 + height: 90%;
509 } 450 }
510 451
511 -.couponBoxWrap .bottomLimitation {  
512 - padding: 0 20rpx; 452 +.preferentialCoupon .itemRight {
  453 + width: 74%;
513 display: flex; 454 display: flex;
514 - flex-direction: row !important;  
515 align-items: center; 455 align-items: center;
516 - margin-top: 10rpx;  
517 - color: #666;  
518 - font-family: PingFang SC;  
519 - font-weight: 500;  
520 } 456 }
521 457
522 -.bottomLimitation:nth-last-of-type(1){  
523 - padding-bottom: 20rpx; 458 +.preferentialCoupon .itemLeft {
  459 + width: 26%;
524 } 460 }
525 461
526 -.couponBoxWrap .bottomLimitation text {  
527 - display: block;  
528 - width: 8rpx;  
529 - height: 8rpx;  
530 - background: #999999;  
531 - margin-right: 12rpx;  
532 - border-radius: 50%; 462 +.preferentialCoupon .couponLine{
  463 + margin: 24rpx 0 4rpx 0;
  464 + border-right: 2rpx dashed #FD4D59;
533 } 465 }
534 466
535 -.couponBoxWrap .certificateInfo {  
536 - flex-direction: row;  
537 - align-items: center; 467 +.preferentialCoupon .orderingFood {
  468 + padding: 0 44rpx;
  469 + color: #fff;
  470 + border: none;
  471 + text-align: center;
  472 + border-radius: 20rpx;
  473 + line-height: 44rpx;
  474 + height: 44rpx;
  475 + width: max-content;
  476 + flex-shrink: 0;
  477 + background: #ae2d2d;
538 } 478 }
539 479
540 -.couponBoxWrap .couponBtn {  
541 - width: 100%;  
542 - height: fit-content;  
543 - background: #AE2D2D;  
544 - color: #fff; 480 +.preferentialCoupon .icons {
  481 + color: #FD4D59;
  482 + text-align: center;
545 } 483 }
546 484
547 -.couponBoxWrap .certificateInfo .preferentialDetails {  
548 - width: 100%; 485 +.preferentialCoupon .priceText {
  486 + display: flex;
  487 + align-items: baseline;
  488 + justify-content: center;
  489 + font-family: PingFang SC;
  490 + color: #FD4D59;
  491 + font-weight: 600;
  492 + font-size: 48rpx;
  493 + margin-top: 6rpx;
  494 +}
  495 +
  496 +.preferentialCoupon .priceText text {
  497 + font-size: 48rpx;
  498 +}
  499 +
  500 +.preferentialCoupon .btns {
  501 + flex: 1;
  502 +}
  503 +
  504 +.preferentialCoupon .btnBox {
549 display: flex; 505 display: flex;
550 flex-direction: column; 506 flex-direction: column;
551 } 507 }
552 508
553 -.couponBoxWrap .information { 509 +.preferentialCoupon .grantNum {
554 display: flex; 510 display: flex;
  511 + flex-direction: column;
555 align-items: center; 512 align-items: center;
  513 + color: #C36607;
  514 + margin-top: 10rpx;
556 } 515 }
557 516
558 -.couponBoxWrap .certificateInfo .limitation {  
559 - margin-right: 20rpx;  
560 - flex: 1;  
561 - width: auto; 517 +.preferentialCoupon .grantNum text {
  518 + color: #F6231B;
  519 + margin-right: 10rpx;
562 } 520 }
563 521
564 -.couponBoxWrap .discountInfo {  
565 - font-family: PingFang SC;  
566 - background: #FD4D59;  
567 - position: absolute;  
568 - top: 0;  
569 - left: 100rpx;  
570 - font-size: 16rpx;  
571 - border-radius: 0 0 10rpx 0;  
572 - padding: 0 6rpx;  
573 - height: 28rp;  
574 - line-height: 28rpx;  
575 - text-align: center;  
576 - color: #FFEFC5;  
577 - width: max-content; 522 +.preferentialCoupon .btns .anameText {
  523 + font-weight: 600;
578 } 524 }
579 525
580 -.couponBoxWrap .certificateImg {  
581 - position: absolute;  
582 - top: 0;  
583 - left: 0;  
584 - width: 100rpx;  
585 - height: 28rpx; 526 +.preferentialCoupon .orderingFood1 {
  527 + border: 2rpx solid #AE2D2D;
  528 + background: transparent;
  529 + color: #AE2D2D;
  530 + font-weight: 600;
  531 + padding: 0 30rpx;
  532 +}
  533 +
  534 +.preferentialCoupon .orderingFood2 {
  535 + padding: 0 20rpx;
  536 +}
  537 +
  538 +.discountText {
  539 + text-align: center;
  540 + color: #FFEFC5;
  541 + border-radius: 6rpx;
  542 + font-family: PingFang SC;
  543 + background: #FD4D59;
  544 + width: max-content;
  545 + padding: 6rpx;
  546 + position: absolute;
  547 + left: 16rpx;
  548 + top: 12rpx;
  549 +}
  550 +
  551 +.bottom {
  552 + margin-top: 4rpx;
  553 + width: 100%;
  554 + color: #C36607;
  555 + font-family: PingFang SC;
  556 + font-weight: 500;
  557 + display: -webkit-box;
  558 + word-break: break-all;
  559 + word-wrap: break-word;
  560 + overflow: hidden;
  561 + text-align: left;
586 } 562 }
587 563
588 -.couponBoxWrap .limitationBtn {  
589 - width: 40%; 564 +.regionItem {
  565 + padding: 40rpx;
  566 +}
  567 +
  568 +.rechargeBox {
590 display: flex; 569 display: flex;
591 - flex-direction: column;  
592 align-items: center; 570 align-items: center;
  571 + flex-wrap: wrap;
  572 + width: 100%;
  573 + justify-content: space-between;
  574 +}
  575 +
  576 +.rechargeBtn navigator {
  577 + width: 63%;
  578 + padding: 12rpx 0;
  579 + background: #AE2D2D;
  580 + border-radius: 42rpx;
  581 + color: #fff;
  582 + text-align: center;
  583 + font-size: 32rpx;
  584 + font-weight: 600;
  585 +}
  586 +
  587 +.bottomLimitationTop{
  588 + margin-top: 20rpx !important;
593 } 589 }
594 590
595 .evaluateTitleText { 591 .evaluateTitleText {
@@ -619,10 +615,11 @@ @@ -619,10 +615,11 @@
619 .evaluateCoupon .couponBtn { 615 .evaluateCoupon .couponBtn {
620 width: max-content; 616 width: max-content;
621 height: max-content; 617 height: max-content;
622 - padding: 4rpx 26rpx; 618 + padding: 4rpx 28rpx 6rpx 28rpx;
623 margin-top: 0; 619 margin-top: 0;
624 background: #fff; 620 background: #fff;
625 color: #ae2d2d; 621 color: #ae2d2d;
  622 + font-weight: 600;
626 } 623 }
627 624
628 .evaluateCoupon .evaluateText { 625 .evaluateCoupon .evaluateText {
@@ -640,7 +637,7 @@ @@ -640,7 +637,7 @@
640 637
641 .labelBox .texts { 638 .labelBox .texts {
642 line-height: 40rpx; 639 line-height: 40rpx;
643 - color: #222; 640 + color: #000;
644 font-family: PingFang SC; 641 font-family: PingFang SC;
645 font-weight: 500; 642 font-weight: 500;
646 display: block; 643 display: block;
@@ -673,6 +670,7 @@ @@ -673,6 +670,7 @@
673 width: 100%; 670 width: 100%;
674 height: 500rpx; 671 height: 500rpx;
675 background: transparent; 672 background: transparent;
  673 + margin-top: 20rpx;
676 } 674 }
677 675
678 .detailBannerImg { 676 .detailBannerImg {
@@ -683,7 +681,8 @@ @@ -683,7 +681,8 @@
683 681
684 .boxBlock { 682 .boxBlock {
685 width: 100%; 683 width: 100%;
686 - height: 500rpx; 684 + border-radius: 10rpx;
  685 + margin-top: 20rpx;
687 } 686 }
688 687
689 .businessBox { 688 .businessBox {
@@ -716,22 +715,13 @@ @@ -716,22 +715,13 @@
716 .arrivalBox { 715 .arrivalBox {
717 display: flex; 716 display: flex;
718 width: 100%; 717 width: 100%;
719 - justify-content: space-between;  
720 align-items: center; 718 align-items: center;
721 } 719 }
722 720
723 -.arrivalBox button {  
724 - display: flex;  
725 - font-size: 24rpx;  
726 - flex-direction: column;  
727 - height: 50rpx;  
728 - padding: 0 18rpx;  
729 - line-height: 48rpx;  
730 - font-family: PingFang SC;  
731 - border-radius: 40rpx;  
732 - background: transparent;  
733 - color: #AE2D2D;  
734 - border: 2rpx solid #AE2D2D; 721 +.arrivalBox .arrivalImg {
  722 + width: 40rpx;
  723 + height: 40rpx;
  724 + margin-left: 20rpx;
735 } 725 }
736 726
737 .shareItem, 727 .shareItem,
@@ -1063,19 +1053,23 @@ @@ -1063,19 +1053,23 @@
1063 background-size: cover; 1053 background-size: cover;
1064 } 1054 }
1065 1055
1066 -.viewBox2 .infoTopText1 {  
1067 - font-size: 60rpx;  
1068 - font-family: Sinter;  
1069 - line-height: 60rpx;  
1070 - letter-spacing: 14rpx;  
1071 - font-weight: 500; 1056 +.viewBox2 .infoTop {
  1057 + color: #FFF7DA;
  1058 +}
  1059 +
  1060 +.viewBox2 .infoTopImg1 {
  1061 + width: 100%;
  1062 + height: 204rpx;
1072 margin-bottom: 40rpx; 1063 margin-bottom: 40rpx;
1073 } 1064 }
1074 1065
  1066 +.viewBox2 .infoTopText3 {
  1067 + margin-bottom: 0;
  1068 +}
  1069 +
1075 .infoTopText4 { 1070 .infoTopText4 {
1076 - font-size: 120rpx;  
1077 - line-height: 120rpx;  
1078 - letter-spacing: 20rpx; 1071 + width: 408rpx;
  1072 + height: 134rpx;
1079 margin-bottom: 32rpx; 1073 margin-bottom: 32rpx;
1080 } 1074 }
1081 1075
@@ -1090,7 +1084,8 @@ @@ -1090,7 +1084,8 @@
1090 color: #fff; 1084 color: #fff;
1091 } 1085 }
1092 1086
1093 -.viewBox2 .contentDataPhone { 1087 +.viewBox2 .contentDataPhone,
  1088 +.viewBox2 .divider {
1094 color: #35E084; 1089 color: #35E084;
1095 } 1090 }
1096 1091
@@ -1100,8 +1095,13 @@ @@ -1100,8 +1095,13 @@
1100 } 1095 }
1101 1096
1102 .viewBox2 .orderingFood { 1097 .viewBox2 .orderingFood {
  1098 + background: #000;
  1099 +}
  1100 +
  1101 +.viewBox2 .orderingFood1 {
1103 color: #000; 1102 color: #000;
1104 - border: 2rpx solid #000; 1103 + background: transparent;
  1104 + border: 2rpx solid #000 !important;
1105 } 1105 }
1106 1106
1107 .viewBox2 .positioning { 1107 .viewBox2 .positioning {
@@ -1126,8 +1126,8 @@ @@ -1126,8 +1126,8 @@
1126 position: relative; 1126 position: relative;
1127 } 1127 }
1128 1128
1129 -.viewBox2 .preferentialCoupon {  
1130 - margin: 140rpx 0 0 0; 1129 +.viewBox2 .preferentialCouponBox {
  1130 + margin: 140rpx 0 30rpx 0;
1131 padding-top: 40rpx; 1131 padding-top: 40rpx;
1132 } 1132 }
1133 1133
@@ -1177,10 +1177,6 @@ @@ -1177,10 +1177,6 @@
1177 background: #FFF8EC; 1177 background: #FFF8EC;
1178 } 1178 }
1179 1179
1180 -.viewBox2 .purchase {  
1181 - background: #E8CEA8;  
1182 -}  
1183 -  
1184 .viewBox2 .evaluateCoupon .couponBtn { 1180 .viewBox2 .evaluateCoupon .couponBtn {
1185 background: #E8CEA8; 1181 background: #E8CEA8;
1186 color: #000; 1182 color: #000;
@@ -1213,13 +1209,8 @@ @@ -1213,13 +1209,8 @@
1213 overflow-x: scroll; 1209 overflow-x: scroll;
1214 border-bottom-left-radius: 10rpx; 1210 border-bottom-left-radius: 10rpx;
1215 border-bottom-right-radius: 10rpx; 1211 border-bottom-right-radius: 10rpx;
1216 - padding-top: 30rpx;  
1217 -}  
1218 -  
1219 -.viewBox2 .regionItem {  
1220 - padding: 40rpx;  
1221 - width: auto;  
1222 - background: #efefef; 1212 + padding-bottom: 40rpx;
  1213 + margin-bottom: 20rpx;
1223 } 1214 }
1224 1215
1225 .viewBox2 .publicModules { 1216 .viewBox2 .publicModules {
@@ -1302,7 +1293,8 @@ @@ -1302,7 +1293,8 @@
1302 1293
1303 .viewBox2 .publicModules image, 1294 .viewBox2 .publicModules image,
1304 .viewBox2 .publicModules .labelBox .texts { 1295 .viewBox2 .publicModules .labelBox .texts {
1305 - margin-bottom: 40rpx; 1296 + margin-bottom: 20rpx;
  1297 + border-radius: 10rpx;
1306 width: 100%; 1298 width: 100%;
1307 } 1299 }
1308 1300
@@ -1325,6 +1317,7 @@ @@ -1325,6 +1317,7 @@
1325 .viewBox2 .videoBox video { 1317 .viewBox2 .videoBox video {
1326 width: 100%; 1318 width: 100%;
1327 box-sizing: border-box; 1319 box-sizing: border-box;
  1320 + border-radius: 10rpx;
1328 } 1321 }
1329 1322
1330 .viewBox2 .businessBox { 1323 .viewBox2 .businessBox {
@@ -1334,10 +1327,13 @@ @@ -1334,10 +1327,13 @@
1334 .viewBox2 .entrance { 1327 .viewBox2 .entrance {
1335 display: flex; 1328 display: flex;
1336 flex-direction: column; 1329 flex-direction: column;
1337 - position: absolute; 1330 + position: fixed;
1338 right: 3%; 1331 right: 3%;
1339 - top: -17%; 1332 + top: 19%;
1340 z-index: 200; 1333 z-index: 200;
  1334 + background: rgba(0, 0, 0, .7);
  1335 + border-radius: 198rpx;
  1336 + padding: 30rpx 8rpx;
1341 } 1337 }
1342 1338
1343 .viewBox2 .entrance1 { 1339 .viewBox2 .entrance1 {
@@ -25,11 +25,9 @@ Page({ @@ -25,11 +25,9 @@ Page({
25 signboard: {}, 25 signboard: {},
26 store: {}, 26 store: {},
27 recharge_data: {}, 27 recharge_data: {},
  28 + activeData: {},
28 coupon_dataList: [], 29 coupon_dataList: [],
29 seller: {}, 30 seller: {},
30 - priceInfo: '',  
31 - scoreInfo: '',  
32 - certificate: '',  
33 dataStr: Date.now() * 1 / 1000, 31 dataStr: Date.now() * 1 / 1000,
34 swich_phone: '0', //是否显示前台电话 32 swich_phone: '0', //是否显示前台电话
35 is_comments: '0', 33 is_comments: '0',
@@ -701,10 +699,8 @@ Page({ @@ -701,10 +699,8 @@ Page({
701 couponList = this.addCoupons(coupon_data_free,couponList); 699 couponList = this.addCoupons(coupon_data_free,couponList);
702 // 根据券ID获取券详情 700 // 根据券ID获取券详情
703 this.getActivityByIdFun(couponList) 701 this.getActivityByIdFun(couponList)
704 - // 根据充值ID获取充值详情  
705 - if (marketing && marketing.is_recharge && marketing.is_recharge == '1' && marketing.recharge_data) {  
706 - this.getRechargeDetail(marketing.recharge_data.id)  
707 - } 702 + // 获取所有充值活动
  703 + this.getRechargeDetail()
708 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 704 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
709 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 705 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
710 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 706 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
@@ -899,21 +895,34 @@ Page({ @@ -899,21 +895,34 @@ Page({
899 } 895 }
900 }, 896 },
901 // 根据充值ID获取充值详情 897 // 根据充值ID获取充值详情
902 - getRechargeDetail(id) {  
903 - App.Activity.GetNewRecharge({  
904 - id 898 + getRechargeDetail() {
  899 + App.Activity.GetNewRechargeList({
  900 + sellerid: this.data.detail.seller.id,
905 }).then(res => { 901 }).then(res => {
906 if (res.data) { 902 if (res.data) {
907 - let detail = res.data  
908 - let exp_date = res.data.exp_date ? JSON.parse(res.data.exp_date) : ''  
909 - let recharge_list = res.data.recharge_list ? JSON.parse(res.data.recharge_list) : ''  
910 - let priceInfo, scoreInfo, certificate;  
911 - detail.recharge_list = recharge_list;  
912 - detail.exp_date = exp_date;  
913 - if (recharge_list.is_price == '1') priceInfo = '赠送' + recharge_list.price + '元余额';  
914 - if (recharge_list.is_score == '1') scoreInfo = '赠送' + recharge_list.score + '积分';  
915 - if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) certificate = recharge_list.coupons_names.join('、');  
916 - let recharge_data = (this.data.dataStr < detail.etime * 1 && detail.is_open == '1') ? detail : '' 903 +
  904 + let arr = []
  905 + res.data.forEach(i => {
  906 + if (i.status != '1') {
  907 + arr.push(i)
  908 + }
  909 + })
  910 + let recharge_data = arr;
  911 + recharge_data.forEach(item => {
  912 + item.recharge_list = item.recharge_list ? JSON.parse(item.recharge_list) : '';
  913 + let recharge_list = item.recharge_list;
  914 + item.priceInfo = '';
  915 + item.scoreInfo = '';
  916 + item.certificate = '';
  917 + if (recharge_list.is_price == '1') item.priceInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.price + '元余额';
  918 + if (recharge_list.is_score == '1') item.scoreInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_list.score + '积分';
  919 + if (recharge_list.is_coupons == '1' && recharge_list.coupons_names.length > 0) item.certificate = recharge_list.coupons_names.join('、');
  920 + item.timeStr = util.unixtoTime(item.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(item.etime, 'YYYY-MM-DD')
  921 + })
  922 + // 筛选出 未过期的 && 开启状态的充值活动
  923 + recharge_data = recharge_data.filter(item => {
  924 + return this.data.dataStr < (item.etime * 1) && item.is_open == '1'
  925 + })
917 console.log('邀请函--------------充值', recharge_data); 926 console.log('邀请函--------------充值', recharge_data);
918 let entry = this.data.titleList 927 let entry = this.data.titleList
919 if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) { 928 if (this.data.hasValueRecharge && this.data.marketing.is_recharge == '1' && recharge_data) {
@@ -924,23 +933,33 @@ Page({ @@ -924,23 +933,33 @@ Page({
924 if (entry.length > 0) { 933 if (entry.length > 0) {
925 entry.sort((a, b) => a.id - b.id); 934 entry.sort((a, b) => a.id - b.id);
926 } 935 }
927 - recharge_data.timeStr = util.unixtoTime(recharge_data.stime, 'YYYY-MM-DD') + ' - ' + util.unixtoTime(recharge_data.etime, 'YYYY-MM-DD')  
928 } 936 }
929 this.setData({ 937 this.setData({
930 titleList: entry, 938 titleList: entry,
931 activeTitle: entry.length > 0 ? entry[0].id : '', 939 activeTitle: entry.length > 0 ? entry[0].id : '',
932 recharge_data, 940 recharge_data,
933 - scoreInfo,  
934 - priceInfo,  
935 - certificate 941 + activeData: recharge_data.length > 0 ? recharge_data[0] : {},
936 }) 942 })
937 } else { 943 } else {
938 this.setData({ 944 this.setData({
939 - recharge_data: {}, 945 + recharge_data: [],
  946 + activeData: {},
940 }) 947 })
941 } 948 }
942 }) 949 })
943 }, 950 },
  951 + // 选择充值活动
  952 + checkRechargeData(e) {
  953 + let id = e.currentTarget.dataset['id'];
  954 + let obj = this.data.recharge_data.filter(item => {
  955 + return item.id == id
  956 + })
  957 + if (obj && obj.length > 0) {
  958 + this.setData({
  959 + activeData: obj[0]
  960 + })
  961 + }
  962 + },
944 // 选择标题 963 // 选择标题
945 checkTitleFun(e) { 964 checkTitleFun(e) {
946 console.log('e.currentTargete.currentTarget', e.currentTarget); 965 console.log('e.currentTargete.currentTarget', e.currentTarget);
@@ -1305,7 +1324,6 @@ Page({ @@ -1305,7 +1324,6 @@ Page({
1305 }, 1324 },
1306 // 计算免费券有效期的起始、结束日期 1325 // 计算免费券有效期的起始、结束日期
1307 setTimeRange(cdate, startOffset, endOffset) { 1326 setTimeRange(cdate, startOffset, endOffset) {
1308 - console.log(cdate, startOffset, endOffset);  
1309 const startDate = new Date((cdate + startOffset * 86400) * 1000); 1327 const startDate = new Date((cdate + startOffset * 86400) * 1000);
1310 startDate.setHours(0, 0, 0, 0); 1328 startDate.setHours(0, 0, 0, 0);
1311 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD'); 1329 const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD');
@@ -1492,14 +1510,10 @@ Page({ @@ -1492,14 +1510,10 @@ Page({
1492 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : ''; 1510 intel.textInfo = (intel.introduce && (!intel.is_introduce || intel.is_introduce != '0')) ? intel.introduce : '';
1493 } 1511 }
1494 intel.imgsInfo = imgs; 1512 intel.imgsInfo = imgs;
1495 - intel.videoImgsInfo = imgs.map(url => ({  
1496 - type: "1",  
1497 - content: url,  
1498 - }));  
1499 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') { 1513 if (intel.content && intel.content.length > 0 && intel.is_introduce_all == '1') {
1500 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n'); 1514 intel.textInfo = intel.content.filter(item => item.type === "2").map(item => item.content).join('\n');
1501 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content); 1515 intel.imgsInfo = intel.content.filter(item => item.type === "1" && item.content).map(item => item.content);
1502 - intel.videoImgsInfo = intel.content.filter(item => ((item.type === "1" || item.type === "3") && item.content)); 1516 + intel.videosInfo = intel.content.filter(item => (item.type === "3" && item.content));
1503 } 1517 }
1504 return intel 1518 return intel
1505 }, 1519 },
@@ -8,8 +8,7 @@ @@ -8,8 +8,7 @@
8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 8 <image wx:if="{{options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
9 <view class="reservationInfo reservationInfo{{make}}"> 9 <view class="reservationInfo reservationInfo{{make}}">
10 <view wx:if="{{bookType == '2'}}" class="infoTop"> 10 <view wx:if="{{bookType == '2'}}" class="infoTop">
11 - <text class="infoTopText4 font44r" space="nbsp">邀请函</text>  
12 - <text class="infoTopText1" space="nbsp">INVITATION</text> 11 + <image class="infoTopImg" src="https://nosqn.colorcun.com/invitation11Title3.png" mode=""/>
13 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text> 12 <text class="infoTopText2 font44r" space="nbsp">{{seller.name||reserve.seller_name}}</text>
14 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text> 13 <text class="infoTopText3 font28r" space="nbsp" wx:if="{{reserve.swich_slogan == '1' && home.slogan}}">{{home.slogan}}</text>
15 </view> 14 </view>
@@ -29,40 +28,61 @@ @@ -29,40 +28,61 @@
29 </view> 28 </view>
30 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}"> 29 <view class="infoItem" wx:if="{{detail.rnameStr && reserve.swich_customer == '1'}}">
31 <view class="record font28r">预订贵宾:</view> 30 <view class="record font28r">预订贵宾:</view>
32 - <view class="contentData font28r">{{detail.rnameStr}}</view> 31 + <view class="contentData font32r">{{detail.rnameStr}}</view>
33 </view> 32 </view>
34 <view class="infoItem" wx:if="{{seller.date}}"> 33 <view class="infoItem" wx:if="{{seller.date}}">
35 <view class="record font28r">用餐日期:</view> 34 <view class="record font28r">用餐日期:</view>
36 - <view class="contentData font28r">{{seller.date}}</view> 35 + <view class="contentData font32r">{{seller.date}}</view>
37 </view> 36 </view>
38 <view class="infoItem" wx:if="{{seller.tablesText}}"> 37 <view class="infoItem" wx:if="{{seller.tablesText}}">
39 <view class="record font28r">用餐位置:</view> 38 <view class="record font28r">用餐位置:</view>
40 - <view class="contentData font28r">{{seller.tablesText}}</view> 39 + <view class="contentData font32r">{{seller.tablesText}}</view>
41 </view> 40 </view>
42 <view class="infoItem" wx:if="{{seller.soltName}}"> 41 <view class="infoItem" wx:if="{{seller.soltName}}">
43 <view class="record font28r">用餐时间:</view> 42 <view class="record font28r">用餐时间:</view>
44 <view class="arrivalBox"> 43 <view class="arrivalBox">
45 - <view class="contentData font28r">{{seller.soltName}}<text class="marLeft font28r">{{temp_ddate}}</text></view> 44 + <view class="contentData font32r contentFlex">{{seller.soltName}}<text class="marLeft font32r">{{temp_ddate}}</text></view>
46 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}"> 45 <picker wx:if="{{options.isOrder != '1' && (detail.status =='1' || detail.status =='2') && options.hasSellerShare == '1'}}" bindchange="bindPickerChange" value="{{index}}" range="{{timeList}}">
47 <view class="picker"> 46 <view class="picker">
48 - <button>修改到店时间</button> 47 + <image class="arrivalImg" src="https://nosqn.colorcun.com/editDdateTime{{bookType == '1' ? '2' : '3'}}.png" mode=""/>
49 </view> 48 </view>
50 </picker> 49 </picker>
51 </view> 50 </view>
52 </view> 51 </view>
53 <view class="infoItem infoRight" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}"> 52 <view class="infoItem infoRight" wx:if="{{swich_phone!='0' && seller.tel && seller.tel.length>0}}">
54 <view class="record font28r">前台电话:</view> 53 <view class="record font28r">前台电话:</view>
55 - <view class="contentData font28r"> 54 + <view class="contentData font32r">
56 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block> 55 <block wx:for="{{seller.tel}}" wx:key="index"><text data-phone="{{item}}" class="contentDataPhone" bindtap="call">{{item}}</text><text class="divider">{{index==(seller.tel.length-1)?'':','}}</text></block>
57 </view> 56 </view>
58 </view> 57 </view>
59 <view class="infoItem addressInfo"> 58 <view class="infoItem addressInfo">
60 <view class="record font28r">餐厅地址:</view> 59 <view class="record font28r">餐厅地址:</view>
61 <view class="arrivalBox"> 60 <view class="arrivalBox">
62 - <view class="contentData font28r">{{seller.addr || reserve.seller.map_address}}</view> 61 + <view class="contentData font32r">{{seller.addr || reserve.seller.map_address}}</view>
63 <view class="positioning" bindtap="looklocation"> 62 <view class="positioning" bindtap="looklocation">
64 <image class="addressImg" src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" /> 63 <image class="addressImg" src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Dw.png':'https://qn.colorcun.com/invitation12Dw.png'}}" mode="aspectFill" />
65 - 导航到店 64 + 导航
  65 + </view>
  66 + </view>
  67 + </view>
  68 + <text space="nbsp" wx:if="{{marketing.wecomle}}" class="welcomeInfo font32r">{{marketing.wecomle}}</text>
  69 + </view>
  70 + <view class="receptionBox" wx:if="{{bookType == '2' && staffinfo && reserve.swich_manager=='1'}}">
  71 + <view class="peopleInfo">
  72 + <image bindtap="lookImgs" wx:if="{{staffinfo.photo}}" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
  73 + <view class="noHeaderimg" wx:else></view>
  74 + <view class="font28r">{{staffinfo.name}}</view>
  75 + <view class="font28r">{{staffinfo.position}}</view>
  76 + </view>
  77 + <view class="handleInfo">
  78 + <view class="font40r">尊敬的贵宾您好！</view>
  79 + <view class="font26r texts">很荣幸能为您提供专属接待和服务</view>
  80 + <view class="contactBtns">
  81 + <view wx:if="{{staffinfo.phone}}" class="font24r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call">
  82 + <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Phone.png':'https://qn.colorcun.com/invitation10Phone.png'}}" mode="" /><text>联系我</text>
  83 + </view>
  84 + <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">
  85 + <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Wx.png':'https://qn.colorcun.com/invitation10Wx.png'}}" mode="" /><text>加微信</text>
66 </view> 86 </view>
67 </view> 87 </view>
68 </view> 88 </view>
@@ -73,20 +93,21 @@ @@ -73,20 +93,21 @@
73 <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{urlsArr}}"></image> 93 <image mode="aspectFill" class="detailBannerImg" src="{{item}}" bindtap="previewImage" data-url="{{item}}" data-imgs="{{urlsArr}}"></image>
74 </swiper-item> 94 </swiper-item>
75 </swiper> 95 </swiper>
76 - <view class="receptionBox" wx:if="{{staffinfo && reserve.swich_manager=='1'}}"> 96 + <view class="receptionBox" wx:if="{{bookType == '1' && staffinfo && reserve.swich_manager=='1'}}">
77 <view class="peopleInfo"> 97 <view class="peopleInfo">
78 - <image bindtap="lookImgs" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>  
79 - <view class="font26r">{{staffinfo.name}}</view>  
80 - <view class="font26r">{{staffinfo.position}}</view> 98 + <image bindtap="lookImgs" wx:if="{{staffinfo.photo}}" data-url="{{staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
  99 + <view class="noHeaderimg" wx:else></view>
  100 + <view class="font28r">{{staffinfo.name}}</view>
  101 + <view class="font28r">{{staffinfo.position}}</view>
81 </view> 102 </view>
82 <view class="handleInfo"> 103 <view class="handleInfo">
83 <view class="font40r">尊敬的贵宾您好！</view> 104 <view class="font40r">尊敬的贵宾您好！</view>
84 <view class="font26r texts">很荣幸能为您提供专属接待和服务</view> 105 <view class="font26r texts">很荣幸能为您提供专属接待和服务</view>
85 <view class="contactBtns"> 106 <view class="contactBtns">
86 - <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call"> 107 + <view wx:if="{{staffinfo.phone}}" class="font24r brownFont" data-phone="{{staffinfo.phone}}" bindtap="call">
87 <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Phone.png':'https://qn.colorcun.com/invitation10Phone.png'}}" mode="" /><text>联系我</text> 108 <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Phone.png':'https://qn.colorcun.com/invitation10Phone.png'}}" mode="" /><text>联系我</text>
88 </view> 109 </view>
89 - <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="copyWeChat"> 110 + <view wx:if="{{staffinfo.wechat}}" class="font24r brownFont" bindtap="copyWeChat">
90 <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Wx.png':'https://qn.colorcun.com/invitation10Wx.png'}}" mode="" /><text>加微信</text> 111 <image src="{{bookType == '2'?'https://qn.colorcun.com/invitation11Wx.png':'https://qn.colorcun.com/invitation10Wx.png'}}" mode="" /><text>加微信</text>
91 </view> 112 </view>
92 </view> 113 </view>
@@ -109,19 +130,19 @@ @@ -109,19 +130,19 @@
109 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon4.png" mode="" /> 130 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon4.png" mode="" />
110 <view class="font24r">提前点餐</view> 131 <view class="font24r">提前点餐</view>
111 </view> 132 </view>
112 - <view bindtap="publicShowModal" data-type="5" data-title="餐厅介绍" wx:if="{{store && (store.textInfo || store.videoImgsInfo.length>0)}}" class="entranceItem"> 133 + <view bindtap="publicShowModal" data-type="5" data-title="餐厅介绍" wx:if="{{store && (store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0)}}" class="entranceItem">
113 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon5.png" mode="" /> 134 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon5.png" mode="" />
114 <view class="font24r">餐厅介绍</view> 135 <view class="font24r">餐厅介绍</view>
115 </view> 136 </view>
116 - <view bindtap="publicShowModal" data-type="6" data-title="招牌菜品" wx:if="{{(signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}" class="entranceItem"> 137 + <view bindtap="publicShowModal" data-type="6" data-title="招牌菜品" wx:if="{{(signboard && (signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0) || (hasValueOrder && openOrder == '1' && marketing.is_order=='1'))}}" class="entranceItem">
117 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon6.png" mode="" /> 138 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon6.png" mode="" />
118 <view class="font24r">招牌菜品</view> 139 <view class="font24r">招牌菜品</view>
119 </view> 140 </view>
120 - <view bindtap="publicShowModal" data-type="7" data-title="停车指引" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}" class="entranceItem"> 141 + <view bindtap="publicShowModal" data-type="7" data-title="停车指引" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}" class="entranceItem">
121 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon7.png" mode="" /> 142 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon7.png" mode="" />
122 <view class="font24r">停车指引</view> 143 <view class="font24r">停车指引</view>
123 </view> 144 </view>
124 - <view bindtap="publicShowModal" data-type="8" data-title="主厨介绍" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}" class="entranceItem"> 145 + <view bindtap="publicShowModal" data-type="8" data-title="主厨介绍" wx:if="{{chef && (chef.textInfo || chef.imgsInfo.length>0 || chef.videosInfo.length>0)}}" class="entranceItem">
125 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon8.png" mode="" /> 146 <image src="https://qn.colorcun.com/invitation1{{bookType == '1'?'3':'4'}}Icon8.png" mode="" />
126 <view class="font24r">主厨介绍</view> 147 <view class="font24r">主厨介绍</view>
127 </view> 148 </view>
@@ -153,155 +174,131 @@ @@ -153,155 +174,131 @@
153 <image bindtap="closepublicModal" src="https://qn.colorcun.com/invitation13Icons.png" mode="" /> 174 <image bindtap="closepublicModal" src="https://qn.colorcun.com/invitation13Icons.png" mode="" />
154 </view> 175 </view>
155 <block wx:if="{{modalType == '1'}}"> 176 <block wx:if="{{modalType == '1'}}">
156 - <view class="regionItem couponBoxWrap" slot="modalContent"> 177 + <view class="regionItem preferentialCoupon" slot="modalContent">
157 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 178 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
158 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 179 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
159 <view class="preferentialItems"> 180 <view class="preferentialItems">
160 - <view class="purchase"> 181 + <view class="itemLeft">
  182 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font20r">{{item.discount}}折</text>
  183 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
161 <view class="priceText" wx:if="{{item.price}}"> 184 <view class="priceText" wx:if="{{item.price}}">
162 - <view class="icons">￥<text class="priceText">{{item.price}}</text></view> 185 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
163 </view> 186 </view>
164 - <image class="certificateImg" src="{{(item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
165 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountInfo">{{item.discount}}折</text>  
166 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view> 187 <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
167 </view> 188 </view>
168 - <view class="certificateInfo">  
169 - <view class="preferentialDetails">  
170 - <view class="information">  
171 - <text class="discountText font20r">{{item.use.is_cash=='1'?'代金券':item.use.is_discount=='1'?'超值折扣':item.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
172 - <text class="ticketName font24r">{{item.aname}}</text>  
173 - </view>  
174 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="limitation font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}</text>  
175 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="limitation font24r">  
176 - 无限制  
177 - </view>  
178 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="limitation font24r">  
179 - 会员生日当天可用  
180 - </view>  
181 - <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">  
182 - <text class="font24r">消费要求</text>  
183 - </view>  
184 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="limitation showDesc font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
185 - <view wx:if="{{item.useStime && item.useEtime}}" class="font24r nodate showDesc">{{item.useStime}} 至 {{item.useEtime}}</view>  
186 - <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">  
187 - <text class="font24r">不可用日期</text>  
188 - </view>  
189 - </view>  
190 - <view class="limitationBtn" wx:if="{{item.is_type != '3'}}">  
191 - <view class="font24r couponBtn">立即抢购</view> 189 + <view class="couponLine"></view>
  190 + <view class="itemRight">
  191 + <view class="btns">
  192 + <text class="font32r anameText">{{item.aname}}</text>
  193 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  194 + <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>
  195 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  196 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  197 + </view>
  198 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  199 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  200 + </view>
  201 + </block>
  202 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  203 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  204 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  205 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  206 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  207 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  208 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  209 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  210 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  211 + </block>
192 </view> 212 </view>
193 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 213 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
194 - <view class="font24r orderingFood">已领取</view> 214 + <view class="font24r orderingFood orderingFood1">已领取</view>
195 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 215 <view class="grantNum" wx:if="{{item.receiveNumText}}">
196 <view class="font24r">已被领取</view> 216 <view class="font24r">已被领取</view>
197 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 217 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
198 </view> 218 </view>
199 </view> 219 </view>
  220 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">
  221 + 抢购
  222 + </view>
200 </view> 223 </view>
201 </view> 224 </view>
202 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
203 - <text></text>  
204 - <view>消费满{{item.desc}}元可用</view>  
205 - </view>  
206 - <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
207 - <text></text>{{item.morText}}  
208 - </view>  
209 - <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">  
210 - <text></text>{{item.noonText}}  
211 - </view>  
212 - <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">  
213 - <text></text>{{item.nigText}}  
214 - </view>  
215 </navigator> 225 </navigator>
216 </block> 226 </block>
217 </view> 227 </view>
218 </block> 228 </block>
219 <block wx:if="{{modalType == '2'}}"> 229 <block wx:if="{{modalType == '2'}}">
220 - <view class="publicModule preferentialCoupon" slot="modalContent">  
221 - <navigator wx:if="{{hasValueRecharge && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}" url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">  
222 - <view class="rechargeItems">  
223 - <image class="checkImg" src="https://qn.colorcun.com/{{bookType == '1' ?'invitation10vector1':'invitation10vector'}}.png" mode="" />  
224 - <view class="rechargeTitle font36r">{{recharge_data.rname}}</view>  
225 - <view class="limitation font24r" wx:if="{{priceInfo}}">  
226 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}} 230 + <view class="publicModule preferentialCouponBox" slot="modalContent">
  231 + <block wx:for="{{recharge_data}}" wx:key="index">
  232 + <view class="rechargeItems {{item.id == activeData.id ? 'rechargeActive' : ''}}" bindtap="checkRechargeData" data-id="{{item.id}}">
  233 + <image class="checkImg" wx:if="{{item.id == activeData.id}}" src="https://qn.colorcun.com/invitation10vector{{bookType == '1' ? '1' : ''}}.png" mode="" />
  234 + <view class="rechargeTitle font36r">{{item.rname}}</view>
  235 + <view class="limitation font24r" wx:if="{{item.priceInfo}}">
  236 + {{item.priceInfo}}{{(item.recharge_list.is_coupons=='0' && item.recharge_list.is_score=='0')?'。':';'}}
227 </view> 237 </view>
228 - <view class="limitation font24r" wx:if="{{scoreInfo}}">  
229 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}} 238 + <view class="limitation font24r" wx:if="{{item.scoreInfo}}">
  239 + {{item.scoreInfo}}{{item.recharge_list.is_coupons=='0'?'。':';'}}
230 </view> 240 </view>
231 - <view class="limitation font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
232 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。 241 + <view class="limitation font24r" wx:if="{{item.recharge_list.is_coupons=='1'}}">
  242 + {{item.recharge_list.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
233 </view> 243 </view>
234 </view> 244 </view>
235 - <view class="rechargeBtn">  
236 - <view class="font28r">立即充值</view>  
237 - </view>  
238 - </navigator> 245 + </block>
  246 + <view class="rechargeBtn">
  247 + <navigator wx:if="{{activeData.id}}" url="/pack-activity/pack/vipRecharge?id={{activeData.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
  248 + 立即充值
  249 + </navigator>
  250 + </view>
239 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList"> 251 <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
240 点击了解更多会员优惠政策 252 点击了解更多会员优惠政策
241 </view> 253 </view>
242 </view> 254 </view>
243 </block> 255 </block>
244 <block wx:if="{{modalType == '3'}}"> 256 <block wx:if="{{modalType == '3'}}">
245 - <view class="publicModule couponBoxWrap" slot="modalContent" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}"> 257 + <view class="publicModule preferentialCoupon" slot="modalContent" wx:if="{{!is_user_comments && isComments =='1' && couponData.showCoupon =='1'}}">
246 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view> 258 <view class="font28r evaluateTitleText">期待您的声音，帮助我们持续改进</view>
247 - <view class="couponInfo" bindtap="evaluateFun">  
248 - <view class="preferentialItems">  
249 - <view class="purchase">  
250 - <view class="priceText" wx:if="{{couponData.price}}">  
251 - <view class="icons">￥<text class="priceText">{{couponData.price}}</text></view>  
252 - </view>  
253 - <image class="certificateImg" src="{{(couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount)?'https://qn.colorcun.com/invitation10certificate1.png':'https://qn.colorcun.com/invitation10certificate.png'}}" mode="" />  
254 - <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountInfo">{{couponData.discount}}折</text>  
255 - </view>  
256 - <view class="certificateInfo">  
257 - <view class="preferentialDetails">  
258 - <view class="information">  
259 - <text class="discountText font20r">{{couponData.use.is_cash=='1'?'代金券':couponData.use.is_discount=='1'?'超值折扣':couponData.use.is_dish=='1'?'特惠菜品':'代金券'}}</text>  
260 - <text class="ticketName font24r">{{couponData.aname}}</text>  
261 - </view>  
262 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="limitation font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}</text>  
263 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="limitation font24r">  
264 - 无限制  
265 - </view>  
266 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="limitation font24r">  
267 - 会员生日当天可用  
268 - </view>  
269 - <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">  
270 - <text class="font24r">消费要求</text>  
271 - </view>  
272 - <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="limitation showDesc font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>  
273 - <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="font24r nodate showDesc">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>  
274 - <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">  
275 - <text class="font24r">不可用日期</text>  
276 - </view> 259 + <view class="preferentialItems" bindtap="evaluateFun">
  260 + <view class="itemLeft">
  261 + <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
  262 + <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  263 + <view class="priceText" wx:if="{{couponData.price}}">
  264 + <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text>
  265 + </view>
  266 + <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>
  267 + </view>
  268 + <view class="couponLine"></view>
  269 + <view class="itemRight">
  270 + <view class="btns">
  271 + <text class="font32r anameText">{{couponData.aname}}</text>
  272 + <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">
  273 + <view 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+'。':'。'}}</view>
  274 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  275 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
277 </view> 276 </view>
278 - <view class="limitationBtn" wx:if="{{couponData.is_type != '3'}}">  
279 - <view class="font24r couponBtn">立即抢购</view> 277 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  278 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
280 </view> 279 </view>
281 - <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >  
282 - <view class="font24r orderingFood">{{couponData.resultCoupon == '1'?'已领取':'立即领取'}}</view>  
283 - <view class="grantNum" wx:if="{{couponData.receiveNumText}}">  
284 - <view class="font24r">已被领取</view>  
285 - <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>  
286 - </view>  
287 - </view>  
288 - </view>  
289 - </view>  
290 - <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
291 - <text></text>  
292 - <view>消费满{{couponData.desc}}元可用</view>  
293 - </view>  
294 - <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">  
295 - <text></text>{{couponData.morText}}  
296 - </view>  
297 - <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">  
298 - <text></text>{{couponData.noonText}} 280 + </block>
  281 + <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">
  282 + <view wx:if="{{(couponData.useStime && couponData.useEtime) ||couponDataitem.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>
  283 + <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>
  284 + <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>
  285 + <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>
  286 + <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>
  287 + <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>
  288 + <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  289 + <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>
  290 + </block>
299 </view> 291 </view>
300 - <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">  
301 - <text></text>{{couponData.nigText}} 292 + <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >
  293 + <view class="font24r orderingFood orderingFood2">免费领取</view>
  294 + <view class="grantNum" wx:if="{{couponData.receiveNumText}}">
  295 + <view class="font24r">已被领取</view>
  296 + <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view>
  297 + </view>
302 </view> 298 </view>
303 </view> 299 </view>
304 </view> 300 </view>
  301 + </view>
305 <!-- 评价没有券 --> 302 <!-- 评价没有券 -->
306 <view class="publicModule evaluateCoupon" slot="modalContent" wx:if="{{is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}"> 303 <view class="publicModule evaluateCoupon" slot="modalContent" wx:if="{{is_comments=='1' && (marketing.is_comments_coupon!='1' || couponData.showCoupon!='1')}}">
307 <view class="preferentialItems" bindtap="evaluateFun"> 304 <view class="preferentialItems" bindtap="evaluateFun">
@@ -315,66 +312,40 @@ @@ -315,66 +312,40 @@
315 </view> 312 </view>
316 </block> 313 </block>
317 <block wx:if="{{modalType == '5'}}"> 314 <block wx:if="{{modalType == '5'}}">
318 - <view class="publicModule" slot="modalContent" wx:if="{{store.textInfo || store.videoImgsInfo.length>0}}">  
319 - <block wx:if="{{bookType == '1'}}">  
320 - <view class="labelBox" wx:if="{{!store.content && store.introduce && store.is_introduce == '1'}}">  
321 - <text space="nbsp" class="texts font28r">{{store.introduce}}</text>  
322 - </view>  
323 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
324 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
325 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />  
326 - </block> 315 + <view class="publicModule" slot="modalContent" wx:if="{{store.textInfo || store.imgsInfo.length>0 || store.videosInfo.length>0}}">
  316 + <view class="labelBox" wx:if="{{!store.content && store.introduce && store.is_introduce == '1'}}">
  317 + <text space="nbsp" class="texts font28r">{{store.introduce}}</text>
  318 + </view>
  319 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  320 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  321 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
327 </block> 322 </block>
328 - <view class="labelBox" wx:if="{{store.content && store.content.length>0}}">  
329 - <block wx:for="{{store.content}}">  
330 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
331 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>  
332 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
333 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
334 - </view>  
335 - </block>  
336 - </view>  
337 - </block>  
338 - <block wx:if="{{bookType == '2'}}">  
339 - <view class="labelBox" wx:if="{{store.textInfo}}">  
340 - <text class="texts font28r" space="nbsp">{{store.textInfo}}</text>  
341 - </view>  
342 - <swiper wx:if="{{store.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
343 - <swiper-item wx:for="{{store.videoImgsInfo}}" wx:key="index">  
344 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
345 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image>  
346 - </swiper-item>  
347 - </swiper>  
348 </block> 323 </block>
  324 + <view class="labelBox" wx:if="{{store.content && store.content.length>0}}">
  325 + <block wx:for="{{store.content}}">
  326 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  327 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>
  328 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  329 + <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>
  330 + </view>
  331 + </block>
  332 + </view>
349 </view> 333 </view>
350 </block> 334 </block>
351 <block wx:if="{{modalType == '6'}}"> 335 <block wx:if="{{modalType == '6'}}">
352 - <view class="publicModule" slot="modalContent" wx:if="{{signboard && (signboard.textInfo || signboard.videoImgsInfo.length>0)}}">  
353 - <block wx:if="{{bookType == '1'}}">  
354 - <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
355 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />  
356 - </block>  
357 - <view class="labelBox" wx:if="{{signboard.content && signboard.content.length>0}}">  
358 - <block wx:for="{{signboard.content}}">  
359 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
360 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>  
361 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
362 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
363 - </view>  
364 - </block>  
365 - </view>  
366 - </block>  
367 - <block wx:if="{{bookType == '2'}}">  
368 - <view class="labelBox" wx:if="{{signboard.textInfo}}">  
369 - <text class="texts font28r" space="nbsp">{{signboard.textInfo}}</text>  
370 - </view>  
371 - <swiper wx:if="{{signboard.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
372 - <swiper-item wx:for="{{signboard.videoImgsInfo}}" wx:key="index">  
373 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
374 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{signboard.imgsInfo}}"></image>  
375 - </swiper-item>  
376 - </swiper> 336 + <view class="publicModule" slot="modalContent" wx:if="{{signboard && (signboard.textInfo || signboard.imgsInfo.length>0 || signboard.videosInfo.length>0)}}">
  337 + <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  338 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
377 </block> 339 </block>
  340 + <view class="labelBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  341 + <block wx:for="{{signboard.content}}">
  342 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  343 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>
  344 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  345 + <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>
  346 + </view>
  347 + </block>
  348 + </view>
378 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}"> 349 <view class="orderBox" wx:if="{{hasValueOrder && openOrder == '1' && marketing.is_order=='1'}}">
379 <view class="font32r">提前点餐 到店不用等</view> 350 <view class="font32r">提前点餐 到店不用等</view>
380 <view wx:if="{{openOrder == '1' && marketing.is_order == '1'}}" bindtap="cookbook" class="font28r cook" style="position: relative;"> 351 <view wx:if="{{openOrder == '1' && marketing.is_order == '1'}}" bindtap="cookbook" class="font28r cook" style="position: relative;">
@@ -384,65 +355,39 @@ @@ -384,65 +355,39 @@
384 </view> 355 </view>
385 </block> 356 </block>
386 <block wx:if="{{modalType == '7'}}"> 357 <block wx:if="{{modalType == '7'}}">
387 - <view class="publicModule" slot="modalContent" wx:if="{{reserve && (reserve.textInfo || reserve.videoImgsInfo.length>0)}}">  
388 - <block wx:if="{{bookType == '1'}}">  
389 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
390 - <text class="texts" space="nbsp">{{reserve.park_info}}</text>  
391 - </view>  
392 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
393 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />  
394 - </block>  
395 - <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}">  
396 - <block wx:for="{{reserve.content}}">  
397 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
398 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>  
399 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
400 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
401 - </view>  
402 - </block>  
403 - </view>  
404 - </block>  
405 - <block wx:if="{{bookType == '2'}}">  
406 - <view class="labelBox" wx:if="{{reserve.textInfo}}">  
407 - <text class="texts font28r" space="nbsp">{{reserve.textInfo}}</text>  
408 - </view>  
409 - <swiper wx:if="{{reserve.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
410 - <swiper-item wx:for="{{reserve.videoImgsInfo}}" wx:key="index">  
411 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
412 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{store.imgsInfo}}"></image>  
413 - </swiper-item>  
414 - </swiper> 358 + <view class="publicModule" slot="modalContent" wx:if="{{reserve && (reserve.textInfo || reserve.imgsInfo.length>0 || reserve.videosInfo.length>0)}}">
  359 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  360 + <text class="texts font28r" space="nbsp">{{reserve.park_info}}</text>
  361 + </view>
  362 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  363 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" mode="widthFix" />
415 </block> 364 </block>
  365 + <view class="labelBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  366 + <block wx:for="{{reserve.content}}">
  367 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  368 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>
  369 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  370 + <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>
  371 + </view>
  372 + </block>
  373 + </view>
416 </view> 374 </view>
417 </block> 375 </block>
418 <block wx:if="{{modalType == '8'}}"> 376 <block wx:if="{{modalType == '8'}}">
419 - <view class="publicModule" slot="modalContent" wx:if="{{chef && (chef.textInfo || chef.videoImgsInfo.length>0)}}">  
420 - <block wx:if="{{bookType == '1'}}">  
421 - <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">  
422 - <text class="texts" space="nbsp">{{chef.introduce}}</text>  
423 - </view>  
424 - <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
425 - <view class="labelBox" wx:if="{{chef.content && chef.content.length>0}}">  
426 - <block wx:for="{{chef.content}}">  
427 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
428 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>  
429 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
430 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
431 - </view>  
432 - </block>  
433 - </view>  
434 - </block>  
435 - <block wx:if="{{bookType == '2'}}">  
436 - <view class="labelBox" wx:if="{{chef.textInfo}}">  
437 - <text class="texts font28r" space="nbsp">{{chef.textInfo}}</text>  
438 - </view>  
439 - <swiper wx:if="{{chef.videoImgsInfo.length>0}}" class="detailBanner" indicator-dots="{{true}}" autoplay="{{true}}" interval="{{2000}}" circular="{{true}}" indicator-color="lightgray" indicator-active-color="#fff">  
440 - <swiper-item wx:for="{{chef.videoImgsInfo}}" wx:key="index">  
441 - <video wx:if="{{item.type=='3'}}" class='boxBlock' id="video" src="{{item.content}}" show-center-play-btn="{{true}}" autoplay='{{false}}' object-fit="cover" controls="{{true}}"></video>  
442 - <image wx:if="{{item.type=='1'}}" mode="" class="detailBannerImg" src="{{item.content}}" bindtap="previewImage" data-url="{{item.content}}" data-imgs="{{chef.imgsInfo}}"></image>  
443 - </swiper-item>  
444 - </swiper>  
445 - </block> 377 + <view class="publicModule" slot="modalContent" wx:if="{{chef && (chef.textInfo || chef.imgsInfo.length>0 || chef.videosInfo.length>0)}}">
  378 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  379 + <text class="texts font28r" space="nbsp">{{chef.introduce}}</text>
  380 + </view>
  381 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  382 + <view class="labelBox" wx:if="{{chef.content && chef.content.length>0}}">
  383 + <block wx:for="{{chef.content}}">
  384 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  385 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font28r">{{item.content}}</text>
  386 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  387 + <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>
  388 + </view>
  389 + </block>
  390 + </view>
446 </view> 391 </view>
447 </block> 392 </block>
448 </my-modal> 393 </my-modal>
@@ -33,9 +33,13 @@ @@ -33,9 +33,13 @@
33 align-items: center; 33 align-items: center;
34 } 34 }
35 35
  36 +.infoTop .infoTopText2 {
  37 + font-weight: 600;
  38 +}
  39 +
36 .infoTop .infoTopText3 { 40 .infoTop .infoTopText3 {
37 - margin-top: 14rpx;  
38 - margin: 16rpx 0 32rpx 0; 41 + font-weight: 500;
  42 + margin-top: 16rpx;
39 } 43 }
40 44
41 .infoTopBj2 { 45 .infoTopBj2 {
@@ -63,7 +67,7 @@ @@ -63,7 +67,7 @@
63 } 67 }
64 68
65 .infoItem .record { 69 .infoItem .record {
66 - font-weight: 400; 70 + font-weight: 600;
67 flex-shrink: 0; 71 flex-shrink: 0;
68 font-family: PingFang SC; 72 font-family: PingFang SC;
69 color: #000; 73 color: #000;
@@ -73,7 +77,7 @@ @@ -73,7 +77,7 @@
73 display: block; 77 display: block;
74 font-size: 24rpx; 78 font-size: 24rpx;
75 height: 50rpx; 79 height: 50rpx;
76 - padding: 0 34rpx; 80 + padding: 0 20rpx;
77 line-height: 48rpx; 81 line-height: 48rpx;
78 font-family: PingFang SC; 82 font-family: PingFang SC;
79 border-radius: 40rpx; 83 border-radius: 40rpx;
@@ -87,6 +91,14 @@ @@ -87,6 +91,14 @@
87 height: 16rpx; 91 height: 16rpx;
88 } 92 }
89 93
  94 +.welcomeInfo {
  95 + text-align: center;
  96 + color: #D2541C;
  97 + margin-top: 24rpx;
  98 + display: block;
  99 + font-weight: 600;
  100 +}
  101 +
90 .contentData { 102 .contentData {
91 flex: 1; 103 flex: 1;
92 line-height: 60rpx; 104 line-height: 60rpx;
@@ -94,6 +106,21 @@ @@ -94,6 +106,21 @@
94 margin-left: 24rpx; 106 margin-left: 24rpx;
95 font-weight: 600; 107 font-weight: 600;
96 color: #D2541C; 108 color: #D2541C;
  109 + display: -webkit-box;
  110 + word-break: break-all;
  111 + word-wrap: break-word;
  112 + overflow: hidden;
  113 + text-align: left;
  114 +}
  115 +
  116 +.contentFlex {
  117 + flex: inherit;
  118 +}
  119 +
  120 +.picker {
  121 + display: flex;
  122 + align-items: center;
  123 + justify-content: center;
97 } 124 }
98 125
99 .contentDataPhone { 126 .contentDataPhone {
@@ -103,12 +130,12 @@ @@ -103,12 +130,12 @@
103 130
104 .divider { 131 .divider {
105 color: #D2541C; 132 color: #D2541C;
106 - margin: 0 10rpx; 133 + margin: 0 4rpx;
107 } 134 }
108 135
109 .bookData { 136 .bookData {
110 margin-left: 0; 137 margin-left: 0;
111 - font-weight: 400; 138 + font-weight: 600;
112 } 139 }
113 140
114 .marLeft { 141 .marLeft {
@@ -116,7 +143,6 @@ @@ -116,7 +143,6 @@
116 } 143 }
117 144
118 .receptionBox { 145 .receptionBox {
119 - margin: 0 20rpx;  
120 display: flex; 146 display: flex;
121 align-items: center; 147 align-items: center;
122 border-radius: 10rpx; 148 border-radius: 10rpx;
@@ -124,6 +150,7 @@ @@ -124,6 +150,7 @@
124 box-shadow: 0rpx 4rpx 8rpx #00000040; 150 box-shadow: 0rpx 4rpx 8rpx #00000040;
125 color: #000; 151 color: #000;
126 padding: 56rpx 58rpx 60rpx 72rpx; 152 padding: 56rpx 58rpx 60rpx 72rpx;
  153 + margin-top: 24rpx;
127 } 154 }
128 155
129 .headerimg { 156 .headerimg {
@@ -132,6 +159,13 @@ @@ -132,6 +159,13 @@
132 border-radius: 50%; 159 border-radius: 50%;
133 } 160 }
134 161
  162 +.noHeaderimg {
  163 + width: 108rpx;
  164 + height: 108rpx;
  165 + background: #BFBFBF;
  166 + border-radius: 50%;
  167 +}
  168 +
135 .peopleInfo { 169 .peopleInfo {
136 display: flex; 170 display: flex;
137 flex-direction: column; 171 flex-direction: column;
@@ -144,7 +178,7 @@ @@ -144,7 +178,7 @@
144 178
145 .peopleInfo view { 179 .peopleInfo view {
146 font-family: "PingFang SC"; 180 font-family: "PingFang SC";
147 - font-weight: 400; 181 + font-weight: 600;
148 } 182 }
149 183
150 .handleInfo { 184 .handleInfo {
@@ -165,7 +199,8 @@ @@ -165,7 +199,8 @@
165 .handleInfo .texts { 199 .handleInfo .texts {
166 margin: 22rpx 0; 200 margin: 22rpx 0;
167 letter-spacing: 3rpx; 201 letter-spacing: 3rpx;
168 - line-height: 36rpx 202 + line-height: 36rpx;
  203 + font-weight: 500;
169 } 204 }
170 205
171 .contactBtns { 206 .contactBtns {
@@ -183,6 +218,7 @@ @@ -183,6 +218,7 @@
183 align-items: center; 218 align-items: center;
184 justify-content: center; 219 justify-content: center;
185 box-shadow: 0rpx 4rpx 8rpx #00000040; 220 box-shadow: 0rpx 4rpx 8rpx #00000040;
  221 + font-weight: 600 !important;
186 } 222 }
187 223
188 .brownFont image { 224 .brownFont image {
@@ -244,10 +280,11 @@ @@ -244,10 +280,11 @@
244 } 280 }
245 281
246 .titleItem { 282 .titleItem {
247 - font-weight: 400; 283 + font-weight: 600;
248 background: #FFEFD6; 284 background: #FFEFD6;
249 color: #000; 285 color: #000;
250 padding: 10rpx 16rpx; 286 padding: 10rpx 16rpx;
  287 + border-radius: 6rpx;
251 } 288 }
252 289
253 .activeTitleItem::after { 290 .activeTitleItem::after {
@@ -299,37 +336,32 @@ @@ -299,37 +336,32 @@
299 336
300 .chefTextInfo { 337 .chefTextInfo {
301 font-family: PingFang SC; 338 font-family: PingFang SC;
302 - font-weight: 400; 339 + font-weight: 600;
303 letter-spacing: 8rpx; 340 letter-spacing: 8rpx;
304 color: #AE2D2D; 341 color: #AE2D2D;
305 } 342 }
306 343
307 -.preferentialCoupon {  
308 - padding: 0;  
309 -}  
310 -  
311 -.preferentialCoupon navigator { 344 +.rechargeBox {
  345 + display: flex;
  346 + align-items: center;
  347 + flex-wrap: wrap;
312 width: 100%; 348 width: 100%;
  349 + justify-content: space-between;
313 } 350 }
314 351
315 -.preferentialCoupon .nodate{  
316 - padding-left: 20rpx;  
317 -}  
318 -  
319 -.preferentialCoupon .limitation {  
320 - color: #000;  
321 -}  
322 -  
323 -.regionItem {  
324 - width: 100%;  
325 - padding: 0;  
326 - box-sizing: border-box; 352 +.rechargeBtn navigator {
  353 + width: 84%;
  354 + padding: 12rpx 0;
  355 + background: #D2541C;
  356 + border-radius: 42rpx;
  357 + color: #fff;
  358 + text-align: center;
  359 + font-size: 32rpx;
  360 + font-weight: 600;
327 } 361 }
328 362
329 -.preferentialItems {  
330 - width: 100%;  
331 - display: flex;  
332 - min-height: 160rpx; 363 +.bottomLimitationTop{
  364 + margin-top: 20rpx !important;
333 } 365 }
334 366
335 .evaluateTitleText { 367 .evaluateTitleText {
@@ -339,117 +371,6 @@ @@ -339,117 +371,6 @@
339 text-align: center; 371 text-align: center;
340 } 372 }
341 373
342 -.purchase {  
343 - position: relative;  
344 - width: 30%;  
345 - display: flex;  
346 - flex-direction: column;  
347 - justify-content: center;  
348 - align-items: center;  
349 - background: #D2541C;  
350 - border-radius: 10rpx;  
351 -}  
352 -  
353 -.discountText {  
354 - text-align: center;  
355 - color: #FFEFC5;  
356 - border-radius: 6rpx;  
357 - font-family: PingFang SC;  
358 - background: #FD4D59;  
359 - width: max-content;  
360 - padding: 6rpx;  
361 - margin-right: 8rpx;  
362 -}  
363 -  
364 -.priceText {  
365 - font-family: PingFang SC;  
366 - color: #fff;  
367 - font-weight: 500;  
368 - margin-top: 6rpx;  
369 - display: flex;  
370 - align-items: center;  
371 - justify-content: center;  
372 - font-size: 52rpx;  
373 - flex-direction: column;  
374 -}  
375 -  
376 -.icons {  
377 - font-family: PingFang SC;  
378 - color: #fff;  
379 - font-size: 20rpx;  
380 - display: flex;  
381 - align-items: baseline;  
382 -}  
383 -  
384 -.certificateInfo {  
385 - width: 70%;  
386 - padding: 20rpx;  
387 - position: relative;  
388 - border-radius: 10rpx;  
389 - display: flex;  
390 - background: #fff;  
391 - align-items: center;  
392 -}  
393 -  
394 -.certificateInfo .limitation {  
395 - line-height: 40rpx;  
396 -}  
397 -  
398 -.ticketName {  
399 - display: flex;  
400 - justify-content: space-between;  
401 - align-items: baseline;  
402 - font-weight: 700;  
403 - overflow: hidden;  
404 - word-break: break-all;  
405 - text-overflow: ellipsis;  
406 - display: -webkit-box;  
407 - -webkit-box-orient: vertical;  
408 - -webkit-line-clamp: 1;  
409 - color: #000;  
410 -}  
411 -  
412 -.orderingFood {  
413 - padding: 0 20rpx;  
414 - border-radius: 22rpx;  
415 - text-align: center;  
416 - border-radius: 20rpx;  
417 - line-height: 44rpx;  
418 - height: 44rpx;  
419 - width: max-content;  
420 - margin-top: 24rpx;  
421 - flex-shrink: 0;  
422 - border: 2rpx solid #D2541C;  
423 - background: transparent;  
424 - color: #D2541C;  
425 -}  
426 -  
427 -.grantNum {  
428 - display: flex;  
429 - flex-direction: column;  
430 - align-items: center;  
431 - color: #999;  
432 - margin-top: 10rpx;  
433 -}  
434 -  
435 -.grantNum text {  
436 - color: #D2541C;  
437 - margin-right: 10rpx;  
438 -}  
439 -  
440 -.limitation {  
441 - margin-top: 10rpx;  
442 - color: #666;  
443 - font-family: PingFang SC;  
444 - font-weight: 500;  
445 - display: -webkit-box;  
446 - word-break: break-all;  
447 - word-wrap: break-word;  
448 - overflow: hidden;  
449 - text-align: left;  
450 - line-height: 30rpx;  
451 -}  
452 -  
453 .regionItem .limitation { 374 .regionItem .limitation {
454 display: flex; 375 display: flex;
455 flex-direction: column; 376 flex-direction: column;
@@ -460,7 +381,11 @@ @@ -460,7 +381,11 @@
460 line-height: 28rpx; 381 line-height: 28rpx;
461 color: #000; 382 color: #000;
462 line-height: 40rpx; 383 line-height: 40rpx;
463 - margin: 40rpx 0 20rpx 0; 384 + margin: 40rpx 0 10rpx 0;
  385 +}
  386 +
  387 +.limitationTitle1 {
  388 + margin-top: 20rpx;
464 } 389 }
465 390
466 .certificateBox .limitationTitle { 391 .certificateBox .limitationTitle {
@@ -477,7 +402,14 @@ @@ -477,7 +402,14 @@
477 padding: 20rpx 40rpx; 402 padding: 20rpx 40rpx;
478 flex-direction: column; 403 flex-direction: column;
479 justify-content: center; 404 justify-content: center;
480 - background: #fff1e6; 405 + background: #fff;
  406 + width: 100%;
  407 + box-sizing: border-box;
  408 + margin-bottom: 24rpx;
  409 +}
  410 +
  411 +.rechargeActive {
  412 + background: #FFF1E6;
481 } 413 }
482 414
483 .checkImg { 415 .checkImg {
@@ -489,7 +421,7 @@ @@ -489,7 +421,7 @@
489 } 421 }
490 422
491 .rechargeTitle { 423 .rechargeTitle {
492 - font-family: PingFang SC; 424 + font-family: "Noto Sans";
493 font-weight: 700; 425 font-weight: 700;
494 letter-spacing: 4rpx; 426 letter-spacing: 4rpx;
495 } 427 }
@@ -514,6 +446,7 @@ @@ -514,6 +446,7 @@
514 text-align: center; 446 text-align: center;
515 text-decoration-line: underline; 447 text-decoration-line: underline;
516 padding: 10rpx; 448 padding: 10rpx;
  449 + font-weight: 600;
517 } 450 }
518 451
519 .rechargeBtn { 452 .rechargeBtn {
@@ -521,6 +454,7 @@ @@ -521,6 +454,7 @@
521 align-items: center; 454 align-items: center;
522 justify-content: center; 455 justify-content: center;
523 margin: 24rpx 0; 456 margin: 24rpx 0;
  457 + width: 100%;
524 } 458 }
525 459
526 .rechargeBtn view { 460 .rechargeBtn view {
@@ -532,121 +466,188 @@ @@ -532,121 +466,188 @@
532 text-align: center; 466 text-align: center;
533 } 467 }
534 468
  469 +.preferentialCoupon {
  470 + padding-bottom: 20rpx;
  471 + border-radius: 0 0 10rpx 10rpx;
  472 +}
535 473
536 -.couponBoxWrap navigator,  
537 -.couponBoxWrap .couponInfo { 474 +.preferentialCoupon .nodate{
  475 + padding-left: 20rpx;
  476 +}
  477 +
  478 +.preferentialItems {
  479 + display: flex;
  480 + background: #FFEFD6;
  481 + margin-bottom: 20rpx;
  482 + min-height: 180rpx;
  483 + padding-bottom: 10rpx;
  484 + border-radius: 20rpx;
538 width: 100%; 485 width: 100%;
539 - margin-bottom: 20rpx;  
540 - border-radius: 10rpx;  
541 - background: #FFF1E6;  
542 } 486 }
543 487
544 -.bottomLimitationTop{  
545 - margin-top: 20rpx !important; 488 +.itemLeft {
  489 + width: 30%;
  490 + display: flex;
  491 + flex-direction: column;
  492 + justify-content: center;
  493 + position: relative;
546 } 494 }
547 495
548 -.couponBoxWrap .preferentialItems {  
549 - box-shadow: 0rpx 4rpx 8rpx #0000000d; 496 +.discountText1 {
  497 + text-align: center;
  498 + border-radius: 6rpx;
  499 + font-family: PingFang SC;
  500 + background: transparent;
  501 + width: max-content;
  502 + padding: 2rpx 8rpx;
  503 + position: absolute;
  504 + left: 16rpx;
  505 + top: 12rpx;
550 } 506 }
551 507
552 -.couponBoxWrap .showDesc {  
553 - color: #666; 508 +.discountText2 {
  509 + background: #FD4D59;
  510 + color: #fff;
554 } 511 }
555 512
556 -.bottomLimitation {  
557 - padding: 0 20rpx;  
558 - display: flex;  
559 - flex-direction: row !important;  
560 - align-items: center;  
561 - margin-top: 10rpx;  
562 - color: #666;  
563 - font-family: PingFang SC;  
564 - font-weight: 500; 513 +.discountText3 {
  514 + color: #FD4D59;
  515 + border: 2rpx solid #FD4D59;
565 } 516 }
566 517
567 -.bottomLimitation:nth-last-of-type(1){  
568 - padding-bottom: 20rpx; 518 +.priceText {
  519 + font-family: 'Abel';
  520 + color: #E34D59;
  521 + font-weight: 500;
  522 + font-size: 64rpx;
  523 + margin-top: 6rpx;
569 } 524 }
570 525
571 -.bottomLimitation text {  
572 - display: block;  
573 - width: 8rpx;  
574 - height: 8rpx;  
575 - background: #999999;  
576 - margin-right: 12rpx;  
577 - border-radius: 50%; 526 +.itemRight {
  527 + width: 70%;
  528 + padding-right: 10rpx;
  529 + margin-left: 18rpx;
578 } 530 }
579 531
580 -.couponBoxWrap .certificateInfo {  
581 - flex-direction: row;  
582 - background: #FFF1E6; 532 +.btns {
  533 + margin: 24rpx 20rpx 0 0;
  534 + display: flex;
  535 + justify-content: space-evenly;
  536 + align-items: baseline;
  537 + flex-direction: column;
  538 + height: 90%;
  539 +}
  540 +
  541 +.preferentialCoupon .itemRight {
  542 + width: 74%;
  543 + display: flex;
583 align-items: center; 544 align-items: center;
584 } 545 }
585 546
586 -.couponBoxWrap .couponBtn {  
587 - width: 100%;  
588 - height: fit-content;  
589 - background: #D2541C;  
590 - color: #fff; 547 +.preferentialCoupon .itemLeft {
  548 + width: 26%;
591 } 549 }
592 550
593 -.couponBoxWrap .certificateInfo .preferentialDetails {  
594 - width: 100%;  
595 - display: flex;  
596 - flex-direction: column; 551 +.preferentialCoupon .couponLine{
  552 + margin: 24rpx 0 4rpx 0;
  553 + border-right: 2rpx dashed #FD4D59;
597 } 554 }
598 555
  556 +.preferentialCoupon .orderingFood {
  557 + padding: 0 44rpx;
  558 + color: #fff;
  559 + border: none;
  560 + text-align: center;
  561 + border-radius: 20rpx;
  562 + line-height: 44rpx;
  563 + height: 44rpx;
  564 + width: max-content;
  565 + flex-shrink: 0;
  566 + background: #D2541C;
  567 +}
599 568
  569 +.preferentialCoupon .icons {
  570 + color: #FD4D59;
  571 + text-align: center;
  572 +}
600 573
601 -.couponBoxWrap .information { 574 +.preferentialCoupon .priceText {
602 display: flex; 575 display: flex;
603 - align-items: center; 576 + align-items: baseline;
  577 + justify-content: center;
  578 + font-family: PingFang SC;
  579 + color: #FD4D59;
  580 + font-weight: 600;
  581 + font-size: 48rpx;
  582 + margin-top: 6rpx;
604 } 583 }
605 584
606 -.couponBoxWrap .certificateInfo .limitation {  
607 - margin-right: 20rpx;  
608 - flex: 1;  
609 - width: auto; 585 +.preferentialCoupon .priceText text {
  586 + font-size: 48rpx;
610 } 587 }
611 588
612 -.couponBoxWrap .discountInfo {  
613 - font-family: PingFang SC;  
614 - background: #FD4D59;  
615 - position: absolute;  
616 - top: 0;  
617 - left: 100rpx;  
618 - font-size: 16rpx;  
619 - border-radius: 0 0 10rpx 0;  
620 - padding: 0 6rpx;  
621 - height: 28rp;  
622 - line-height: 28rpx;  
623 - text-align: center;  
624 - color: #FFEFC5;  
625 - width: max-content; 589 +.preferentialCoupon .btns {
  590 + flex: 1;
626 } 591 }
627 592
628 -.couponBoxWrap .certificateImg {  
629 - position: absolute;  
630 - top: 0;  
631 - left: 0;  
632 - width: 100rpx;  
633 - height: 28rpx; 593 +.preferentialCoupon .btnBox {
  594 + display: flex;
  595 + flex-direction: column;
634 } 596 }
635 597
636 -.couponBoxWrap .limitationBtn {  
637 - width: 40%; 598 +.preferentialCoupon .grantNum {
638 display: flex; 599 display: flex;
639 flex-direction: column; 600 flex-direction: column;
640 align-items: center; 601 align-items: center;
  602 + color: #C36607;
  603 + margin-top: 10rpx;
641 } 604 }
642 605
643 -.rechargeBtn navigator {  
644 - width: 63%;  
645 - padding: 12rpx 0;  
646 - background: #AE2D2D;  
647 - border-radius: 42rpx;  
648 - color: #fff;  
649 - text-align: center; 606 +.preferentialCoupon .grantNum text {
  607 + color: #F6231B;
  608 + margin-right: 10rpx;
  609 +}
  610 +
  611 +.preferentialCoupon .btns .anameText {
  612 + font-weight: 600;
  613 +}
  614 +
  615 +.preferentialCoupon .orderingFood1 {
  616 + border: 2rpx solid #D2541C;
  617 + background: transparent;
  618 + color: #D2541C;
  619 + font-weight: 600;
  620 + padding: 0 30rpx;
  621 +}
  622 +
  623 +.preferentialCoupon .orderingFood2 {
  624 + padding: 0 20rpx;
  625 +}
  626 +
  627 +.discountText {
  628 + text-align: center;
  629 + color: #FFEFC5;
  630 + border-radius: 6rpx;
  631 + font-family: PingFang SC;
  632 + background: #FD4D59;
  633 + width: max-content;
  634 + padding: 6rpx;
  635 + position: absolute;
  636 + left: 16rpx;
  637 + top: 12rpx;
  638 +}
  639 +
  640 +.bottom {
  641 + margin-top: 4rpx;
  642 + width: 100%;
  643 + color: #C36607;
  644 + font-family: PingFang SC;
  645 + font-weight: 500;
  646 + display: -webkit-box;
  647 + word-break: break-all;
  648 + word-wrap: break-word;
  649 + overflow: hidden;
  650 + text-align: left;
650 } 651 }
651 652
652 .labelBox { 653 .labelBox {
@@ -655,7 +656,7 @@ @@ -655,7 +656,7 @@
655 656
656 .labelBox .texts { 657 .labelBox .texts {
657 line-height: 40rpx; 658 line-height: 40rpx;
658 - color: #222; 659 + color: #000;
659 font-family: PingFang SC; 660 font-family: PingFang SC;
660 font-weight: 500; 661 font-weight: 500;
661 display: block; 662 display: block;
@@ -698,13 +699,8 @@ @@ -698,13 +699,8 @@
698 border-radius: 10rpx; 699 border-radius: 10rpx;
699 } 700 }
700 701
701 -.boxBlock {  
702 - width: 100%;  
703 - height: 500rpx;  
704 -}  
705 -  
706 .businessBox { 702 .businessBox {
707 - color: #D2541C; 703 + color: #000;
708 font-family: PingFang SC; 704 font-family: PingFang SC;
709 display: flex; 705 display: flex;
710 justify-content: center; 706 justify-content: center;
@@ -733,10 +729,15 @@ @@ -733,10 +729,15 @@
733 .arrivalBox { 729 .arrivalBox {
734 display: flex; 730 display: flex;
735 width: 100%; 731 width: 100%;
736 - justify-content: space-between;  
737 align-items: center; 732 align-items: center;
738 } 733 }
739 734
  735 +.arrivalBox .arrivalImg {
  736 + width: 40rpx;
  737 + height: 40rpx;
  738 + margin-left: 20rpx;
  739 +}
  740 +
740 .arrivalBox button { 741 .arrivalBox button {
741 display: flex; 742 display: flex;
742 font-size: 24rpx; 743 font-size: 24rpx;
@@ -911,7 +912,7 @@ @@ -911,7 +912,7 @@
911 912
912 #publicModal .mymodal .mymodal-content { 913 #publicModal .mymodal .mymodal-content {
913 height: 87% !important; 914 height: 87% !important;
914 - padding: 20rpx 50rpx 0 44rpx !important; 915 + padding: 20rpx 20rpx 0 20rpx !important;
915 } 916 }
916 917
917 #publicModal .mask { 918 #publicModal .mask {
@@ -1109,7 +1110,7 @@ @@ -1109,7 +1110,7 @@
1109 1110
1110 .viewBox2 .reservationInfo { 1111 .viewBox2 .reservationInfo {
1111 background: url('https://qn.colorcun.com/invitation14Bj.png') no-repeat; 1112 background: url('https://qn.colorcun.com/invitation14Bj.png') no-repeat;
1112 - padding: 220rpx 20rpx 120rpx; 1113 + padding: 220rpx 20rpx 40rpx;
1113 box-sizing: border-box; 1114 box-sizing: border-box;
1114 position: relative; 1115 position: relative;
1115 color: #000; 1116 color: #000;
@@ -1126,7 +1127,7 @@ @@ -1126,7 +1127,7 @@
1126 overflow-x: scroll; 1127 overflow-x: scroll;
1127 border-bottom-left-radius: 10rpx; 1128 border-bottom-left-radius: 10rpx;
1128 border-bottom-right-radius: 10rpx; 1129 border-bottom-right-radius: 10rpx;
1129 - padding-top: 30rpx; 1130 + padding-top: 50rpx;
1130 } 1131 }
1131 1132
1132 .viewBox2 .pageSpacing1 { 1133 .viewBox2 .pageSpacing1 {
@@ -1144,15 +1145,15 @@ @@ -1144,15 +1145,15 @@
1144 position: relative; 1145 position: relative;
1145 display: flex; 1146 display: flex;
1146 white-space: nowrap; 1147 white-space: nowrap;
1147 - width: 640rpx;  
1148 - height: 480rpx; 1148 + width: 320rpx;
  1149 + height: 240rpx;
1149 margin-right: 30rpx; 1150 margin-right: 30rpx;
1150 } 1151 }
1151 1152
1152 .viewBox2 .imageStyle { 1153 .viewBox2 .imageStyle {
1153 display: inline-block; 1154 display: inline-block;
1154 - width: 640rpx;  
1155 - height: 480rpx; 1155 + width: 320rpx;
  1156 + height: 240rpx;
1156 border-radius: 16rpx; 1157 border-radius: 16rpx;
1157 } 1158 }
1158 1159
@@ -1161,18 +1162,7 @@ @@ -1161,18 +1162,7 @@
1161 background: transparent; 1162 background: transparent;
1162 } 1163 }
1163 1164
1164 -.viewBox2 .receptionBox,  
1165 -.viewBox2 .entrance,  
1166 -.viewBox2 .businessBox {  
1167 - position: relative;  
1168 - top: -200rpx;  
1169 -}  
1170 -  
1171 .viewBox2 .businessBox { 1165 .viewBox2 .businessBox {
1172 - margin-bottom: 20rpx;  
1173 -}  
1174 -  
1175 -.businessBox {  
1176 color: #854F1E; 1166 color: #854F1E;
1177 } 1167 }
1178 1168
@@ -1195,7 +1185,8 @@ @@ -1195,7 +1185,8 @@
1195 color: #fff; 1185 color: #fff;
1196 } 1186 }
1197 1187
1198 -.viewBox2 .contentData { 1188 +.viewBox2 .contentData,
  1189 +.viewBox2 .welcomeInfo {
1199 color: #000; 1190 color: #000;
1200 } 1191 }
1201 1192
@@ -1208,38 +1199,24 @@ @@ -1208,38 +1199,24 @@
1208 color: #854F1E; 1199 color: #854F1E;
1209 border: 2rpx solid #854F1E; 1200 border: 2rpx solid #854F1E;
1210 } 1201 }
1211 -  
1212 -.viewBox2 .infoTopText4 {  
1213 - color: #854f1e;  
1214 - font-family: PingFang SC;  
1215 - font-weight: 600;  
1216 - font-size: 100rpx;  
1217 - line-height: 140rpx;  
1218 - letter-spacing: 20rpx; 1202 +.viewBox2 .infoTopImg {
  1203 + width: 670rpx;
  1204 + height: 96rpx;
1219 } 1205 }
1220 1206
1221 -.viewBox2 .infoTopText1 {  
1222 - color: #854f1e;  
1223 - font-family: PingFang SC;  
1224 - font-weight: 500;  
1225 - font-size: 40rpx;  
1226 - line-height: 40rpx;  
1227 - letter-spacing: 20rpx; 1207 +.viewBox2 .infoTopText2 {
  1208 + margin: 38rpx 0 20rpx 0;
1228 } 1209 }
1229 1210
1230 -.viewBox2 .infoTopText2 {  
1231 - margin: 60rpx 0 20rpx 0; 1211 +.viewBox2 .receptionBox {
  1212 + margin-top: 0;
1232 } 1213 }
1233 1214
1234 .viewBox2 .infoTop { 1215 .viewBox2 .infoTop {
1235 color: #000; 1216 color: #000;
1236 - align-items: flex-start; 1217 + align-items: center;
1237 margin-left: 40rpx; 1218 margin-left: 40rpx;
1238 -}  
1239 -  
1240 -.publicModalBox2 .detailBanner {  
1241 - margin: 0;  
1242 - width: 100%; 1219 + margin-bottom: 0;
1243 } 1220 }
1244 1221
1245 .publicModalBox2 .purchase { 1222 .publicModalBox2 .purchase {
@@ -1265,7 +1242,14 @@ @@ -1265,7 +1242,14 @@
1265 color: #854F1E; 1242 color: #854F1E;
1266 } 1243 }
1267 1244
1268 -.publicModalBox2 .orderingFood { 1245 +.publicModalBox2 .orderingFood,
  1246 +.publicModalBox2 .rechargeBtn navigator {
  1247 + background: #854F1E;
  1248 + color: #fff;
  1249 +}
  1250 +
  1251 +.publicModalBox2 .orderingFood1 {
  1252 + background: transparent;
1269 color: #854F1E; 1253 color: #854F1E;
1270 border: 2rpx solid #854F1E; 1254 border: 2rpx solid #854F1E;
1271 } 1255 }