bug修复

496_dongfengqichen/pages/lookPrizeDetail/lookPrizeDetail.wxml

@@ -20,17 +20,33 @@
         <view class="exchangeCode">{{lookIndex.couponCode || lookIndex.productCode || ''}}
           <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
         </view>
-        <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image>
+        <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
+      </view>
+    </view>
+    <view wx:if="{{lookIndex.awardId == 9 || lookIndex.awardId == 11}}">
+      <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>
+      <view style="position: relative;">
+        <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_2_'+showType+'.png?v=004'}}" style="width:750rpx;" mode="widthFix"></image>
+        <view class="image6Btn3" wx:if="{{showType!=1}}" bindtap="showTypeControl" data-type="1"></view>
+        <view class="image6Btn4" wx:if="{{showType!=2}}" bindtap="showTypeControl" data-type="2"></view>
+        <view class="image6Btn5" wx:if="{{showType!=3}}" bindtap="showTypeControl" data-type="3"></view>
+      </view>
+      <view style="position: relative;">
+        <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_3.png'}}" style="width:750rpx;" mode="widthFix"></image>
+        <view class="exchangeCode" style="top:520rpx;">{{lookIndex.couponCode || lookIndex.productCode || ''}}
+          <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
+        </view>
+        <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
       </view>
     </view>
     <view wx:if="{{lookIndex.awardId == 13 || lookIndex.awardId == 14 || lookIndex.awardId == 16 || lookIndex.awardId == 17}}">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/'+lookIndex.awardId+'_1.png'}}" style="width:750rpx;" mode="widthFix"></image>
-      <view style="position: relative;">
+      <view style="position: relative;" wx:if="{{lookIndex.awardId != 16 && lookIndex.awardId != 17}}">
         <image src="{{imgUrl+'/newImages3/prizeDetail2/13_2.png'}}" style="width:750rpx;" mode="widthFix"></image>
         <view class="exchangeCode" style="top:100rpx;">{{lookIndex.couponCode || lookIndex.productCode || ''}}
           <image class="copyBtn" bindtap="copyExchangeCode" src="{{imgUrl+'/images/copyBtn.png'}}"></image>
         </view>
-        <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image>
+        <!-- <image class="newImages3-37" src="{{imgUrl+'/newImages3/37.png'}}"></image> -->
       </view>
     </view>
   </view>

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -77,7 +77,7 @@ Page({
         awardName: "小米扫地机器人", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
         productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 2
       },
@@ -86,7 +86,7 @@ Page({
         awardName: "索尼无线蓝牙耳机", //奖品名称
         awardPicurl: "https://xingb.venucia.com/award/10_1.png",//奖品小图
         productCode: "3cce61eac692e0dd37f0330dd2bb4df7",//奖品兑换码
-        awardState: 0,
+        awardState: 1,
         cdate: "2020-03-23",
         awardId: 3
       },
@@ -615,27 +615,16 @@ Page({
   },
   lookDesc:function(e){//查看奖品详情
     var index = e.currentTarget.dataset.index;
-    this.setData({
-      lookIndex: (index || index == 0) ? this.data.recordList[index]:null,
-      lookPrizeDetail: !this.data.lookPrizeDetail
-    })
-    // if (this.data.descFrameShow){
-    //   this.setData({
-    //     descFrameShow: !this.data.descFrameShow,
-    //   })
-    //   return;
-    // }
-    // if (this.data.recordList[e.currentTarget.dataset.value].awardState == 0){
-    //   this.setData({
-    //     mycenterTipWindow:this.data.isAddress?2:1,
-    //     lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
-    //   })
-    // } else {
-    //   this.setData({
-    //     descFrameShow: !this.data.descFrameShow,
-    //     lookDescId: e.currentTarget.dataset.value || e.currentTarget.dataset.value == 0 ? e.currentTarget.dataset.value : null
-    //   })
-    // }
+    if (index && this.data.recordList[index].awardState == 0 && !this.data.isAddress){
+      this.setData({
+        mycenterTipWindow:1,
+      })
+    } else {
+      this.setData({
+        lookIndex: (index || index == 0) ? this.data.recordList[index] : null,
+        lookPrizeDetail: !this.data.lookPrizeDetail
+      })
+    }
   },
   lookRule: function (e) {//查看奖品详情
     this.setData({