Merge branch 'jeffrey/feat/coupon-center' of http://git.ahamu.cn:9202/xing.li/share_activity into jeffrey/feat/coupon-center

pages/luckDraw/profile.wxml

@@ -15,20 +15,22 @@
   <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">请登录</button>
   <!-- 优惠券内容 -->
   <view hidden="{{hidden1}}">
-    <navigator wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}" class="coupon flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
-      <view class="coupon-content">
-        <view class="coupon-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
-        <view class="coupon-data flex-row">
-          <view class="coupon-data-time">{{item.createTime}}</view>
-          <view class="coupon-refund flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
-            <view class="lower-coupon-text">立即使用</view>
+    <view wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}">
+      <navigator class="coupon flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
+        <view class="coupon-content">
+          <view class="coupon-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
+          <view class="coupon-data flex-row">
+            <view class="coupon-data-time">{{item.createTime}}</view>
+            <view class="coupon-refund flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
+              <view class="lower-coupon-text">立即使用</view>
+            </view>
           </view>
         </view>
-      </view>
-      <view class="coupon-img flex-column">
-        <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}"></image>
-      </view>
-    </navigator>
+        <view class="coupon-img flex-column">
+          <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}"></image>
+        </view>
+      </navigator>
+    </view>
     <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂无可用优惠券 ————</view>
     <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>
   </view>
@@ -46,7 +48,7 @@
         </view>
       </view>
       <view class="coupon-img flex-column">
-        <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}" ></image>
+        <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}"></image>
       </view>
     </view>
     <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂无可领取奖品 ————</view>

pages/luckDraw/recordPrize.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "抽奖记录",
   "usingComponents": {
-    "tab-bar": "./components/tabbar"
+    "tab-bar": "./components/tabbar",
+    "custom-preview-image": "../../components/customPreviewImage/customPreviewImage",
+    "custom-page": "../../components/customPage/customPage"
   }
 }

pages/luckDraw/recordPrize.wxml

@@ -1,22 +1,54 @@
 <!--pages/luckDraw/recordPrize.wxml-->
 <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">请登录</button>
-<navigator class="{{item.isHit == 1?'record flex-row':'no-record flex-row'}}" wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}" target="{{(item.goodsId == 1 || item.goodsId == 2)?'miniProgram':''}}" app-id="wxd92a2d29f8022f40" path="{{(item.goodsId == 1 || item.goodsId == 2)?'pages/index/index':''}}" open-type="{{(item.goodsId == 1 || item.goodsId == 2)?'navigate':''}}" data-src="{{item.fullGoodsBigImage}}" catchtap="{{item.goodsId == 3?'toLookHitPhoto':''}}">
-  <view class="record-content">
-    <view class="record-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
-    <view class="record-data flex-row">
-      <view class="record-data-time">{{item.createTime}}</view>
-      <view class="record-refund flex-row" wx:if="{{item.goodsId == 1 || item.goodsId == 2}}" >
-        <view class="lower-record-text">立即使用</view>
+<view wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}">
+  <block wx:if="{{item.isHit == 1 &&(item.goodsType == 1 || item.goodsType == 2)}}">
+    <navigator class="record flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" open-type="navigate">
+      <view class="record-content">
+        <view class="record-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
+        <view class="record-data flex-row">
+          <view class="record-data-time">{{item.createTime}}</view>
+          <view class="record-refund flex-row">
+            <view class="lower-record-text">立即使用</view>
+          </view>
+        </view>
       </view>
-      <view class="record-refund flex-row" wx:if="{{item.goodsId == 3}}" >
-        <view class="lower-record-text">立即兑换</view>
+      <view class="record-img flex-column">
+        <image class="record-img-url" src="{{item.fullGoodsSmallImage}}"></image>
+      </view>
+    </navigator>
+  </block>
+  <block wx:elif="{{item.isHit == 1 && item.goodsType == 3}}" wx>
+    <view class="record flex-row" data-src="{{item.fullGoodsBigImage}}" catchtap="toLookHitPhoto">
+      <view class="record-content">
+        <view class="record-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
+        <view class="record-data flex-row">
+          <view class="record-data-time">{{item.createTime}}</view>
+          <view class="record-refund flex-row">
+            <view class="lower-record-text">立即兑换</view>
+          </view>
+        </view>
+      </view>
+      <view class="record-img flex-column">
+        <image class="record-img-url" src="{{item.fullGoodsSmallImage}}"></image>
+      </view>
+    </view>
+  </block>
+  <block wx:else="{{item.isHit == 0}}" wx>
+    <view class="no-record flex-row">
+      <view class="record-content">
+        <view class="record-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
+        <view class="record-data flex-row">
+          <view class="record-data-time">{{item.createTime}}</view>
+         
+        </view>
+      </view>
+      <view class="record-img flex-column">
+        <image class="record-img-url" src="{{item.fullGoodsSmallImage}}"></image>
       </view>
     </view>
-  </view>
-  <view class="record-img flex-column">
-    <image class="record-img-url" src="{{item.fullGoodsSmallImage}}"></image>
-  </view>
-</navigator>
+  </block>
+</view>
+
 <view class="no_result" wx:if="{{noResult}}">———— 抱歉，您暂无抽奖记录 ————</view>
 <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>