Commit d1e747d20809ac9fb07a77877d66c3fdfb252ade

Authored by yiren
1 parent 80ed847f

券和充值

@@ -64,19 +64,15 @@ Page({ @@ -64,19 +64,15 @@ Page({
64 }, 64 },
65 // 去详情或者去评价 65 // 去详情或者去评价
66 todetail(e) { 66 todetail(e) {
67 - let id=e.currentTarget.dataset['id'];  
68 - let examine=e.currentTarget.dataset['examine'];  
69 - let expire=e.currentTarget.dataset['expire'];  
70 - let sellername=e.currentTarget.dataset['name'];  
71 - let sid=e.currentTarget.dataset['sid'];  
72 - console.log('todetailid',id);  
73 - if(expire=='0' && examine=='0'){ 67 + let item=e.currentTarget.dataset['item'];
  68 + if(item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'){
74 wx.navigateTo({ 69 wx.navigateTo({
75 - url: '/pack-activity/pack/examineCertificate?id='+id, 70 + url: '/pack-activity/pack/examineCertificate?id='+item.id,
76 }) 71 })
77 - }else{ 72 + }
  73 + if(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'){
78 wx.navigateTo({ 74 wx.navigateTo({
79 - url: `/pages/pinglun/create?oid=${id}&sellername=${sellername}&sid=${sid}&types=3`, 75 + url: `/pages/pinglun/create?oid=${item.id}&sellername=${item.recharge_name}&sid=${item.sellerid}&types=3`,
80 }) 76 })
81 } 77 }
82 }, 78 },
@@ -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" bindtap="todetail" data-id="{{item.id}}" data-examine="{{item.is_examine}}" data-expire="{{item.is_expire}}" data-name="{{item.recharge_name}}" data-sid="{{item.sellerid}}"> 6 + <view wx:for="{{list}}" class="card bg-white">
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.recharge_name}}</view> 9 <view class="smooth font-siny font32r" wx:if="{{item.recharge_name}}">{{item.recharge_name}}</view>
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
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'}}" 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'}}" class="flex-cc card-info font30r font-bold smooth">去评价</button> 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>
23 <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view> 23 <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
24 </view> 24 </view>
25 </block> 25 </block>