xt / xcx-book · Commits

Go to a project

Commit 71d1813bc7ee0160c281663519c5945219a1ee9b

Authored by pengye
1 parent 8306a4bd
build: skipped

商家有礼展示未领取的券

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view class="sign"></view><text class="font28r">专属优惠券</text> 6 <view class="sign"></view><text class="font28r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 - <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 + <navigator wx:if="{{item.resultCoupon || !item.resultCoupon || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
10 <view class="couponWrap"> 10 <view class="couponWrap">
11 <view class="itemLeft"> 11 <view class="itemLeft">
12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </block> 41 </block>
42 </view> 42 </view>
43 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 43 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
44 - <view class="font24r orderingFood orderingFood1">已领取</view> 44 + <view class="font24r orderingFood {{item.resultCoupon == '1'?'orderingFood1':'orderingFood2'}}">{{item.resultCoupon == '1'?'已领取':'领取'}}</view>
45 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 45 <view class="grantNum" wx:if="{{item.receiveNumText}}">
46 <view class="font24r">已被领取</view> 46 <view class="font24r">已被领取</view>
47 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 47 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -43,6 +43,7 @@ Page({ @@ -43,6 +43,7 @@ Page({
43 * 生命周期函数--监听页面加载 43 * 生命周期函数--监听页面加载
44 */ 44 */
45 onLoad(options) { 45 onLoad(options) {
  46 + console.log('options',options);
46 // 新传参是sid 老页面传参是id 47 // 新传参是sid 老页面传参是id
47 if (options.sid || options.id) { 48 if (options.sid || options.id) {
48 let sid = options.sid || options.id 49 let sid = options.sid || options.id