Browse Source

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

bobo 3 years ago
parent
commit
b6388fc62c

+ 1 - 1
pages/luckDraw/profile.wxml

@@ -37,7 +37,7 @@
 
   <!-- 奖品 -->
   <view hidden="{{hidden2}}">
-    <view class="prize-content flex-row" wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}" data-src="{{item.fullGoodsBigImage}}" catchtap="toLookHitPhoto">
+    <view class="prize-content flex-row" wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}" data-src="{{item.goodsData.fullPhotoUrl}}" catchtap="toLookHitPhoto">
       <view class="coupon-content">
         <view class="coupon-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
         <view class="coupon-data flex-row">

+ 1 - 1
pages/luckDraw/recordPrize.wxml

@@ -18,7 +18,7 @@
     </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 flex-row" data-src="{{item.goodsData.fullPhotoUrl}}" catchtap="toLookHitPhoto">
       <view class="record-content">
         <view class="record-title over-ellipsis">{{item.goodsName?item.goodsName:'未设置名称'}}</view>
         <view class="record-data flex-row">

+ 1 - 1
pages/signIn/record/record.wxml

@@ -56,7 +56,7 @@
               </view>
               <view class="coupon-right">
                 <view class="{{item.coupon.couponType == 'C'?'coupon-right-usenow flex-row':'coupon-right-usenow2 flex-row'}}">
-                  <navigator class="btn_exchange" target="miniProgram" app-id="wxd92a2d29f8022f40" path="page/index/index" open-type='navigate'>
+                  <navigator class="btn_exchange" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" open-type='navigate'>
                   </navigator>
                 </view>
               </view>

+ 2 - 2
pages/welfareMall/historical/historical.wxml

@@ -3,7 +3,7 @@
 <view class="historical flex-column">
   <view class="historical-style flex-column">
     <!-- 内容 -->
-    <view class="historical-content flex-column" wx:for="{{orderList}}" wx:key="index" data-ordersn="{{item.orderSn}}">
+    <view class="historical-content flex-column" wx:for="{{orderList}}" wx:key="index" data-ordersn="{{item.orderSn}}" catchtap="getCompletion">
       <view class="content-hm flex-column">
         <view class="content-head flex-row">
           <view class="content-head-date">{{item.payedAt}}</view>
@@ -21,7 +21,7 @@
         </view>
       </view>
       <view class="content-line"></view>
-      <view class="content-lower" data-ordersn="{{item.orderSn}}" catchtap="getCompletion">
+      <view class="content-lower">
         <view class="lower-total">共{{item.goodsList.length}}件商品 合计¥{{item.payPriceFormatter}}</view>
         <view class="lower-order-style flex-row">
           <view class="lower-order-text">订单详情</view>