xt / xcx-book · Commits

Go to a project

Commit 53789388f5c9c4d2c7ec9ede17e3fd7728e6027d

Authored by pengye
1 parent 74a7e9f6
build: skipped

付费券免费券都跳转一个页面，邀请函商家详情商家有礼跳转路径修改

Inline Side-by-side
Showing 18 changed files with 335 additions and 55 deletions
@@ -80,6 +80,7 @@ Page({ @@ -80,6 +80,7 @@ Page({
80 let fullData = data.full_reduction_data ? util.determine(data.full_reduction_data) : '' 80 let fullData = data.full_reduction_data ? util.determine(data.full_reduction_data) : ''
81 let coupons = fullData.coupons ? util.determine(fullData.coupons) : ''; 81 let coupons = fullData.coupons ? util.determine(fullData.coupons) : '';
82 const now = Math.floor(Date.now() / 1000); 82 const now = Math.floor(Date.now() / 1000);
  83 + console.log('满减---',{...fullData},{...coupons},now);
83 // 在送券活动开始的有效期之内 84 // 在送券活动开始的有效期之内
84 if (now >= parseInt(fullData.stime) && now <= parseInt(fullData.etime)) { 85 if (now >= parseInt(fullData.stime) && now <= parseInt(fullData.etime)) {
85 // rule 1每满门槛均发放(满50送一张券，金额是100送2张) 86 // rule 1每满门槛均发放(满50送一张券，金额是100送2张)
@@ -98,9 +99,11 @@ Page({ @@ -98,9 +99,11 @@ Page({
98 let stairsData = data.stairs_data ? util.determine(data.stairs_data) : '' 99 let stairsData = data.stairs_data ? util.determine(data.stairs_data) : ''
99 let ladder_data = stairsData.ladder_data ? util.determine(stairsData.ladder_data) : ''; 100 let ladder_data = stairsData.ladder_data ? util.determine(stairsData.ladder_data) : '';
100 const now = Math.floor(Date.now() / 1000); 101 const now = Math.floor(Date.now() / 1000);
  102 + console.log('阶梯---',{...stairsData},{...ladder_data},now);
101 // 在送券活动开始的有效期之内 103 // 在送券活动开始的有效期之内
102 if (now >= parseInt(stairsData.stime) && now <= parseInt(stairsData.etime)) { 104 if (now >= parseInt(stairsData.stime) && now <= parseInt(stairsData.etime)) {
103 let obj = this.findObjectByNum(ladder_data, priceSum) 105 let obj = this.findObjectByNum(ladder_data, priceSum)
  106 + console.log('在送券活动开始的有效期之内',{...obj});
104 if (obj && obj.coupons) { 107 if (obj && obj.coupons) {
105 let coupons = obj.coupons ? util.determine(obj.coupons) : ''; 108 let coupons = obj.coupons ? util.determine(obj.coupons) : '';
106 this.getCouponFun(coupons, '2', '1',orderid) 109 this.getCouponFun(coupons, '2', '1',orderid)
@@ -11,9 +11,12 @@ Page({ @@ -11,9 +11,12 @@ Page({
11 dataStr: Date.now() * 1 / 1000, 11 dataStr: Date.now() * 1 / 1000,
12 detail: {}, 12 detail: {},
13 exp_date: {}, 13 exp_date: {},
  14 + couponType:'',//1代金券 2折扣券 3菜品券
14 resultCoupon: '', //0未领取 1已领取 15 resultCoupon: '', //0未领取 1已领取
15 seller: {}, 16 seller: {},
16 distance: '', 17 distance: '',
  18 + num: 1,
  19 + totalize: '',
17 }, 20 },
18 myModal: '', 21 myModal: '',
19 myToast:'', 22 myToast:'',
@@ -39,7 +42,7 @@ Page({ @@ -39,7 +42,7 @@ Page({
39 id: options.id || obj.id, 42 id: options.id || obj.id,
40 sid: options.sid || obj.sid, 43 sid: options.sid || obj.sid,
41 oid: options.oid, 44 oid: options.oid,
42 - types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 45 + types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 5充值赠送的券，不显示按钮
43 rid: options.rid ? options.rid : '', 46 rid: options.rid ? options.rid : '',
44 activity_id:options.activity_id || '', 47 activity_id:options.activity_id || '',
45 } 48 }
@@ -55,7 +58,7 @@ Page({ @@ -55,7 +58,7 @@ Page({
55 url: '/pages/me/wananchi' 58 url: '/pages/me/wananchi'
56 }) 59 })
57 }, 60 },
58 - // 提交订单 61 + // 提交订单(免费券)
59 submitOrder: util.throttle(function () { 62 submitOrder: util.throttle(function () {
60 if (this.data.detail.aexpiration && this.data.detail.aexpiration.valid_forever != '1' && (this.data.dataStr > (this.data.detail.etime * 1))) { 63 if (this.data.detail.aexpiration && this.data.detail.aexpiration.valid_forever != '1' && (this.data.dataStr > (this.data.detail.etime * 1))) {
61 return wx.showToast({ 64 return wx.showToast({
@@ -66,7 +69,7 @@ Page({ @@ -66,7 +69,7 @@ Page({
66 }) 69 })
67 } 70 }
68 // is_type 1店铺优惠券 需要判断优惠券剩余数量 2个人优惠券不需要判断数量 3免费券 4付费券 71 // is_type 1店铺优惠券 需要判断优惠券剩余数量 2个人优惠券不需要判断数量 3免费券 4付费券
69 - if (this.data.detail.grant_last == '0' && this.data.detail.is_type == '3') { 72 + if (this.data.detail.grant_last <= '0' && this.data.detail.is_type == '3') {
70 return wx.showToast({ 73 return wx.showToast({
71 title: '您来晚了，当前优惠券已经售罄，请与商家联系！', 74 title: '您来晚了，当前优惠券已经售罄，请与商家联系！',
72 duration: 2000, 75 duration: 2000,
@@ -94,6 +97,84 @@ Page({ @@ -94,6 +97,84 @@ Page({
94 closeCouponModal() { 97 closeCouponModal() {
95 this.myModal.closeModal() 98 this.myModal.closeModal()
96 }, 99 },
  100 + // 提交订单(付费券)
  101 + submitOrderTwo: util.throttle(function () {
  102 + if(this.data.dataStr>(this.data.detail.etime*1)){
  103 + return wx.showToast({
  104 + title:'优惠券已过期，不可购买！',
  105 + duration:2000,
  106 + mask:true,
  107 + icon:'none'
  108 + })
  109 + }
  110 + if(this.data.num && !/(^[1-9]\d*$)/.test(this.data.num)){
  111 + return wx.showToast({
  112 + title:'请输入正确的购买数量',
  113 + duration:2000,
  114 + mask:true,
  115 + icon:'none'
  116 + })
  117 + }
  118 + // is_type 1店铺优惠券 需要判断优惠券剩余数量 2个人优惠券不需要判断数量
  119 + if(this.data.detail.grant_last=='0' && this.data.detail.is_type=='1'){
  120 + return wx.showToast({
  121 + title:'您来晚了，当前优惠券已经售罄，请与商家联系！',
  122 + duration:2000,
  123 + mask:true,
  124 + icon:'none'
  125 + })
  126 + }
  127 + // is_type 1店铺优惠券 需要判断优惠券剩余数量 2个人优惠券不需要判断数量
  128 + if(this.data.detail.grant_last && (this.data.detail.grant_last*1)<(this.data.num*1) && this.data.detail.is_type=='1'){
  129 + return wx.showToast({
  130 + title:'优惠券剩余数量不足！',
  131 + duration:2000,
  132 + mask:true,
  133 + icon:'none'
  134 + })
  135 + }
  136 + if(this.data.num=='0'){
  137 + return wx.showToast({
  138 + title:'最少需要购买一个！',
  139 + duration:2000,
  140 + mask:true,
  141 + icon:'none'
  142 + })
  143 + }
  144 + console.log('oidoid',this.data.opt.oid);
  145 + let detail=this.data.detail
  146 + detail.name=this.data.seller.sellername;
  147 + detail.oid=this.data.opt.oid;
  148 + App.Activity.CreateNewRechargeOrder({
  149 + recharge_id:this.data.opt.id,
  150 + sellerid:this.data.opt.sid,
  151 + number:this.data.num,
  152 + price:this.data.detail.price,
  153 + type:'1',
  154 + }).then(res=>{
  155 + console.log(res);
  156 + if(res.ret=='200'){
  157 + let totalize=this.data.totalize*1;
  158 + if(totalize==0){
  159 + util.toast('购买成功','none');
  160 + wx.reLaunch({
  161 + url: '/pages/me/coupon_news'
  162 + })
  163 + return
  164 + }
  165 + // 跳转到支付页，types传参 1邀请函 2提前点餐 3商家端app分享
  166 + wx.navigateTo({
  167 + url: `./confirmPayment?sid=${this.data.opt.sid}&sellerName=${this.data.seller.sellername}&oid=${this.data.opt.oid}&rid=${this.data.opt.rid?this.data.opt.rid:''}&type=1&detail=${JSON.stringify(detail)}&combine_out_trade_no=${res.data.combine_out_trade_no}&totalize=${this.data.totalize}&types=${this.data.opt.types}`,
  168 + })
  169 + }else{
  170 + wx.showToast({
  171 + title:res.msg,
  172 + duration:2000,
  173 + mask:true
  174 + })
  175 + }
  176 + })
  177 + }, 3000),
97 // 领券 178 // 领券
98 getActivityCouponFun(type){ 179 getActivityCouponFun(type){
99 let detail = this.data.detail 180 let detail = this.data.detail
@@ -132,9 +213,12 @@ Page({ @@ -132,9 +213,12 @@ Page({
132 id: this.data.opt.id 213 id: this.data.opt.id
133 }).then(res => { 214 }).then(res => {
134 if (res.data.length > 0) { 215 if (res.data.length > 0) {
  216 + let couponType = '';
135 let detail = res.data[0]; 217 let detail = res.data[0];
136 let exp_date = util.determine(detail.exp_date); 218 let exp_date = util.determine(detail.exp_date);
137 detail.arule = detail.arule ? util.determine(detail.arule) : ''; 219 detail.arule = detail.arule ? util.determine(detail.arule) : '';
  220 + detail.use = detail.use ? util.determine(detail.use) : '';
  221 + detail.exp_date = exp_date;
138 detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : ''; 222 detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';
139 detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : ''; 223 detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';
140 detail.cdate = detail.cdate * 1; 224 detail.cdate = detail.cdate * 1;
@@ -175,16 +259,73 @@ Page({ @@ -175,16 +259,73 @@ Page({
175 detail.noonText = noon; 259 detail.noonText = noon;
176 detail.nigText = nig; 260 detail.nigText = nig;
177 } 261 }
  262 + if(detail.is_type!='3'){
  263 + detail.useStime = util.unixtoTime(detail.stime, 'YYYY-MM-DD');
  264 + detail.useEtime = util.unixtoTime(detail.etime, 'YYYY-MM-DD');
  265 + }
  266 + // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示
  267 + if(detail.use){
  268 + couponType = detail.use.is_cash=='1'?'1':detail.use.is_discount=='1'?'2':detail.use.is_dish=='1'?'3':'1';
  269 + detail.use.images = detail.use.images ? util.determine(detail.use.images) : '';
  270 + }else{
  271 + couponType = '1'
  272 + }
178 if (detail.arule && detail.arule.is_share_lose == '0') { 273 if (detail.arule && detail.arule.is_share_lose == '0') {
179 wx.hideShareMenu() 274 wx.hideShareMenu()
180 } 275 }
  276 + let price = detail.price * 1;
  277 + let num = this.data.num * 1;
181 this.setData({ 278 this.setData({
182 detail, 279 detail,
183 exp_date, 280 exp_date,
  281 + totalize: (price * num).toFixed(2),
  282 + couponType,
184 }) 283 })
185 } 284 }
186 }) 285 })
187 }, 286 },
  287 + // 点击减号
  288 + subtraction() {
  289 + let price = this.data.detail.price * 1;
  290 + let num = this.data.num * 1;
  291 + let num1 = num - 1
  292 + if (num == '1') {
  293 + return false
  294 + }
  295 + this.setData({
  296 + num: num1,
  297 + totalize: (price * num1).toFixed(2)
  298 + })
  299 + },
  300 + // 点击加号
  301 + addition() {
  302 + let price = this.data.detail.price * 1;
  303 + let num = this.data.num * 1;
  304 + let num1 = num + 1
  305 + this.setData({
  306 + num: num1,
  307 + totalize: (price * num1).toFixed(2)
  308 + })
  309 + },
  310 + // 输入事件
  311 + bindKeyNameInput(event){
  312 + let price = this.data.detail.price * 1;
  313 + const value = event.detail.value.replace(/\s+/g, "")*1;
  314 + if(value && /(^[1-9]\d*$)/.test(value)){
  315 + wx.hideToast()
  316 + this.setData({
  317 + num: value,
  318 + totalize: (price * value).toFixed(2)
  319 + })
  320 + }else{
  321 + wx.showToast({
  322 + title:'请输入正整数',
  323 + icon:'none',
  324 + duration:1000,
  325 + mask:true,
  326 + })
  327 + }
  328 + },
188 // 获取店铺名称 329 // 获取店铺名称
189 getSellerDetail() { 330 getSellerDetail() {
190 let that = this; 331 let that = this;
@@ -335,7 +476,7 @@ Page({ @@ -335,7 +476,7 @@ Page({
335 let detail = this.data.detail; 476 let detail = this.data.detail;
336 detail.activity_id = res.data.length > 0 ? res.data[0].activity_id : ''; 477 detail.activity_id = res.data.length > 0 ? res.data[0].activity_id : '';
337 this.setData({ 478 this.setData({
338 - resultCoupon: res.data.length > 0 ? '1' : '0', 479 + resultCoupon: res.data.length > 0 && detail.is_type == '3' ? '1' : '0',
339 }) 480 })
340 } 481 }
341 }) 482 })
1 <!--pack-activity/pack/receiveCoupon.wxml--> 1 <!--pack-activity/pack/receiveCoupon.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav>代金券详情</nav> 3 +<nav>优惠券详情</nav>
4 <view class="top_box"> 4 <view class="top_box">
5 - <image src="https://qn.colorcun.com/voucherIcon1.png" mode="" />  
6 - <view class="texts"> 5 + <image src="https://qn.colorcun.com/{{couponType=='1'?'voucherIcon1':couponType=='2'?'coupon2':'coupon3'}}.png" mode="" />
  6 + <view class="texts" wx:if="{{detail.is_type == '3'}}">
7 <view class="font32r textName">{{detail.aname}}</view> 7 <view class="font32r textName">{{detail.aname}}</view>
8 <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font28r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view> 8 <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font28r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view>
9 </view> 9 </view>
  10 + <view class="texts texts{{couponType}}" wx:if="{{detail.is_type != '3'}}">
  11 + <view class="flex-lr">
  12 + <view class="font28r textName">{{detail.aname}}</view>
  13 + <view class="font20r">￥<text class="font32r">{{detail.price}}</text></view>
  14 + </view>
  15 + <view class="flex-lr">
  16 + <view class="font20r threshold">
  17 + <text class="priceText font36r" wx:if="{{detail.use.discount}}">{{detail.use.discount}}折</text>
  18 + <text class="font20r" wx:else>￥<text class="priceText font36r">{{detail.price}}</text></text>
  19 + {{detail.desc}}
  20 + </view>
  21 + <!-- <view class="operation" wx:if="{{opt.types!='5'}}">
  22 + <image class="countimgs" src="https://qn.colorcun.com/WechatIMG699.png" bindtap="subtraction" />
  23 + <input type="number" model:value="{{num}}" bindinput="bindKeyNameInput" />
  24 + <image class="countimgs" src="https://qn.colorcun.com/WechatIMG698.png" bindtap="addition" mode="" />
  25 + </view> -->
  26 + </view>
  27 + </view>
10 <view class="font28r receive" wx:if="{{resultCoupon == '1'}}">已领取</view> 28 <view class="font28r receive" wx:if="{{resultCoupon == '1'}}">已领取</view>
11 </view> 29 </view>
12 <view class="center_box"> 30 <view class="center_box">
  31 + <view class="centerMain dishMain" wx:if="{{couponType == '3' && detail.use}}">
  32 + <view class="title">
  33 + <image src="https://qn.colorcun.com/voucherUnion_6.png" mode="" />
  34 + <text class="font32r">菜品</text>
  35 + </view>
  36 + <text space="nbsp" class="info font28r">{{detail.use.dish}}</text>
  37 + <image wx:for="{{detail.use.images}}" src="{{item}}" mode="widthFix"/>
  38 + </view>
13 <view class="centerMain"> 39 <view class="centerMain">
14 <view class="title"> 40 <view class="title">
15 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" /> 41 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" />
16 <text class="font32r">有效期</text> 42 <text class="font32r">有效期</text>
17 </view> 43 </view>
18 - <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>  
19 - <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期：</text> 永久有效</view> 44 + <block wx:if="{{detail.is_type == '3'}}">
  45 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>
  46 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期：</text> 永久有效</view>
  47 + </block>
  48 + <block wx:else>
  49 + <view class="info font28r" wx:if="{{detail.useStime && detail.useEtime}}"><text>活动期限：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>
  50 + </block>
20 </view> 51 </view>
21 - <view class="centerMain">  
22 - <view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}"> 52 + <view class="centerMain" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">
  53 + <view class="title">
23 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" /> 54 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" />
24 - <text class="font32r">不可用日期</text> 55 + <text class="font32r">{{detail.is_type=='3'?'不':''}}可用日期</text>
25 </view> 56 </view>
26 <view wx:if="{{detail.morText}}" class="info font28r">{{detail.morText}}</view> 57 <view wx:if="{{detail.morText}}" class="info font28r">{{detail.morText}}</view>
27 <view wx:if="{{detail.noonText}}" class="info font28r">{{detail.noonText}}</view> 58 <view wx:if="{{detail.noonText}}" class="info font28r">{{detail.noonText}}</view>
28 <view wx:if="{{detail.nigText}}" class="info font28r">{{detail.nigText}}</view> 59 <view wx:if="{{detail.nigText}}" class="info font28r">{{detail.nigText}}</view>
29 </view> 60 </view>
30 - <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}"> 61 + <view class="centerMain" wx:if="{{detail.is_type!='3' && exp_date.is_none=='1'}}">
  62 + <view class="title">
  63 + <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" />
  64 + <text class="font32r">可用日期</text>
  65 + </view>
  66 + <view wx:if="{{exp_date.is_none=='1'}}" class="info font28r" >
  67 + 无限制
  68 + </view>
  69 + </view>
  70 + <view class="centerMain centerMain3" wx:if="{{detail.aexpiration && detail.is_type == '3'}}">
31 <view class="title"> 71 <view class="title">
32 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" /> 72 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" />
33 <text class="font32r">使用规则</text> 73 <text class="font32r">使用规则</text>
@@ -48,7 +88,16 @@ @@ -48,7 +88,16 @@
48 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}} 88 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}}
49 </view> 89 </view>
50 </view> 90 </view>
51 - <view class="centerMain"> 91 + <view class="centerMain centerMain3" wx:if="{{exp_date && exp_date.is_birthday=='1' && detail.is_type != '3'}}">
  92 + <view class="title">
  93 + <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" />
  94 + <text class="font32r">使用限制</text>
  95 + </view>
  96 + <view class="info font28r">
  97 + 顾客生日当天可用
  98 + </view>
  99 + </view>
  100 + <view class="centerMain" wx:if="{{detail.is_type == '3'}}">
52 <view class="title"> 101 <view class="title">
53 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" /> 102 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" />
54 <text class="font32r">分享规则</text> 103 <text class="font32r">分享规则</text>
@@ -98,20 +147,30 @@ @@ -98,20 +147,30 @@
98 </view> 147 </view>
99 </view> 148 </view>
100 </view> 149 </view>
101 -<view class="sharewidth" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}">  
102 - <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">  
103 - <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />  
104 - <text class="font24r">分享</text>  
105 - </button>  
106 - <view class="btns">  
107 - <view class="btn1 font36r" wx:if="{{seller.is_online_reserve == '1'}}">  
108 - <navigator url="/pages/reserve/reserve?id={{opt.sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator>  
109 - </view>  
110 - <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}">  
111 - <view bindtap="callPhone">预订包间</view>  
112 - </view>  
113 - <view wx:if="{{resultCoupon == '0' && detail.grant_last>0}}" class="btn font36r" bindtap="submitOrder">领取到卡包</view>  
114 - </view> 150 +<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{opt.types!='5' && (resultCoupon == '0' || detail.arule.is_share_lose == '1')}}">
  151 + <block wx:if="{{detail.is_type == '3'}}">
  152 + <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">
  153 + <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />
  154 + <text class="font24r">分享</text>
  155 + </button>
  156 + <view class="btns">
  157 + <view class="btn1 font36r" wx:if="{{seller.is_online_reserve == '1'}}">
  158 + <navigator url="/pages/reserve/reserve?id={{opt.sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator>
  159 + </view>
  160 + <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}">
  161 + <view bindtap="callPhone">预订包间</view>
  162 + </view>
  163 + <view wx:if="{{resultCoupon == '0' && detail.grant_last>0}}" class="btn font36r" bindtap="submitOrder">领取到卡包</view>
  164 + </view>
  165 + </block>
  166 + <block wx:else>
  167 + <view class="leftBox">
  168 + <view class="news font24r">
  169 + 合计<text class="font28r">￥<text class="priceInfo">{{totalize}}</text></text>
  170 + </view>
  171 + </view>
  172 + <button bindtap="submitOrderTwo" class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (detail.grant_last && (detail.grant_last*1)<(num*1)))?'submitBtns btnsDisabled':'submitBtns'}}">提交订单</button>
  173 + </block>
115 </view> 174 </view>
116 <toast id="myToast"></toast> 175 <toast id="myToast"></toast>
117 <my-modal id="myModal" fadeStyle="slideUp" height="240px"> 176 <my-modal id="myModal" fadeStyle="slideUp" height="240px">
@@ -26,6 +26,10 @@ page { @@ -26,6 +26,10 @@ page {
26 margin-right: 12rpx; 26 margin-right: 12rpx;
27 } 27 }
28 28
  29 +.texts2 .priceText {
  30 + font-size: 36rpx;
  31 +}
  32 +
29 .top_box .texts { 33 .top_box .texts {
30 flex: 1; 34 flex: 1;
31 margin-left: 32rpx; 35 margin-left: 32rpx;
@@ -70,7 +74,7 @@ page { @@ -70,7 +74,7 @@ page {
70 } 74 }
71 75
72 .centerMain { 76 .centerMain {
73 - margin-bottom: 40rpx; 77 + margin-bottom: 30rpx;
74 } 78 }
75 79
76 .centerMain .drop { 80 .centerMain .drop {
@@ -190,15 +194,15 @@ page { @@ -190,15 +194,15 @@ page {
190 } 194 }
191 195
192 #myModal .titleModal2 { 196 #myModal .titleModal2 {
193 - margin-top: 80%; 197 + margin-top: 80%;
194 } 198 }
195 199
196 #myModal .titleModal3 { 200 #myModal .titleModal3 {
197 - margin-top: 60%; 201 + margin-top: 60%;
198 } 202 }
199 203
200 #myModal .titleModal4 { 204 #myModal .titleModal4 {
201 - margin-top: 30%; 205 + margin-top: 30%;
202 } 206 }
203 207
204 #myModal .mymodal { 208 #myModal .mymodal {
@@ -219,7 +223,7 @@ page { @@ -219,7 +223,7 @@ page {
219 223
220 .modalText1 { 224 .modalText1 {
221 color: #dfdfdf; 225 color: #dfdfdf;
222 - font-family: PingFang SC; 226 + font-family: PingFang SC;
223 font-weight: 600; 227 font-weight: 600;
224 font-size: 52rpx; 228 font-size: 52rpx;
225 text-align: center; 229 text-align: center;
@@ -227,7 +231,7 @@ page { @@ -227,7 +231,7 @@ page {
227 231
228 .modalText2 { 232 .modalText2 {
229 color: #dfdfdf; 233 color: #dfdfdf;
230 - font-family: PingFang SC; 234 + font-family: PingFang SC;
231 font-weight: 500; 235 font-weight: 500;
232 text-align: center; 236 text-align: center;
233 margin: 0 40rpx; 237 margin: 0 40rpx;
@@ -306,11 +310,11 @@ page { @@ -306,11 +310,11 @@ page {
306 .info_name { 310 .info_name {
307 color: #000; 311 color: #000;
308 overflow: hidden; 312 overflow: hidden;
309 - word-break: break-all;  
310 - text-overflow: ellipsis;  
311 - display: -webkit-box;  
312 - -webkit-box-orient: vertical;  
313 - -webkit-line-clamp: 1; 313 + word-break: break-all;
  314 + text-overflow: ellipsis;
  315 + display: -webkit-box;
  316 + -webkit-box-orient: vertical;
  317 + -webkit-line-clamp: 1;
314 font-weight: 600; 318 font-weight: 600;
315 } 319 }
316 320
@@ -326,4 +330,79 @@ page { @@ -326,4 +330,79 @@ page {
326 background: #FFE8D7; 330 background: #FFE8D7;
327 color: #fb4e21; 331 color: #fb4e21;
328 border-radius: 4rpx; 332 border-radius: 4rpx;
  333 +}
  334 +
  335 +.operation {
  336 + display: flex;
  337 + align-items: center;
  338 + border: 2rpx solid #CBCBCB;
  339 + border-radius: 198rpx;
  340 + height: 52rpx;
  341 +}
  342 +
  343 +.operation input {
  344 + width: 64rpx;
  345 + border-left: 2rpx solid #CBCBCB;
  346 + border-right: 2rpx solid #CBCBCB;
  347 + border-radius: 10rpx;
  348 + text-align: center;
  349 + height: 52rpx;
  350 +}
  351 +
  352 +.top_box .countimgs {
  353 + width: 32rpx;
  354 + height: 32rpx;
  355 + padding: 16rpx;
  356 +}
  357 +
  358 +.dishMain .info {
  359 + display: flex;
  360 + flex-wrap: wrap;
  361 + justify-content: flex-start;
  362 +}
  363 +
  364 +.dishMain image {
  365 + margin-bottom: 12rpx;
  366 + width: 100%;
  367 +}
  368 +
  369 +.dishMain .title image {
  370 + width: 26rpx;
  371 +}
  372 +
  373 +.leftBox {
  374 + display: flex;
  375 + align-items: center;
  376 + justify-content: space-between;
  377 + font-family: PingFang SC;
  378 +}
  379 +
  380 +.news {
  381 + color: #000;
  382 +}
  383 +
  384 +.news text {
  385 + color: #FD4D59;
  386 +}
  387 +
  388 +.priceInfo {
  389 + font-weight: 600;
  390 + font-size: 60rpx;
  391 +}
  392 +
  393 +.submitBtns {
  394 + margin: 0;
  395 + border-radius: 42rpx;
  396 + padding: 0 56rpx;
  397 + color: #fff;
  398 + background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);
  399 +}
  400 +
  401 +.btnsDisabled {
  402 + background: #999999 !important;
  403 + color: #fff !important;
  404 +}
  405 +
  406 +.sharewidth1 {
  407 + justify-content: space-between;
329 } 408 }
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <view class="publicModule preferentialCoupon" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 76 <view class="publicModule preferentialCoupon" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
77 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" /> 77 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" />
78 <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">
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"> 79 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
80 <view class="preferentialItems"> 80 <view class="preferentialItems">
81 <view class="itemLeft"> 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> 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>
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 <!-- 优惠券 --> 116 <!-- 优惠券 -->
117 <view class="preferentialCoupon" wx:if="{{activeTitle == '1'}}"> 117 <view class="preferentialCoupon" wx:if="{{activeTitle == '1'}}">
118 <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">
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"> 119 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
120 <view class="preferentialItems"> 120 <view class="preferentialItems">
121 <view class="itemLeft"> 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> 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>
@@ -176,7 +176,7 @@ @@ -176,7 +176,7 @@
176 <block wx:if="{{modalType == '1'}}"> 176 <block wx:if="{{modalType == '1'}}">
177 <view class="regionItem preferentialCoupon" slot="modalContent"> 177 <view class="regionItem preferentialCoupon" slot="modalContent">
178 <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">
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"> 179 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
180 <view class="preferentialItems"> 180 <view class="preferentialItems">
181 <view class="itemLeft"> 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> 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>
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 </block> 86 </block>
87 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 87 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
88 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 88 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
89 - <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"> 89 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
90 <view class="preferentialItems"> 90 <view class="preferentialItems">
91 <view class="itemLeft"> 91 <view class="itemLeft">
92 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 92 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 </view> 92 </view>
93 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 93 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
94 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 94 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
95 - <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"> 95 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
96 <view class="preferentialItems"> 96 <view class="preferentialItems">
97 <view class="itemLeft"> 97 <view class="itemLeft">
98 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 98 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 </view> 75 </view>
76 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 76 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
77 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 77 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
78 - <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 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
79 <view class="preferentialItems"> 79 <view class="preferentialItems">
80 <view class="itemLeft"> 80 <view class="itemLeft">
81 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 81 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 </view> 73 </view>
74 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 74 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
75 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 75 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
76 - <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"> 76 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
77 <view class="preferentialItems"> 77 <view class="preferentialItems">
78 <view class="itemLeft"> 78 <view class="itemLeft">
79 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 79 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </view> 95 </view>
96 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 96 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
97 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 97 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
98 - <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"> 98 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
99 <view class="preferentialItems"> 99 <view class="preferentialItems">
100 <view class="itemLeft"> 100 <view class="itemLeft">
101 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 101 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </view> 88 </view>
89 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 89 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
90 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 90 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
91 - <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"> 91 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
92 <view class="preferentialItems"> 92 <view class="preferentialItems">
93 <view class="itemLeft"> 93 <view class="itemLeft">
94 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 94 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </view> 85 </view>
86 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 86 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
87 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 87 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
88 - <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"> 88 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
89 <view class="preferentialItems"> 89 <view class="preferentialItems">
90 <view class="itemLeft"> 90 <view class="itemLeft">
91 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 91 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </view> 90 </view>
91 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 91 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
92 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 92 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
93 - <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"> 93 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
94 <view class="preferentialItems"> 94 <view class="preferentialItems">
95 <view class="itemLeft"> 95 <view class="itemLeft">
96 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 96 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -93,13 +93,11 @@ Page({ @@ -93,13 +93,11 @@ Page({
93 if (options.coupon == '1' && options.price * 1 > 0) { 93 if (options.coupon == '1' && options.price * 1 > 0) {
94 let url = util.http_build_query({ 94 let url = util.http_build_query({
95 id: options.couponId, 95 id: options.couponId,
96 - name: options.sellerName,  
97 oid: options.oid, 96 oid: options.oid,
98 sid: options.sellid, 97 sid: options.sellid,
99 types: '1', 98 types: '1',
100 StyleType:this.data.StyleType, 99 StyleType:this.data.StyleType,
101 - use: options.use ? JSON.stringify(options.use) : '',  
102 - }, '/pack-activity/pack/buyCoupon') 100 + }, '/pack-activity/pack/receiveCoupon')
103 wx.hideLoading() 101 wx.hideLoading()
104 wx.redirectTo({ 102 wx.redirectTo({
105 url 103 url
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view class="sign"></view><text class="font32r">专属优惠券</text> 6 <view class="sign"></view><text class="font32r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 - <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
10 <view class="couponWrap"> 10 <view class="couponWrap">
11 <view class="itemLeft"> 11 <view class="itemLeft">
12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </view> 21 </view>
22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
24 - <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.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover"> 24 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
25 <view class="couponWrap"> 25 <view class="couponWrap">
26 <view class="itemLeft"> 26 <view class="itemLeft">
27 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 27 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>