xt / xcx-book · Commits

Go to a project

Commit 68071056392572b7354612c4fc8c18e5b20141d6

Authored by pengye
1 parent 5a67d999
build: skipped

代金券、充值支付失败跳转页面（1邀请函 2提前点餐 3APP分享）

Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
@@ -11,7 +11,7 @@ Page({ @@ -11,7 +11,7 @@ Page({
11 id:'', 11 id:'',
12 oid:'', 12 oid:'',
13 sid:'', 13 sid:'',
14 - types:'1',//1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是商家APP分享的 14 + types:'1',//1是邀请函过来的（邀请函的券或者点击意见反馈买券）2提前点餐 3是商家APP分享的
15 rid:'', 15 rid:'',
16 }, 16 },
17 use:{}, 17 use:{},
@@ -31,7 +31,7 @@ Page({ @@ -31,7 +31,7 @@ Page({
31 id:options.id, 31 id:options.id,
32 sid:options.sid, 32 sid:options.sid,
33 oid:options.oid, 33 oid:options.oid,
34 - types:options.types,//1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是邀请函 3是商家APP分享的或者短信的链接 34 + types:options.types,//1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接
35 rid:options.rid?options.rid:'', 35 rid:options.rid?options.rid:'',
36 } 36 }
37 }) 37 })
@@ -190,7 +190,7 @@ Page({ @@ -190,7 +190,7 @@ Page({
190 } 190 }
191 // 跳转到支付页，types传参 1邀请函 2提前点餐 3商家端app分享 191 // 跳转到支付页，types传参 1邀请函 2提前点餐 3商家端app分享
192 wx.navigateTo({ 192 wx.navigateTo({
193 - url: `./confirmPayment?sid=${this.data.opt.sid}&sellerName=${this.data.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=1`, 193 + url: `./confirmPayment?sid=${this.data.opt.sid}&sellerName=${this.data.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}`,
194 }) 194 })
195 }else{ 195 }else{
196 wx.showToast({ 196 wx.showToast({
@@ -57,7 +57,7 @@ Page({ @@ -57,7 +57,7 @@ Page({
57 }, 57 },
58 type: options.type, 58 type: options.type,
59 }) 59 })
60 - console.log('onLoad',{...this.data.opt}); 60 + console.log('onLoad',{...options});
61 let obj = wx.getStorageSync('info') 61 let obj = wx.getStorageSync('info')
62 console.log('objobjobjobj',{...obj}) 62 console.log('objobjobjobj',{...obj})
63 if (obj) { 63 if (obj) {
@@ -82,7 +82,7 @@ Page({ @@ -82,7 +82,7 @@ Page({
82 this.setData({ 82 this.setData({
83 StyleType 83 StyleType
84 }) 84 })
85 - console.log('StyleType',options.StyleType); 85 + console.log('StyleType',StyleType);
86 }) 86 })
87 }, 87 },
88 // 购买完成券之后关注公众号 88 // 购买完成券之后关注公众号
@@ -12,7 +12,7 @@ Page({ @@ -12,7 +12,7 @@ Page({
12 id:'', 12 id:'',
13 sid:'', 13 sid:'',
14 oid:'', 14 oid:'',
15 - types:'', 15 + types:'',// 1邀请函 2提前点餐 3商家端app分享
16 rid:'', 16 rid:'',
17 }, 17 },
18 exp_date:{}, 18 exp_date:{},
@@ -98,7 +98,7 @@ Page({ @@ -98,7 +98,7 @@ Page({
98 if(res.ret=='200'){ 98 if(res.ret=='200'){
99 let url = util.http_build_query({ 99 let url = util.http_build_query({
100 type:'2', 100 type:'2',
101 - types: '1',// 1邀请函 2提前点餐 3商家端app分享 101 + types: this.data.opt.types,// 1邀请函 2提前点餐 3商家端app分享
102 detail: JSON.stringify(detail), 102 detail: JSON.stringify(detail),
103 sid: this.data.opt.sid, 103 sid: this.data.opt.sid,
104 combine_out_trade_no:res.data.combine_out_trade_no, 104 combine_out_trade_no:res.data.combine_out_trade_no,