xt / xcx-book · Commits

Go to a project

Commit ec445cc98ede41ad63a34ab1074e7978c56f3d63

Authored by pengye
1 parent 976fc551
build: skipped

邀请函自定义图文数据、支付定金

Inline Side-by-side
Showing 23 changed files with 799 additions and 19 deletions
@@ -51,6 +51,8 @@ Page({ @@ -51,6 +51,8 @@ Page({
51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
52 _attentionAnim: {}, 52 _attentionAnim: {},
53 isPlay: '1', 53 isPlay: '1',
  54 + paymentStatus:'',//定金支付状态 1支付 0未支付
  55 + reserveData:{},//自定义图文数据
54 }, 56 },
55 tablestr: '', 57 tablestr: '',
56 urlsValue: [], 58 urlsValue: [],
@@ -72,6 +74,9 @@ Page({ @@ -72,6 +74,9 @@ Page({
72 console.log(param); 74 console.log(param);
73 console.log(options); 75 console.log(options);
74 this.setData(param) 76 this.setData(param)
  77 + if(options.paymentId){
  78 + this.getPaymentStatus(options.paymentId)
  79 + }
75 mta.Page.init({ 80 mta.Page.init({
76 "appID": "500667280", 81 "appID": "500667280",
77 "eventID": "500667287", 82 "eventID": "500667287",
@@ -138,6 +143,7 @@ Page({ @@ -138,6 +143,7 @@ Page({
138 */ 143 */
139 onShow: function () { 144 onShow: function () {
140 this.getDetail() 145 this.getDetail()
  146 + this.getText()
141 }, 147 },
142 // 复制微信号 148 // 复制微信号
143 copyWeChat() { 149 copyWeChat() {
@@ -309,6 +315,77 @@ Page({ @@ -309,6 +315,77 @@ Page({
309 } 315 }
310 }) 316 })
311 }, 317 },
  318 + // 通过定金ID查收定金详情
  319 + getPaymentStatus(id){
  320 + App.Reserve.GetReserveDepositByid({
  321 + id
  322 + }).then(res=>{
  323 + if(res.ret == 200){
  324 + this.setData({
  325 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  326 + })
  327 + }
  328 + })
  329 + },
  330 + // 获取自定义图文内容
  331 + getText() {
  332 + App.Reserve.GetReserveImgText({
  333 + rid: this.data.options.id
  334 + }).then(res => {
  335 + if (res.ret == 200 && res.data) {
  336 + let data = res.data;
  337 + let content = util.determine(data.content)
  338 + console.log('contentcontentcontent', content);
  339 + this.setData({
  340 + reserveData: {
  341 + title: data.title || '',
  342 + content,
  343 + }
  344 + })
  345 + }
  346 + })
  347 + },
  348 + // 点击支付定金
  349 + paymentFun() {
  350 + App.PayOnline.CombineTransactionsByDeposit({
  351 + id: this.options.paymentId,
  352 + openid: getApp().openid,
  353 + }).then(res => {
  354 + if (res.ret == 200) {
  355 + wx.requestPayment({
  356 + timeStamp: res.data.timeStamp + '',
  357 + nonceStr: res.data.nonceStr,
  358 + package: res.data.package,
  359 + signType: res.data.signType,
  360 + paySign: res.data.paySign,
  361 + success(ress) {
  362 + if (ress.errMsg == 'requestPayment:ok') {
  363 + console.log('支付成功', ress);
  364 + this.setData({
  365 + paymentStatus:'1'
  366 + })
  367 + return wx.showToast({
  368 + title: '支付成功',
  369 + icon: 'success'
  370 + })
  371 + }
  372 + console.log('支付失败', ress);
  373 + wx.showToast({
  374 + title: '支付失败，请重新支付',
  375 + icon: 'none',
  376 + })
  377 + },
  378 + fail(ress) {
  379 + console.log('支付失败', ress);
  380 + wx.showToast({
  381 + title: '支付失败，请重新支付',
  382 + icon: 'none',
  383 + })
  384 + },
  385 + })
  386 + }
  387 + })
  388 + },
312 // 客户经理获取基本信息 389 // 客户经理获取基本信息
313 getstaffinfo(uid, sid) { 390 getstaffinfo(uid, sid) {
314 console.log('sellerid', this.data.detail.seller.id); 391 console.log('sellerid', this.data.detail.seller.id);
@@ -105,6 +105,13 @@ @@ -105,6 +105,13 @@
105 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 105 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
106 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 106 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
107 </view> 107 </view>
  108 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  109 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  110 + <block wx:for="{{reserveData.content}}" wx:key="index">
  111 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  112 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  113 + </block>
  114 + </view>
108 <!-- 餐厅介绍图文分开 --> 115 <!-- 餐厅介绍图文分开 -->
109 <view class="introduce" wx:if="{{store}}"> 116 <view class="introduce" wx:if="{{store}}">
110 <view class="imgMask"> 117 <view class="imgMask">
@@ -207,9 +214,10 @@ @@ -207,9 +214,10 @@
207 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 214 <image src="https://qn.colorcun.com/jt1.png" mode="" />
208 </view> 215 </view>
209 </scroll-view> 216 </scroll-view>
210 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
211 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 217 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  218 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
212 </view> 219 </view>
  220 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
213 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 221 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
214 </button> 222 </button>
215 </view> 223 </view>
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 margin-left: 20rpx; 217 margin-left: 20rpx;
218 color: #515151; 218 color: #515151;
219 font-family: PingFang SC; 219 font-family: PingFang SC;
220 - font-size: 20rpx; 220 + font-size: 24rpx;
221 max-height: 400rpx; 221 max-height: 400rpx;
222 overflow: hidden; 222 overflow: hidden;
223 white-space: pre-line; 223 white-space: pre-line;
@@ -444,6 +444,14 @@ @@ -444,6 +444,14 @@
444 color: #fff; 444 color: #fff;
445 } 445 }
446 446
  447 +.moreBtn{
  448 + width: 100%;
  449 +}
  450 +
  451 +.sharewidth .moreBtn {
  452 + width: 100% !important;
  453 +}
  454 +
447 .sharewidth .shareItem { 455 .sharewidth .shareItem {
448 width: 100% !important; 456 width: 100% !important;
449 } 457 }
@@ -495,6 +503,21 @@ @@ -495,6 +503,21 @@
495 font-size: 28rpx; 503 font-size: 28rpx;
496 } 504 }
497 505
  506 +.reserveBox{
  507 + margin: 20rpx 40rpx 0 40rpx;
  508 +}
  509 +.reserveBox .title{
  510 + margin-bottom: 20rpx;
  511 + color: #000;
  512 + font-family: PingFang SC;
  513 +}
  514 +
  515 +.reserveBox .items{
  516 + margin-bottom: 20rpx;
  517 + color: #000;
  518 + font-family: PingFang SC;
  519 +}
  520 +
498 .more { 521 .more {
499 height: 80rpx; 522 height: 80rpx;
500 width: 100%; 523 width: 100%;
@@ -52,6 +52,8 @@ Page({ @@ -52,6 +52,8 @@ Page({
52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
53 _attentionAnim: {}, 53 _attentionAnim: {},
54 isPlay: '1', 54 isPlay: '1',
  55 + paymentStatus:'',//定金支付状态 1支付 0未支付
  56 + reserveData:{},//自定义图文数据
55 }, 57 },
56 tablestr: '', 58 tablestr: '',
57 urlsValue: [], 59 urlsValue: [],
@@ -73,6 +75,9 @@ Page({ @@ -73,6 +75,9 @@ Page({
73 console.log(param); 75 console.log(param);
74 console.log(options); 76 console.log(options);
75 this.setData(param) 77 this.setData(param)
  78 + if(options.paymentId){
  79 + this.getPaymentStatus(options.paymentId)
  80 + }
76 mta.Page.init({ 81 mta.Page.init({
77 "appID": "500667280", 82 "appID": "500667280",
78 "eventID": "500667287", 83 "eventID": "500667287",
@@ -139,6 +144,7 @@ Page({ @@ -139,6 +144,7 @@ Page({
139 */ 144 */
140 onShow: function () { 145 onShow: function () {
141 this.getDetail() 146 this.getDetail()
  147 + this.getText()
142 }, 148 },
143 // 复制微信号 149 // 复制微信号
144 copyWeChat() { 150 copyWeChat() {
@@ -310,6 +316,77 @@ Page({ @@ -310,6 +316,77 @@ Page({
310 } 316 }
311 }) 317 })
312 }, 318 },
  319 + // 通过定金ID查收定金详情
  320 + getPaymentStatus(id){
  321 + App.Reserve.GetReserveDepositByid({
  322 + id
  323 + }).then(res=>{
  324 + if(res.ret == 200){
  325 + this.setData({
  326 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  327 + })
  328 + }
  329 + })
  330 + },
  331 + // 获取自定义图文内容
  332 + getText() {
  333 + App.Reserve.GetReserveImgText({
  334 + rid: this.data.options.id
  335 + }).then(res => {
  336 + if (res.ret == 200 && res.data) {
  337 + let data = res.data;
  338 + let content = util.determine(data.content)
  339 + console.log('contentcontentcontent', content);
  340 + this.setData({
  341 + reserveData: {
  342 + title: data.title || '',
  343 + content,
  344 + }
  345 + })
  346 + }
  347 + })
  348 + },
  349 + // 点击支付定金
  350 + paymentFun() {
  351 + App.PayOnline.CombineTransactionsByDeposit({
  352 + id: this.options.paymentId,
  353 + openid: getApp().openid,
  354 + }).then(res => {
  355 + if (res.ret == 200) {
  356 + wx.requestPayment({
  357 + timeStamp: res.data.timeStamp + '',
  358 + nonceStr: res.data.nonceStr,
  359 + package: res.data.package,
  360 + signType: res.data.signType,
  361 + paySign: res.data.paySign,
  362 + success(ress) {
  363 + if (ress.errMsg == 'requestPayment:ok') {
  364 + console.log('支付成功', ress);
  365 + this.setData({
  366 + paymentStatus:'1'
  367 + })
  368 + return wx.showToast({
  369 + title: '支付成功',
  370 + icon: 'success'
  371 + })
  372 + }
  373 + console.log('支付失败', ress);
  374 + wx.showToast({
  375 + title: '支付失败，请重新支付',
  376 + icon: 'none',
  377 + })
  378 + },
  379 + fail(ress) {
  380 + console.log('支付失败', ress);
  381 + wx.showToast({
  382 + title: '支付失败，请重新支付',
  383 + icon: 'none',
  384 + })
  385 + },
  386 + })
  387 + }
  388 + })
  389 + },
313 // 客户经理获取基本信息 390 // 客户经理获取基本信息
314 getstaffinfo(uid, sid) { 391 getstaffinfo(uid, sid) {
315 console.log('sellerid', this.data.detail.seller.id); 392 console.log('sellerid', this.data.detail.seller.id);
@@ -113,6 +113,13 @@ @@ -113,6 +113,13 @@
113 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 113 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
114 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 114 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
115 </view> 115 </view>
  116 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  117 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  118 + <block wx:for="{{reserveData.content}}" wx:key="index">
  119 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  120 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  121 + </block>
  122 + </view>
116 <!-- 餐厅介绍图文分开 --> 123 <!-- 餐厅介绍图文分开 -->
117 <view class="introduce" wx:if="{{store}}"> 124 <view class="introduce" wx:if="{{store}}">
118 <view class="imgMask"> 125 <view class="imgMask">
@@ -215,9 +222,10 @@ @@ -215,9 +222,10 @@
215 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 222 <image src="https://qn.colorcun.com/jt1.png" mode="" />
216 </view> 223 </view>
217 </scroll-view> 224 </scroll-view>
218 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
219 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 225 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  226 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
220 </view> 227 </view>
  228 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
221 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 229 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
222 </button> 230 </button>
223 </view> 231 </view>
@@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
256 margin-left: 20rpx; 256 margin-left: 20rpx;
257 color: #515151; 257 color: #515151;
258 font-family: PingFang SC; 258 font-family: PingFang SC;
259 - font-size: 20rpx; 259 + font-size: 24rpx;
260 max-height: 400rpx; 260 max-height: 400rpx;
261 overflow: hidden; 261 overflow: hidden;
262 white-space: pre-line; 262 white-space: pre-line;
@@ -483,6 +483,14 @@ @@ -483,6 +483,14 @@
483 border: 2rpx solid #0143A3; 483 border: 2rpx solid #0143A3;
484 } 484 }
485 485
  486 +.moreBtn{
  487 + width: 100%;
  488 +}
  489 +
  490 +.sharewidth .moreBtn {
  491 + width: 100% !important;
  492 +}
  493 +
486 .between .shareItem { 494 .between .shareItem {
487 width: 100%; 495 width: 100%;
488 margin: 0; 496 margin: 0;
@@ -541,6 +549,23 @@ @@ -541,6 +549,23 @@
541 font-size: 28rpx; 549 font-size: 28rpx;
542 } 550 }
543 551
  552 +.reserveBox{
  553 + margin: 20rpx 40rpx 0 40rpx;
  554 +}
  555 +.reserveBox .title{
  556 + color: #000;
  557 + font-family: PingFang SC;
  558 + font-size: 36rpx !important;
  559 + top: 0 !important;
  560 + text-align: left !important;
  561 + margin: 0 0 20rpx 0 !important;
  562 +}
  563 +.reserveBox .items{
  564 + margin-bottom: 20rpx;
  565 + color: #000;
  566 + font-family: PingFang SC;
  567 +}
  568 +
544 .more { 569 .more {
545 height: 80rpx; 570 height: 80rpx;
546 width: 100%; 571 width: 100%;
@@ -52,6 +52,8 @@ Page({ @@ -52,6 +52,8 @@ Page({
52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
53 _attentionAnim: {}, 53 _attentionAnim: {},
54 isPlay: '1', 54 isPlay: '1',
  55 + paymentStatus:'',//定金支付状态 1支付 0未支付
  56 + reserveData:{},//自定义图文数据
55 }, 57 },
56 tablestr: '', 58 tablestr: '',
57 urlsValue: [], 59 urlsValue: [],
@@ -73,6 +75,9 @@ Page({ @@ -73,6 +75,9 @@ Page({
73 console.log(param); 75 console.log(param);
74 console.log(options); 76 console.log(options);
75 this.setData(param) 77 this.setData(param)
  78 + if(options.paymentId){
  79 + this.getPaymentStatus(options.paymentId)
  80 + }
76 mta.Page.init({ 81 mta.Page.init({
77 "appID": "500667280", 82 "appID": "500667280",
78 "eventID": "500667287", 83 "eventID": "500667287",
@@ -139,6 +144,7 @@ Page({ @@ -139,6 +144,7 @@ Page({
139 */ 144 */
140 onShow: function () { 145 onShow: function () {
141 this.getDetail() 146 this.getDetail()
  147 + this.getText()
142 }, 148 },
143 // 复制微信号 149 // 复制微信号
144 copyWeChat() { 150 copyWeChat() {
@@ -310,6 +316,77 @@ Page({ @@ -310,6 +316,77 @@ Page({
310 } 316 }
311 }) 317 })
312 }, 318 },
  319 + // 通过定金ID查收定金详情
  320 + getPaymentStatus(id){
  321 + App.Reserve.GetReserveDepositByid({
  322 + id
  323 + }).then(res=>{
  324 + if(res.ret == 200){
  325 + this.setData({
  326 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  327 + })
  328 + }
  329 + })
  330 + },
  331 + // 获取自定义图文内容
  332 + getText() {
  333 + App.Reserve.GetReserveImgText({
  334 + rid: this.data.options.id
  335 + }).then(res => {
  336 + if (res.ret == 200 && res.data) {
  337 + let data = res.data;
  338 + let content = util.determine(data.content)
  339 + console.log('contentcontentcontent', content);
  340 + this.setData({
  341 + reserveData: {
  342 + title: data.title || '',
  343 + content,
  344 + }
  345 + })
  346 + }
  347 + })
  348 + },
  349 + // 点击支付定金
  350 + paymentFun() {
  351 + App.PayOnline.CombineTransactionsByDeposit({
  352 + id: this.options.paymentId,
  353 + openid: getApp().openid,
  354 + }).then(res => {
  355 + if (res.ret == 200) {
  356 + wx.requestPayment({
  357 + timeStamp: res.data.timeStamp + '',
  358 + nonceStr: res.data.nonceStr,
  359 + package: res.data.package,
  360 + signType: res.data.signType,
  361 + paySign: res.data.paySign,
  362 + success(ress) {
  363 + if (ress.errMsg == 'requestPayment:ok') {
  364 + console.log('支付成功', ress);
  365 + this.setData({
  366 + paymentStatus:'1'
  367 + })
  368 + return wx.showToast({
  369 + title: '支付成功',
  370 + icon: 'success'
  371 + })
  372 + }
  373 + console.log('支付失败', ress);
  374 + wx.showToast({
  375 + title: '支付失败，请重新支付',
  376 + icon: 'none',
  377 + })
  378 + },
  379 + fail(ress) {
  380 + console.log('支付失败', ress);
  381 + wx.showToast({
  382 + title: '支付失败，请重新支付',
  383 + icon: 'none',
  384 + })
  385 + },
  386 + })
  387 + }
  388 + })
  389 + },
313 // 客户经理获取基本信息 390 // 客户经理获取基本信息
314 getstaffinfo(uid, sid) { 391 getstaffinfo(uid, sid) {
315 console.log('sellerid', this.data.detail.seller.id); 392 console.log('sellerid', this.data.detail.seller.id);
@@ -92,6 +92,13 @@ @@ -92,6 +92,13 @@
92 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 92 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
93 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 93 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
94 </view> 94 </view>
  95 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  96 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  97 + <block wx:for="{{reserveData.content}}" wx:key="index">
  98 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  99 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  100 + </block>
  101 + </view>
95 <!-- 餐厅介绍图文分开 --> 102 <!-- 餐厅介绍图文分开 -->
96 <block wx:if="{{store}}"> 103 <block wx:if="{{store}}">
97 <view class="imgMask"> 104 <view class="imgMask">
@@ -191,9 +198,10 @@ @@ -191,9 +198,10 @@
191 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 198 <image src="https://qn.colorcun.com/jt1.png" mode="" />
192 </view> 199 </view>
193 </scroll-view> 200 </scroll-view>
194 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
195 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 201 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  202 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
196 </view> 203 </view>
  204 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
197 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 205 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
198 </button> 206 </button>
199 </view> 207 </view>
@@ -454,6 +454,14 @@ @@ -454,6 +454,14 @@
454 color: #fff; 454 color: #fff;
455 } 455 }
456 456
  457 +.moreBtn{
  458 + width: 100%;
  459 +}
  460 +
  461 +.sharewidth .moreBtn {
  462 + width: 100% !important;
  463 +}
  464 +
457 .sharewidth .shareItem { 465 .sharewidth .shareItem {
458 width: 100% !important; 466 width: 100% !important;
459 } 467 }
@@ -504,6 +512,24 @@ @@ -504,6 +512,24 @@
504 font-size: 28rpx; 512 font-size: 28rpx;
505 } 513 }
506 514
  515 +.reserveBox{
  516 + margin: 20rpx 40rpx 0 40rpx;
  517 +}
  518 +.reserveBox .title{
  519 + color: #000;
  520 + font-family: PingFang SC;
  521 + font-size: 36rpx !important;
  522 + top: 0 !important;
  523 + text-align: left !important;
  524 + margin: 0 0 20rpx 0 !important;
  525 +}
  526 +
  527 +.reserveBox .items{
  528 + margin-bottom: 20rpx;
  529 + color: #000;
  530 + font-family: PingFang SC;
  531 +}
  532 +
507 .scroll-view { 533 .scroll-view {
508 white-space: nowrap; 534 white-space: nowrap;
509 } 535 }
@@ -51,6 +51,8 @@ Page({ @@ -51,6 +51,8 @@ Page({
51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
52 _attentionAnim: {}, 52 _attentionAnim: {},
53 isPlay: '1', 53 isPlay: '1',
  54 + paymentStatus:'',//定金支付状态 1支付 0未支付
  55 + reserveData:{},//自定义图文数据
54 }, 56 },
55 tablestr: '', 57 tablestr: '',
56 urlsValue: [], 58 urlsValue: [],
@@ -72,6 +74,9 @@ Page({ @@ -72,6 +74,9 @@ Page({
72 console.log(param); 74 console.log(param);
73 console.log(options); 75 console.log(options);
74 this.setData(param) 76 this.setData(param)
  77 + if(options.paymentId){
  78 + this.getPaymentStatus(options.paymentId)
  79 + }
75 mta.Page.init({ 80 mta.Page.init({
76 "appID": "500667280", 81 "appID": "500667280",
77 "eventID": "500667287", 82 "eventID": "500667287",
@@ -138,6 +143,7 @@ Page({ @@ -138,6 +143,7 @@ Page({
138 */ 143 */
139 onShow: function () { 144 onShow: function () {
140 this.getDetail() 145 this.getDetail()
  146 + this.getText()
141 }, 147 },
142 // 复制微信号 148 // 复制微信号
143 copyWeChat() { 149 copyWeChat() {
@@ -309,6 +315,77 @@ Page({ @@ -309,6 +315,77 @@ Page({
309 } 315 }
310 }) 316 })
311 }, 317 },
  318 + // 通过定金ID查收定金详情
  319 + getPaymentStatus(id){
  320 + App.Reserve.GetReserveDepositByid({
  321 + id
  322 + }).then(res=>{
  323 + if(res.ret == 200){
  324 + this.setData({
  325 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  326 + })
  327 + }
  328 + })
  329 + },
  330 + // 获取自定义图文内容
  331 + getText() {
  332 + App.Reserve.GetReserveImgText({
  333 + rid: this.data.options.id
  334 + }).then(res => {
  335 + if (res.ret == 200 && res.data) {
  336 + let data = res.data;
  337 + let content = util.determine(data.content)
  338 + console.log('contentcontentcontent', content);
  339 + this.setData({
  340 + reserveData: {
  341 + title: data.title || '',
  342 + content,
  343 + }
  344 + })
  345 + }
  346 + })
  347 + },
  348 + // 点击支付定金
  349 + paymentFun() {
  350 + App.PayOnline.CombineTransactionsByDeposit({
  351 + id: this.options.paymentId,
  352 + openid: getApp().openid,
  353 + }).then(res => {
  354 + if (res.ret == 200) {
  355 + wx.requestPayment({
  356 + timeStamp: res.data.timeStamp + '',
  357 + nonceStr: res.data.nonceStr,
  358 + package: res.data.package,
  359 + signType: res.data.signType,
  360 + paySign: res.data.paySign,
  361 + success(ress) {
  362 + if (ress.errMsg == 'requestPayment:ok') {
  363 + console.log('支付成功', ress);
  364 + this.setData({
  365 + paymentStatus:'1'
  366 + })
  367 + return wx.showToast({
  368 + title: '支付成功',
  369 + icon: 'success'
  370 + })
  371 + }
  372 + console.log('支付失败', ress);
  373 + wx.showToast({
  374 + title: '支付失败，请重新支付',
  375 + icon: 'none',
  376 + })
  377 + },
  378 + fail(ress) {
  379 + console.log('支付失败', ress);
  380 + wx.showToast({
  381 + title: '支付失败，请重新支付',
  382 + icon: 'none',
  383 + })
  384 + },
  385 + })
  386 + }
  387 + })
  388 + },
312 // 客户经理获取基本信息 389 // 客户经理获取基本信息
313 getstaffinfo(uid, sid) { 390 getstaffinfo(uid, sid) {
314 console.log('sellerid', this.data.detail.seller.id); 391 console.log('sellerid', this.data.detail.seller.id);
@@ -89,6 +89,13 @@ @@ -89,6 +89,13 @@
89 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 89 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
90 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 90 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
91 </view> 91 </view>
  92 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  93 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  94 + <block wx:for="{{reserveData.content}}" wx:key="index">
  95 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  96 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  97 + </block>
  98 + </view>
92 <!-- 餐厅介绍图文分开 --> 99 <!-- 餐厅介绍图文分开 -->
93 <block wx:if="{{store}}"> 100 <block wx:if="{{store}}">
94 <view class="imgMask"> 101 <view class="imgMask">
@@ -188,9 +195,10 @@ @@ -188,9 +195,10 @@
188 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 195 <image src="https://qn.colorcun.com/jt1.png" mode="" />
189 </view> 196 </view>
190 </scroll-view> 197 </scroll-view>
191 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
192 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 198 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  199 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
193 </view> 200 </view>
  201 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
194 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 202 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
195 </button> 203 </button>
196 </view> 204 </view>
@@ -446,6 +446,14 @@ @@ -446,6 +446,14 @@
446 border: 2rpx solid #0143A3; 446 border: 2rpx solid #0143A3;
447 } 447 }
448 448
  449 +.moreBtn{
  450 + width: 100%;
  451 +}
  452 +
  453 +.sharewidth .moreBtn {
  454 + width: 100% !important;
  455 +}
  456 +
449 .between .shareItem { 457 .between .shareItem {
450 width: 65% !important; 458 width: 65% !important;
451 margin: 0; 459 margin: 0;
@@ -499,6 +507,21 @@ @@ -499,6 +507,21 @@
499 font-size: 28rpx; 507 font-size: 28rpx;
500 } 508 }
501 509
  510 +.reserveBox{
  511 + margin: 20rpx 40rpx 0 40rpx;
  512 +}
  513 +.reserveBox .title{
  514 + margin-bottom: 20rpx;
  515 + color: #000;
  516 + font-family: PingFang SC;
  517 +}
  518 +
  519 +.reserveBox .items{
  520 + margin-bottom: 20rpx;
  521 + color: #000;
  522 + font-family: PingFang SC;
  523 +}
  524 +
502 .scroll-view { 525 .scroll-view {
503 white-space: nowrap; 526 white-space: nowrap;
504 } 527 }
@@ -52,6 +52,8 @@ Page({ @@ -52,6 +52,8 @@ Page({
52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 52 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
53 _attentionAnim: {}, 53 _attentionAnim: {},
54 isPlay: '1', 54 isPlay: '1',
  55 + paymentStatus:'',//定金支付状态 1支付 0未支付
  56 + reserveData:{},//自定义图文数据
55 }, 57 },
56 screenHeight: '', 58 screenHeight: '',
57 attentionAnim: {}, 59 attentionAnim: {},
@@ -71,6 +73,9 @@ Page({ @@ -71,6 +73,9 @@ Page({
71 console.log(param); 73 console.log(param);
72 console.log(options); 74 console.log(options);
73 this.setData(param) 75 this.setData(param)
  76 + if(options.paymentId){
  77 + this.getPaymentStatus(options.paymentId)
  78 + }
74 mta.Page.init({ 79 mta.Page.init({
75 "appID": "500667280", 80 "appID": "500667280",
76 "eventID": "500667287", 81 "eventID": "500667287",
@@ -133,6 +138,7 @@ Page({ @@ -133,6 +138,7 @@ Page({
133 */ 138 */
134 onShow: function () { 139 onShow: function () {
135 this.getDetail() 140 this.getDetail()
  141 + this.getText()
136 }, 142 },
137 cli() { 143 cli() {
138 if (this.data.staffinfo.wechat) { 144 if (this.data.staffinfo.wechat) {
@@ -262,6 +268,77 @@ Page({ @@ -262,6 +268,77 @@ Page({
262 } 268 }
263 }) 269 })
264 }, 270 },
  271 + // 通过定金ID查收定金详情
  272 + getPaymentStatus(id){
  273 + App.Reserve.GetReserveDepositByid({
  274 + id
  275 + }).then(res=>{
  276 + if(res.ret == 200){
  277 + this.setData({
  278 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  279 + })
  280 + }
  281 + })
  282 + },
  283 + // 获取自定义图文内容
  284 + getText() {
  285 + App.Reserve.GetReserveImgText({
  286 + rid: this.data.options.id
  287 + }).then(res => {
  288 + if (res.ret == 200 && res.data) {
  289 + let data = res.data;
  290 + let content = util.determine(data.content)
  291 + console.log('contentcontentcontent', content);
  292 + this.setData({
  293 + reserveData: {
  294 + title: data.title || '',
  295 + content,
  296 + }
  297 + })
  298 + }
  299 + })
  300 + },
  301 + // 点击支付定金
  302 + paymentFun() {
  303 + App.PayOnline.CombineTransactionsByDeposit({
  304 + id: this.options.paymentId,
  305 + openid: getApp().openid,
  306 + }).then(res => {
  307 + if (res.ret == 200) {
  308 + wx.requestPayment({
  309 + timeStamp: res.data.timeStamp + '',
  310 + nonceStr: res.data.nonceStr,
  311 + package: res.data.package,
  312 + signType: res.data.signType,
  313 + paySign: res.data.paySign,
  314 + success(ress) {
  315 + if (ress.errMsg == 'requestPayment:ok') {
  316 + console.log('支付成功', ress);
  317 + this.setData({
  318 + paymentStatus:'1'
  319 + })
  320 + return wx.showToast({
  321 + title: '支付成功',
  322 + icon: 'success'
  323 + })
  324 + }
  325 + console.log('支付失败', ress);
  326 + wx.showToast({
  327 + title: '支付失败，请重新支付',
  328 + icon: 'none',
  329 + })
  330 + },
  331 + fail(ress) {
  332 + console.log('支付失败', ress);
  333 + wx.showToast({
  334 + title: '支付失败，请重新支付',
  335 + icon: 'none',
  336 + })
  337 + },
  338 + })
  339 + }
  340 + })
  341 + },
265 // 客户经理获取基本信息 342 // 客户经理获取基本信息
266 getstaffinfo(uid, sid) { 343 getstaffinfo(uid, sid) {
267 console.log('sellerid', this.data.detail.seller.id); 344 console.log('sellerid', this.data.detail.seller.id);
@@ -112,6 +112,13 @@ @@ -112,6 +112,13 @@
112 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 112 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
113 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 113 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
114 </view> 114 </view>
  115 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  116 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  117 + <block wx:for="{{reserveData.content}}" wx:key="index">
  118 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  119 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  120 + </block>
  121 + </view>
115 <!-- 品牌介绍类型 图文合并 --> 122 <!-- 品牌介绍类型 图文合并 -->
116 <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)--> 123 <!-- (必须有图 && 新模板的图文合并开启 && 图片展示开启 && 文字展示开启) || (新模板的图文合并字段不存在代表老数据 && store.style 1图文合并)-->
117 <view class="introduce" wx:if="{{(store && store.images.length && store.is_above && store.is_above=='1' && store.is_images=='1' && store.is_introduce=='1') || (store && !store.is_above && store.style=='1')}}"> 124 <view class="introduce" wx:if="{{(store && store.images.length && store.is_above && store.is_above=='1' && store.is_images=='1' && store.is_introduce=='1') || (store && !store.is_above && store.style=='1')}}">
@@ -266,9 +273,10 @@ @@ -266,9 +273,10 @@
266 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 273 <image src="https://qn.colorcun.com/jt1.png" mode="" />
267 </view> 274 </view>
268 </scroll-view> 275 </scroll-view>
269 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
270 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 276 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  277 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
271 </view> 278 </view>
  279 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
272 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 280 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
273 </button> 281 </button>
274 </view> 282 </view>
@@ -616,6 +616,14 @@ @@ -616,6 +616,14 @@
616 border: 2rpx solid #0143A3; 616 border: 2rpx solid #0143A3;
617 } 617 }
618 618
  619 +.moreBtn{
  620 + width: 100%;
  621 +}
  622 +
  623 +.sharewidth .moreBtn {
  624 + width: 100% !important;
  625 +}
  626 +
619 .between .shareItem { 627 .between .shareItem {
620 width: 65% !important; 628 width: 65% !important;
621 margin: 0; 629 margin: 0;
@@ -670,6 +678,24 @@ @@ -670,6 +678,24 @@
670 font-size: 28rpx; 678 font-size: 28rpx;
671 } 679 }
672 680
  681 +.reserveBox{
  682 + margin: 20rpx 40rpx 0 40rpx;
  683 +}
  684 +.reserveBox .title{
  685 + color: #000;
  686 + font-family: PingFang SC;
  687 + font-size: 36rpx !important;
  688 + top: 0 !important;
  689 + text-align: left !important;
  690 + margin: 0 0 20rpx 0 !important;
  691 +}
  692 +
  693 +.reserveBox .items{
  694 + margin-bottom: 20rpx;
  695 + color: #000;
  696 + font-family: PingFang SC;
  697 +}
  698 +
673 .more { 699 .more {
674 height: 80rpx; 700 height: 80rpx;
675 width: 100%; 701 width: 100%;
@@ -51,6 +51,8 @@ Page({ @@ -51,6 +51,8 @@ Page({
51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
52 _attentionAnim: {}, 52 _attentionAnim: {},
53 isPlay: '1', 53 isPlay: '1',
  54 + paymentStatus:'',//定金支付状态 1支付 0未支付
  55 + reserveData:{},//自定义图文数据
54 }, 56 },
55 tablestr: '', 57 tablestr: '',
56 urlsValue: [], 58 urlsValue: [],
@@ -72,6 +74,9 @@ Page({ @@ -72,6 +74,9 @@ Page({
72 console.log(param); 74 console.log(param);
73 console.log(options); 75 console.log(options);
74 this.setData(param) 76 this.setData(param)
  77 + if(options.paymentId){
  78 + this.getPaymentStatus(options.paymentId)
  79 + }
75 mta.Page.init({ 80 mta.Page.init({
76 "appID": "500667280", 81 "appID": "500667280",
77 "eventID": "500667287", 82 "eventID": "500667287",
@@ -138,6 +143,7 @@ Page({ @@ -138,6 +143,7 @@ Page({
138 */ 143 */
139 onShow: function () { 144 onShow: function () {
140 this.getDetail() 145 this.getDetail()
  146 + this.getText()
141 }, 147 },
142 // 复制微信号 148 // 复制微信号
143 copyWeChat() { 149 copyWeChat() {
@@ -309,6 +315,77 @@ Page({ @@ -309,6 +315,77 @@ Page({
309 } 315 }
310 }) 316 })
311 }, 317 },
  318 + // 通过定金ID查收定金详情
  319 + getPaymentStatus(id){
  320 + App.Reserve.GetReserveDepositByid({
  321 + id
  322 + }).then(res=>{
  323 + if(res.ret == 200){
  324 + this.setData({
  325 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  326 + })
  327 + }
  328 + })
  329 + },
  330 + // 获取自定义图文内容
  331 + getText() {
  332 + App.Reserve.GetReserveImgText({
  333 + rid: this.data.options.id
  334 + }).then(res => {
  335 + if (res.ret == 200 && res.data) {
  336 + let data = res.data;
  337 + let content = util.determine(data.content)
  338 + console.log('contentcontentcontent', content);
  339 + this.setData({
  340 + reserveData: {
  341 + title: data.title || '',
  342 + content,
  343 + }
  344 + })
  345 + }
  346 + })
  347 + },
  348 + // 点击支付定金
  349 + paymentFun() {
  350 + App.PayOnline.CombineTransactionsByDeposit({
  351 + id: this.options.paymentId,
  352 + openid: getApp().openid,
  353 + }).then(res => {
  354 + if (res.ret == 200) {
  355 + wx.requestPayment({
  356 + timeStamp: res.data.timeStamp + '',
  357 + nonceStr: res.data.nonceStr,
  358 + package: res.data.package,
  359 + signType: res.data.signType,
  360 + paySign: res.data.paySign,
  361 + success(ress) {
  362 + if (ress.errMsg == 'requestPayment:ok') {
  363 + console.log('支付成功', ress);
  364 + this.setData({
  365 + paymentStatus:'1'
  366 + })
  367 + return wx.showToast({
  368 + title: '支付成功',
  369 + icon: 'success'
  370 + })
  371 + }
  372 + console.log('支付失败', ress);
  373 + wx.showToast({
  374 + title: '支付失败，请重新支付',
  375 + icon: 'none',
  376 + })
  377 + },
  378 + fail(ress) {
  379 + console.log('支付失败', ress);
  380 + wx.showToast({
  381 + title: '支付失败，请重新支付',
  382 + icon: 'none',
  383 + })
  384 + },
  385 + })
  386 + }
  387 + })
  388 + },
312 // 客户经理获取基本信息 389 // 客户经理获取基本信息
313 getstaffinfo(uid, sid) { 390 getstaffinfo(uid, sid) {
314 console.log('sellerid', this.data.detail.seller.id); 391 console.log('sellerid', this.data.detail.seller.id);
@@ -107,6 +107,13 @@ @@ -107,6 +107,13 @@
107 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 107 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
108 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 108 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
109 </view> 109 </view>
  110 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  111 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  112 + <block wx:for="{{reserveData.content}}" wx:key="index">
  113 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  114 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  115 + </block>
  116 + </view>
110 <!-- 餐厅介绍图文分开 --> 117 <!-- 餐厅介绍图文分开 -->
111 <view class="introduce" wx:if="{{store}}"> 118 <view class="introduce" wx:if="{{store}}">
112 <view class="imgMask"> 119 <view class="imgMask">
@@ -209,9 +216,10 @@ @@ -209,9 +216,10 @@
209 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 216 <image src="https://qn.colorcun.com/jt1.png" mode="" />
210 </view> 217 </view>
211 </scroll-view> 218 </scroll-view>
212 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
213 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 219 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  220 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
214 </view> 221 </view>
  222 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
215 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 223 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
216 </button> 224 </button>
217 </view> 225 </view>
@@ -222,7 +222,7 @@ @@ -222,7 +222,7 @@
222 margin: 0 0 20rpx 20rpx; 222 margin: 0 0 20rpx 20rpx;
223 color: #515151; 223 color: #515151;
224 font-family: PingFang SC; 224 font-family: PingFang SC;
225 - font-size: 20rpx; 225 + font-size: 24rpx;
226 max-height: 400rpx; 226 max-height: 400rpx;
227 overflow: hidden; 227 overflow: hidden;
228 white-space: pre-line; 228 white-space: pre-line;
@@ -447,6 +447,14 @@ @@ -447,6 +447,14 @@
447 border: 2rpx solid #0143A3; 447 border: 2rpx solid #0143A3;
448 } 448 }
449 449
  450 +.moreBtn{
  451 + width: 100%;
  452 +}
  453 +
  454 +.sharewidth .moreBtn {
  455 + width: 100% !important;
  456 +}
  457 +
450 .between .shareItem { 458 .between .shareItem {
451 width: 100%; 459 width: 100%;
452 margin: 0; 460 margin: 0;
@@ -505,6 +513,21 @@ @@ -505,6 +513,21 @@
505 font-size: 28rpx; 513 font-size: 28rpx;
506 } 514 }
507 515
  516 +.reserveBox{
  517 + margin: 20rpx 40rpx 0 40rpx;
  518 +}
  519 +.reserveBox .title{
  520 + margin-bottom: 20rpx;
  521 + color: #000;
  522 + font-family: PingFang SC;
  523 +}
  524 +
  525 +.reserveBox .items{
  526 + margin-bottom: 20rpx;
  527 + color: #000;
  528 + font-family: PingFang SC;
  529 +}
  530 +
508 .more { 531 .more {
509 height: 80rpx; 532 height: 80rpx;
510 width: 100%; 533 width: 100%;
@@ -51,6 +51,8 @@ Page({ @@ -51,6 +51,8 @@ Page({
51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报 51 hasValueBroadcast:false,//商家是否能播报，只有极速版不能播报
52 _attentionAnim: {}, 52 _attentionAnim: {},
53 isPlay: '1', 53 isPlay: '1',
  54 + paymentStatus:'',//定金支付状态 1支付 0未支付
  55 + reserveData:{},//自定义图文数据
54 }, 56 },
55 tablestr: '', 57 tablestr: '',
56 urlsValue: [], 58 urlsValue: [],
@@ -72,6 +74,9 @@ Page({ @@ -72,6 +74,9 @@ Page({
72 console.log(param); 74 console.log(param);
73 console.log(options); 75 console.log(options);
74 this.setData(param) 76 this.setData(param)
  77 + if(options.paymentId){
  78 + this.getPaymentStatus(options.paymentId)
  79 + }
75 mta.Page.init({ 80 mta.Page.init({
76 "appID": "500667280", 81 "appID": "500667280",
77 "eventID": "500667287", 82 "eventID": "500667287",
@@ -138,6 +143,7 @@ Page({ @@ -138,6 +143,7 @@ Page({
138 */ 143 */
139 onShow: function () { 144 onShow: function () {
140 this.getDetail() 145 this.getDetail()
  146 + this.getText()
141 }, 147 },
142 // 复制微信号 148 // 复制微信号
143 copyWeChat() { 149 copyWeChat() {
@@ -308,6 +314,77 @@ Page({ @@ -308,6 +314,77 @@ Page({
308 } 314 }
309 }) 315 })
310 }, 316 },
  317 + // 通过定金ID查收定金详情
  318 + getPaymentStatus(id){
  319 + App.Reserve.GetReserveDepositByid({
  320 + id
  321 + }).then(res=>{
  322 + if(res.ret == 200){
  323 + this.setData({
  324 + paymentStatus:res.data.trade_state=='SUCCESS'?'1':'0'
  325 + })
  326 + }
  327 + })
  328 + },
  329 + // 获取自定义图文内容
  330 + getText() {
  331 + App.Reserve.GetReserveImgText({
  332 + rid: this.data.options.id
  333 + }).then(res => {
  334 + if (res.ret == 200 && res.data) {
  335 + let data = res.data;
  336 + let content = util.determine(data.content)
  337 + console.log('contentcontentcontent', content);
  338 + this.setData({
  339 + reserveData: {
  340 + title: data.title || '',
  341 + content,
  342 + }
  343 + })
  344 + }
  345 + })
  346 + },
  347 + // 点击支付定金
  348 + paymentFun() {
  349 + App.PayOnline.CombineTransactionsByDeposit({
  350 + id: this.options.paymentId,
  351 + openid: getApp().openid,
  352 + }).then(res => {
  353 + if (res.ret == 200) {
  354 + wx.requestPayment({
  355 + timeStamp: res.data.timeStamp + '',
  356 + nonceStr: res.data.nonceStr,
  357 + package: res.data.package,
  358 + signType: res.data.signType,
  359 + paySign: res.data.paySign,
  360 + success(ress) {
  361 + if (ress.errMsg == 'requestPayment:ok') {
  362 + console.log('支付成功', ress);
  363 + this.setData({
  364 + paymentStatus:'1'
  365 + })
  366 + return wx.showToast({
  367 + title: '支付成功',
  368 + icon: 'success'
  369 + })
  370 + }
  371 + console.log('支付失败', ress);
  372 + wx.showToast({
  373 + title: '支付失败，请重新支付',
  374 + icon: 'none',
  375 + })
  376 + },
  377 + fail(ress) {
  378 + console.log('支付失败', ress);
  379 + wx.showToast({
  380 + title: '支付失败，请重新支付',
  381 + icon: 'none',
  382 + })
  383 + },
  384 + })
  385 + }
  386 + })
  387 + },
311 // 客户经理获取基本信息 388 // 客户经理获取基本信息
312 getstaffinfo(uid, sid) { 389 getstaffinfo(uid, sid) {
313 console.log('sellerid', this.data.detail.seller.id); 390 console.log('sellerid', this.data.detail.seller.id);
@@ -94,6 +94,13 @@ @@ -94,6 +94,13 @@
94 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text> 94 <text wx:if="{{marketing.is_comments_coupon=='1'}}">想吐槽？戳这里填写意见反馈赢好礼！</text>
95 <image src="https://qn.colorcun.com/evaluate.png" mode="" /> 95 <image src="https://qn.colorcun.com/evaluate.png" mode="" />
96 </view> 96 </view>
  97 + <view class="reserveBox" wx:if="{{reserveData && (reserveData.title || reserveData.content)}}">
  98 + <view class="title font36r" wx:if="{{reserveData.title}}">{{reserveData.title}}</view>
  99 + <block wx:for="{{reserveData.content}}" wx:key="index">
  100 + <image class="items" wx:if="{{item.type =='1'}}" src="{{item.content}}" mode="widthFix"/>
  101 + <view class="items font24r" wx:if="{{item.type == '2'}}">{{item.content}}</view>
  102 + </block>
  103 + </view>
97 <!-- 餐厅介绍图文分开 --> 104 <!-- 餐厅介绍图文分开 -->
98 <view class="introduce" wx:if="{{store}}"> 105 <view class="introduce" wx:if="{{store}}">
99 <view class="imgMask"> 106 <view class="imgMask">
@@ -196,9 +203,10 @@ @@ -196,9 +203,10 @@
196 <image src="https://qn.colorcun.com/jt1.png" mode="" /> 203 <image src="https://qn.colorcun.com/jt1.png" mode="" />
197 </view> 204 </view>
198 </scroll-view> 205 </scroll-view>
199 -<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1'}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">  
200 - <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="secondbook" style="position: relative;">再次预订 206 +<view wx:if="{{marketing.is_transpond=='1' || marketing.is_online_book=='1' || (options.paymentId && paymentStatus == '0')}}" class="{{between?'all-button flex-lr between':'all-button flex-lr sharewidth'}}">
  207 + <view wx:if="{{marketing.is_online_book=='1'}}" class="book-item-font second-book-button flex-cc font30r moreBtn" bindtap="secondbook" style="position: relative;">再次预订
201 </view> 208 </view>
  209 + <view wx:if="{{options.paymentId && paymentStatus == '0'}}" class="book-item-font second-book-button flex-cc font30r" bindtap="paymentFun">支付定金</view>
202 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人 210 <button wx:if="{{marketing.is_transpond=='1'}}" class="book-item-font flex-cc font30r shareItem" open-type="share">转发给客人
203 </button> 211 </button>
204 </view> 212 </view>
@@ -241,7 +241,7 @@ @@ -241,7 +241,7 @@
241 margin: 0 0 20rpx 20rpx; 241 margin: 0 0 20rpx 20rpx;
242 color: #515151; 242 color: #515151;
243 font-family: PingFang SC; 243 font-family: PingFang SC;
244 - font-size: 20rpx; 244 + font-size: 24rpx;
245 max-height: 400rpx; 245 max-height: 400rpx;
246 overflow: hidden; 246 overflow: hidden;
247 white-space: pre-line; 247 white-space: pre-line;
@@ -465,6 +465,14 @@ @@ -465,6 +465,14 @@
465 border: 2rpx solid #0143A3; 465 border: 2rpx solid #0143A3;
466 } 466 }
467 467
  468 +.moreBtn{
  469 + width: 100%;
  470 +}
  471 +
  472 +.sharewidth .moreBtn {
  473 + width: 100% !important;
  474 +}
  475 +
468 .between .shareItem { 476 .between .shareItem {
469 width: 100%; 477 width: 100%;
470 margin: 0; 478 margin: 0;
@@ -523,6 +531,21 @@ @@ -523,6 +531,21 @@
523 font-size: 28rpx; 531 font-size: 28rpx;
524 } 532 }
525 533
  534 +.reserveBox{
  535 + margin: 20rpx 40rpx 0 40rpx;
  536 +}
  537 +.reserveBox .title{
  538 + margin-bottom: 20rpx;
  539 + color: #000;
  540 + font-family: PingFang SC;
  541 +}
  542 +
  543 +.reserveBox .items{
  544 + margin-bottom: 20rpx;
  545 + color: #000;
  546 + font-family: PingFang SC;
  547 +}
  548 +
526 .more { 549 .more {
527 height: 80rpx; 550 height: 80rpx;
528 width: 100%; 551 width: 100%;
@@ -73,7 +73,8 @@ Page({ @@ -73,7 +73,8 @@ Page({
73 url = '/pages/customer/detail_owner_invitation6'; 73 url = '/pages/customer/detail_owner_invitation6';
74 } 74 }
75 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid; 75 url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid;
76 - console.log('url', url); 76 + url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ;
  77 + console.log('跳转路径url', url);
77 wx.redirectTo({ 78 wx.redirectTo({
78 url 79 url
79 }) 80 })
@@ -736,4 +736,19 @@ export default { @@ -736,4 +736,19 @@ export default {
736 openid:'openid' 736 openid:'openid'
737 }, 737 },
738 738
  739 + // 用户从邀请函支付定金
  740 + 'App.PayOnline.CombineTransactionsByDeposit':{
  741 + openid:'openid'
  742 + },
  743 +
  744 + // 通过定金ID查收定金详情
  745 + 'App.Reserve.GetReserveDepositByid':{
  746 + openid:'openid'
  747 + },
  748 +
  749 + // 获取预订详情自定义图文
  750 + 'App.Reserve.GetReserveImgText':{
  751 + openid:'openid'
  752 + },
  753 +
739 } 754 }