Commit f581db3c4402096c9b416e83ad0c67005528d177

Authored by “pengye”
1 parent a79801c7

点转发后转发图标依然显示、券列表跳转到券详情或者核销页

@@ -11,7 +11,6 @@ Page({ @@ -11,7 +11,6 @@ Page({
11 dataStr: Date.now() * 1 / 1000, 11 dataStr: Date.now() * 1 / 1000,
12 detail: {}, 12 detail: {},
13 exp_date: {}, 13 exp_date: {},
14 - isShow:'1',  
15 resultCoupon: '', //0未领取 1已领取 14 resultCoupon: '', //0未领取 1已领取
16 }, 15 },
17 /** 16 /**
@@ -177,9 +176,6 @@ Page({ @@ -177,9 +176,6 @@ Page({
177 }).then(res => { 176 }).then(res => {
178 if (res.ret == '200') { 177 if (res.ret == '200') {
179 console.log('转发核销'); 178 console.log('转发核销');
180 - this.setData({  
181 - isShow:'0'  
182 - })  
183 wx.hideShareMenu() 179 wx.hideShareMenu()
184 } 180 }
185 }) 181 })
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </view> 81 </view>
82 </view> 82 </view>
83 <view class="sharewidth" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}"> 83 <view class="sharewidth" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}">
84 - <button wx:if="{{detail.arule.is_share_lose == '1' && isShow=='1'}}" class="shareBtn" open-type="share"> 84 + <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">
85 <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" /> 85 <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />
86 <text class="font24r">分享</text> 86 <text class="font24r">分享</text>
87 </button> 87 </button>
@@ -155,10 +155,11 @@ page { @@ -155,10 +155,11 @@ page {
155 font-weight: 600; 155 font-weight: 600;
156 margin-left: 40rpx; 156 margin-left: 40rpx;
157 background: transparent; 157 background: transparent;
  158 + align-items: center;
158 } 159 }
159 160
160 .shareBtn image { 161 .shareBtn image {
161 - width: 40rpx; 162 + width: 34rpx;
162 height: 40rpx; 163 height: 40rpx;
163 } 164 }
164 165
@@ -69,13 +69,12 @@ Page({ @@ -69,13 +69,12 @@ Page({
69 }, 69 },
70 // 去详情或者去评价 70 // 去详情或者去评价
71 todetail(e) { 71 todetail(e) {
72 - let item=e.currentTarget.dataset['item']; 72 + let item=e.currentTarget.dataset['item'];
73 if(item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'){ 73 if(item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'){
74 - // 免费券 扫商家的付款码 进行使用 74 + // 免费券 跳转到免费券详情
75 if(item.is_type == '3'){ 75 if(item.is_type == '3'){
76 - wx.scanCode({  
77 - success: (res) => {  
78 - } 76 + wx.navigateTo({
  77 + url: '/pack-activity/pack/receiveCoupon?id='+item.id+'&name='+item.sellername+'&sid='+item.sellerid+'&types=3',
79 }) 78 })
80 return 79 return
81 }else{ 80 }else{
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <nav>卡券</nav> 3 <nav>卡券</nav>
4 <scroll-view class="list" style="height:{{contentHeight}}px;" scroll-y> 4 <scroll-view class="list" style="height:{{contentHeight}}px;" scroll-y>
5 <block wx:if="{{list.length>0}}"> 5 <block wx:if="{{list.length>0}}">
6 - <view wx:for="{{list}}" class="card bg-white"> 6 + <view wx:for="{{list}}" class="card bg-white" bindtap="todetail" data-item="{{item}}" >
7 <view class="flex-vl gray-font card-main" style="justify-content:space-between;"> 7 <view class="flex-vl gray-font card-main" style="justify-content:space-between;">
8 <view class="seller-info flex-ll"> 8 <view class="seller-info flex-ll">
9 <view class="smooth font-siny font32r" wx:if="{{item.recharge_name || item.aname}}">{{item.recharge_name || item.aname}}</view> 9 <view class="smooth font-siny font32r" wx:if="{{item.recharge_name || item.aname}}">{{item.recharge_name || item.aname}}</view>
@@ -18,8 +18,7 @@ @@ -18,8 +18,7 @@
18 <image wx:if="{{item.status=='5'}}" src="https://qn.colorcun.com/WechatIMG2.png" class="imgs1" mode="" /> 18 <image wx:if="{{item.status=='5'}}" src="https://qn.colorcun.com/WechatIMG2.png" class="imgs1" mode="" />
19 <image wx:if="{{item.is_examine=='1' && item.is_comment=='1'}}" src="https://qn.colorcun.com/A1.png" class="imgs1" mode="" /> 19 <image wx:if="{{item.is_examine=='1' && item.is_comment=='1'}}" src="https://qn.colorcun.com/A1.png" class="imgs1" mode="" />
20 <!-- is_comment 1已评论 is_examine 1已核销 is_expire 1已过期--> 20 <!-- is_comment 1已评论 is_examine 1已核销 is_expire 1已过期-->
21 - <button wx:if="{{item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}" bindtap="todetail" data-item="{{item}}" class="flex-cc card-info font30r font-bold smooth">去使用</button>  
22 - <button wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}" bindtap="todetail" data-item="{{item}}" class="flex-cc card-info font30r font-bold smooth">去评价</button> 21 + <button wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}" class="flex-cc card-info font30r font-bold smooth">去评价</button>
23 <view class="font24r texts {{(item.is_examine=='1' || item.is_expire=='1' || item.status=='4' || item.status=='5')?'texts2':'texts1' }} smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view> 22 <view class="font24r texts {{(item.is_examine=='1' || item.is_expire=='1' || item.status=='4' || item.status=='5')?'texts2':'texts1' }} smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
24 </view> 23 </view>
25 </block> 24 </block>