优惠券

src/pages/IntegralMall/IntegralMall.wxml

@@ -2,7 +2,7 @@
 <view class='page-integral-mall' style="padding-bottom: 40rpx">
     <view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
       <view class='coupon-wrap' wx:if="{{integralCouponList.length}}">
-        <view class='coupon-list' wx:for="{{integralCouponList}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}">
+        <view class='coupon-list' wx:for="{{integralCouponList}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}" data-id="{{item.id}}" bindtap="goCouponDetail">
             <image class='coupon-bg' src='/assets/imgs/coupon-bg.png'></image>
             <view class='coupon-img'>
               <image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}'></image>
@@ -11,9 +11,9 @@
             <view class='coupon-info'>
               <view class='coupon-time fs-24'>{{item.point}}积分</view>
               <view class='coupon-name fs-28'>{{item.title}}</view>
-              <view class='coupon-desc fs-24' data-id="{{item.id}}" bindtap="goCouponDetail">查看详情 >>></view>
+              <view class='coupon-desc fs-24'>查看详情 >>></view>
             </view>
-            <view class='coupon-code fs-24' data-id="{{item.id}}" data-point="{{item.point}}" bindtap='exchange'>立即兑换</view>
+            <view class='coupon-code fs-24' data-id="{{item.id}}" data-point="{{item.point}}" catchtap='exchange'>立即兑换</view>
         </view>
       </view>
    <view class='empty-wrap' wx:if="{{!integralCouponList.length}}">

src/pages/IntegralMall/IntegralMall.wxss

@@ -48,7 +48,7 @@
   position: absolute;
   top: 0;
   left: 0;
-  z-index: -1;
+  /* z-index: -1; */
 }
 .coupon-img image{
   width: 172rpx;
@@ -77,6 +77,7 @@
   font-size: 24rpx;
 }
 .coupon-code{
+  height: 208rpx;
   color: #ffffff;
   position: absolute;
   right: 20rpx;

src/pages/coupons/coupons.js

@@ -83,6 +83,7 @@ wxService.page({
     this.getCouponList(1,10,0)
   },
   handelPresentCouponDetail(e) {
+    console.log('1111')
     let {cardno} = e.currentTarget.dataset
     wxService.router(`/pages/couponDetail/couponDetail`).search({cardno})
   },

src/pages/coupons/coupons.wxml

@@ -16,18 +16,18 @@
 							wx:for-index="k"
 							wx:key="{{k}}"
 							>
-								<view>
+								<view data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
 									<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
-									<view class='coupon-img' data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
-										<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
-										<image wx:else src='/assets/imgs/qr-code.png' />
-									</view>
-									<view class='coupon-info' data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
-										<view class='coupon-name fs-28'>{{item.title}}</view>
-										<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
-										<!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
-									</view>
-									<view class='coupon-code fs-24' data-cardNo="{{item.cardNo}}" bindtap="handelPresentCouponCode">出示劵码</view>
+                    <view class='coupon-img' >
+                      <image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
+                      <image wx:else src='/assets/imgs/qr-code.png' />
+                    </view>
+                    <view class='coupon-info'>
+                      <view class='coupon-name fs-28'>{{item.title}}</view>
+                      <view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
+                      <!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
+                    </view>
+									<view class='coupon-code fs-24' data-cardNo="{{item.cardNo}}" catchtap="handelPresentCouponCode">出示劵码</view>
 								</view>
 							</view>
 						</view>

src/pages/coupons/coupons.wxss

@@ -53,7 +53,7 @@ scroll-view{
   position: absolute;
   top: 0;
   left: 0;
-  z-index: -1;
+  /* z-index: -1; */
 }
 .coupon-img image{
   width: 172rpx;

src/pages/integralMallDetail/integralMallDetail.js

@@ -39,6 +39,12 @@ wxService.page({
       const {result,data} = res.data
       if(result == 0){
          wx.hideLoading()
+        data.desc = JSON.parse(data.desc)
+        for (let i in data.desc) {
+          if (data.desc[i].type == 1) {
+            data.desc[i].value = data.startTime.substring(0, 10) + ' 至 ' + data.endTime.substring(0, 10)
+          }
+        }
          this.setData({
             integralMallDetail: data
          })

src/pages/integralMallDetail/integralMallDetail.wxml

@@ -13,10 +13,16 @@
 			</view>
 			<view class='coupon-code fs-24' bindtap='exchange'>立即兑换</view>
 		</view>
-		<view class='integral-detail' wx:if="{{integralMallDetail.desc}}">
+     <view class='integral-detail'>
+      <view class='integral-list' wx:for="{{integralMallDetail.desc}}" wx:key="{{index}}">
+        <text class='integral-title'>{{item.label}}</text>
+        <text class='integral-desc'>{{item.value}}</text>
+      </view>
+    </view>
+		<!-- <view class='integral-detail' wx:if="{{integralMallDetail.desc}}">
 			<image src='{{integralMallDetail.desc}}' mode="widthFix" style="width: 100%;"></image>
-		 <!-- <button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>-->
-		</view>
+		 <button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
+		</view> -->
 	</view>
 </view>
 <view class="position-bottom">

src/project.config.json

@@ -19,7 +19,7 @@
 		"hidedInDevtools": []
 	},
 	"isGameTourist": false,
-	"condition": {
+	"condition": { 
 		"search": {
 			"current": -1,
 			"list": []