xt / xcx-book · Commits

Go to a project

Commit bfd997e6910f52f6cd1e288d20866cc02311a09c

Authored by pengye
1 parent 30e1731f
build: skipped

商家有礼

Inline Side-by-side
Showing 22 changed files with 157 additions and 3 deletions
@@ -687,6 +687,15 @@ Page({ @@ -687,6 +687,15 @@ Page({
687 console.log('GetSellerTemplateConf请求失败'); 687 console.log('GetSellerTemplateConf请求失败');
688 }) 688 })
689 }, 689 },
  690 + // 点击商家有礼
  691 + gotoSellerGift(){
  692 + let url = util.http_build_query({
  693 + id: this.data.detail.id,
  694 + }, '/pages/reserve/sellerGift')
  695 + wx.navigateTo({
  696 + url
  697 + })
  698 + },
690 // 再次预订 699 // 再次预订
691 secondbook() { 700 secondbook() {
692 wx.reportMonitor('1013', 1) 701 wx.reportMonitor('1013', 1)
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image class="giftImg"
  13 + bindtap="gotoSellerGift"
  14 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  15 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
12 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
13 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
14 <view class="positioningBox"> 18 <view class="positioningBox">
@@ -559,6 +559,15 @@ @@ -559,6 +559,15 @@
559 z-index: 200; 559 z-index: 200;
560 } 560 }
561 561
  562 +.giftImg{
  563 + width: 108rpx;
  564 + height: 108rpx;
  565 + position: fixed !important;
  566 + right: 5%;
  567 + top: 33%;
  568 + z-index: 200;
  569 +}
  570 +
562 /* 深中国红 */ 571 /* 深中国红 */
563 .crimson, 572 .crimson,
564 .crimson .positioningBox { 573 .crimson .positioningBox {
@@ -642,6 +642,15 @@ Page({ @@ -642,6 +642,15 @@ Page({
642 console.log('GetSellerTemplateConf请求失败'); 642 console.log('GetSellerTemplateConf请求失败');
643 }) 643 })
644 }, 644 },
  645 + // 点击商家有礼
  646 + gotoSellerGift(){
  647 + let url = util.http_build_query({
  648 + id: this.data.detail.id,
  649 + }, '/pages/reserve/sellerGift')
  650 + wx.navigateTo({
  651 + url
  652 + })
  653 + },
645 // 再次预订 654 // 再次预订
646 secondbook() { 655 secondbook() {
647 wx.reportMonitor('1013', 1) 656 wx.reportMonitor('1013', 1)
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image class="giftImg"
  13 + bindtap="gotoSellerGift"
  14 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  15 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
12 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
13 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
14 <view class="reservationInfo"> 18 <view class="reservationInfo">
@@ -594,6 +594,15 @@ @@ -594,6 +594,15 @@
594 z-index: 200; 594 z-index: 200;
595 } 595 }
596 596
  597 +.giftImg{
  598 + width: 108rpx;
  599 + height: 108rpx;
  600 + position: fixed !important;
  601 + right: 5%;
  602 + top: 33%;
  603 + z-index: 200;
  604 +}
  605 +
597 /* 深中国红 */ 606 /* 深中国红 */
598 .crimson, 607 .crimson,
599 .crimson .positioningBox { 608 .crimson .positioningBox {
@@ -642,6 +642,15 @@ Page({ @@ -642,6 +642,15 @@ Page({
642 console.log('GetSellerTemplateConf请求失败'); 642 console.log('GetSellerTemplateConf请求失败');
643 }) 643 })
644 }, 644 },
  645 + // 点击商家有礼
  646 + gotoSellerGift(){
  647 + let url = util.http_build_query({
  648 + id: this.data.detail.id,
  649 + }, '/pages/reserve/sellerGift')
  650 + wx.navigateTo({
  651 + url
  652 + })
  653 + },
645 // 再次预订 654 // 再次预订
646 secondbook() { 655 secondbook() {
647 wx.reportMonitor('1013', 1) 656 wx.reportMonitor('1013', 1)
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
8 bindtap="stopMusic" 8 bindtap="stopMusic"
9 animation="{{attentionAnim}}" 9 animation="{{attentionAnim}}"
10 /> 10 />
  11 + <image class="giftImg"
  12 + bindtap="gotoSellerGift"
  13 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  14 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
11 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 15 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
12 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 16 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
13 <view class="reservationInfo"> 17 <view class="reservationInfo">
@@ -583,6 +583,15 @@ @@ -583,6 +583,15 @@
583 z-index: 200; 583 z-index: 200;
584 } 584 }
585 585
  586 +.giftImg{
  587 + width: 108rpx;
  588 + height: 108rpx;
  589 + position: fixed !important;
  590 + right: 5%;
  591 + top: 33%;
  592 + z-index: 200;
  593 +}
  594 +
586 /* 深中国红 */ 595 /* 深中国红 */
587 .crimson, 596 .crimson,
588 .crimson .positioningBox { 597 .crimson .positioningBox {
@@ -641,6 +641,15 @@ Page({ @@ -641,6 +641,15 @@ Page({
641 console.log('GetSellerTemplateConf请求失败'); 641 console.log('GetSellerTemplateConf请求失败');
642 }) 642 })
643 }, 643 },
  644 + // 点击商家有礼
  645 + gotoSellerGift(){
  646 + let url = util.http_build_query({
  647 + id: this.data.detail.id,
  648 + }, '/pages/reserve/sellerGift')
  649 + wx.navigateTo({
  650 + url
  651 + })
  652 + },
644 // 再次预订 653 // 再次预订
645 secondbook() { 654 secondbook() {
646 wx.reportMonitor('1013', 1) 655 wx.reportMonitor('1013', 1)
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
8 bindtap="stopMusic" 8 bindtap="stopMusic"
9 animation="{{attentionAnim}}" 9 animation="{{attentionAnim}}"
10 /> 10 />
  11 + <image class="giftImg"
  12 + bindtap="gotoSellerGift"
  13 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  14 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
11 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 15 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
12 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 16 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
13 <view class="reservationInfo"> 17 <view class="reservationInfo">
@@ -583,6 +583,15 @@ @@ -583,6 +583,15 @@
583 z-index: 200; 583 z-index: 200;
584 } 584 }
585 585
  586 +.giftImg{
  587 + width: 108rpx;
  588 + height: 108rpx;
  589 + position: fixed !important;
  590 + right: 5%;
  591 + top: 33%;
  592 + z-index: 200;
  593 +}
  594 +
586 /* 深中国红 */ 595 /* 深中国红 */
587 .crimson, 596 .crimson,
588 .crimson .positioningBox { 597 .crimson .positioningBox {
@@ -593,6 +593,15 @@ Page({ @@ -593,6 +593,15 @@ Page({
593 console.log('GetSellerTemplateConf请求失败'); 593 console.log('GetSellerTemplateConf请求失败');
594 }) 594 })
595 }, 595 },
  596 + // 点击商家有礼
  597 + gotoSellerGift(){
  598 + let url = util.http_build_query({
  599 + id: this.data.detail.id,
  600 + }, '/pages/reserve/sellerGift')
  601 + wx.navigateTo({
  602 + url
  603 + })
  604 + },
596 // 再次预订 605 // 再次预订
597 secondbook() { 606 secondbook() {
598 wx.reportMonitor('1013', 1) 607 wx.reportMonitor('1013', 1)
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image class="giftImg"
  13 + bindtap="gotoSellerGift"
  14 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  15 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
12 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
13 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
14 <view class="titleImg"> 18 <view class="titleImg">
@@ -714,6 +714,15 @@ @@ -714,6 +714,15 @@
714 margin-left: 0; 714 margin-left: 0;
715 } 715 }
716 716
  717 +.giftImg{
  718 + width: 108rpx;
  719 + height: 108rpx;
  720 + position: fixed !important;
  721 + right: 5%;
  722 + top: 33%;
  723 + z-index: 200;
  724 +}
  725 +
717 /* 黑蓝过渡 */ 726 /* 黑蓝过渡 */
718 .blackBlueGradient .titleImg { 727 .blackBlueGradient .titleImg {
719 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%); 728 background: linear-gradient(104.24deg, #42a5ff -57.47%, #000000 55.72%, #42a5ff 182.69%);
@@ -642,6 +642,15 @@ Page({ @@ -642,6 +642,15 @@ Page({
642 console.log('GetSellerTemplateConf请求失败'); 642 console.log('GetSellerTemplateConf请求失败');
643 }) 643 })
644 }, 644 },
  645 + // 点击商家有礼
  646 + gotoSellerGift(){
  647 + let url = util.http_build_query({
  648 + id: this.data.detail.id,
  649 + }, '/pages/reserve/sellerGift')
  650 + wx.navigateTo({
  651 + url
  652 + })
  653 + },
645 // 再次预订 654 // 再次预订
646 secondbook() { 655 secondbook() {
647 wx.reportMonitor('1013', 1) 656 wx.reportMonitor('1013', 1)
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image class="giftImg"
  13 + bindtap="gotoSellerGift"
  14 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  15 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
12 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
13 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
14 <view class="reservationInfo"> 18 <view class="reservationInfo">
@@ -574,6 +574,15 @@ @@ -574,6 +574,15 @@
574 z-index: 200; 574 z-index: 200;
575 } 575 }
576 576
  577 +.giftImg{
  578 + width: 108rpx;
  579 + height: 108rpx;
  580 + position: fixed !important;
  581 + right: 5%;
  582 + top: 33%;
  583 + z-index: 200;
  584 +}
  585 +
577 /* 深中国红 */ 586 /* 深中国红 */
578 .crimson, 587 .crimson,
579 .crimson .positioningBox { 588 .crimson .positioningBox {
@@ -641,6 +641,15 @@ Page({ @@ -641,6 +641,15 @@ Page({
641 console.log('GetSellerTemplateConf请求失败'); 641 console.log('GetSellerTemplateConf请求失败');
642 }) 642 })
643 }, 643 },
  644 + // 点击商家有礼
  645 + gotoSellerGift(){
  646 + let url = util.http_build_query({
  647 + id: this.data.detail.id,
  648 + }, '/pages/reserve/sellerGift')
  649 + wx.navigateTo({
  650 + url
  651 + })
  652 + },
644 // 再次预订 653 // 再次预订
645 secondbook() { 654 secondbook() {
646 wx.reportMonitor('1013', 1) 655 wx.reportMonitor('1013', 1)
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 bindtap="stopMusic" 9 bindtap="stopMusic"
10 animation="{{attentionAnim}}" 10 animation="{{attentionAnim}}"
11 /> 11 />
  12 + <image class="giftImg"
  13 + bindtap="gotoSellerGift"
  14 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  15 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
12 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 16 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
13 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 17 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
14 <view class="reservationInfo"> 18 <view class="reservationInfo">
@@ -583,6 +583,15 @@ @@ -583,6 +583,15 @@
583 z-index: 200; 583 z-index: 200;
584 } 584 }
585 585
  586 +.giftImg{
  587 + width: 108rpx;
  588 + height: 108rpx;
  589 + position: fixed !important;
  590 + right: 5%;
  591 + top: 33%;
  592 + z-index: 200;
  593 +}
  594 +
586 /* 深中国红 */ 595 /* 深中国红 */
587 .crimson, 596 .crimson,
588 .crimson .positioningBox { 597 .crimson .positioningBox {
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav> 3 <nav hasHome id='nav' backgroundColor="{{show_white ? colors : 'transparent'}}" place="{{false}}"></nav>
4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}"> 4 <scroll-view scroll-y class="viewBox viewBox{{StyleType}}">
5 <image wx:if="{{hasValueBroadcast && reserve && reserve.swich_voice && reserve.swich_voice=='1'}}" class="musicImg" src="{{isPlay=='1'?'https://qn.colorcun.com/open.svg':'https://qn.colorcun.com/close.svg'}}" bindtap="stopMusic" animation="{{attentionAnim}}" /> 5 <image wx:if="{{hasValueBroadcast && reserve && reserve.swich_voice && reserve.swich_voice=='1'}}" class="musicImg" src="{{isPlay=='1'?'https://qn.colorcun.com/open.svg':'https://qn.colorcun.com/close.svg'}}" bindtap="stopMusic" animation="{{attentionAnim}}" />
6 - <!-- <image class="giftImg" 6 + <image class="giftImg"
7 bindtap="gotoSellerGift" 7 bindtap="gotoSellerGift"
8 - wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments) || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"  
9 - src="https://nosqn.colorcun.com/sellerGift.png" mode=""/> --> 8 + wx:if="{{(hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0) || (is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1') || (hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && (is_fix!='1' || (is_fix=='1' && dataStr<(recharge_data.exp_date.fix_edate*1))))}}"
  9 + src="https://nosqn.colorcun.com/sellerGift.png" mode=""/>
10 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" /> 10 <image wx:if="{{detail && detail.status =='4'}}" class="cannotImg" src="https://qn.colorcun.com/cancelImg.png" />
11 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" /> 11 <image wx:if="{{options && options.isOrder == '1' && detail.status !='4'}}" class="cannotImg" src="https://qn.colorcun.com/overImg.png" />
12 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;"> 12 <view class="reservationInfo" style="background: url('{{settingUrl}}') no-repeat;background-size:cover;">