Parcourir la source

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

bobo il y a 3 ans
Parent
commit
cd399e7d8c

+ 0 - 4
pages/luckDraw/profile.js

@@ -156,10 +156,6 @@ Page({
      * 页面上拉触底事件的处理函数
     */
     onReachBottom: function () {
-
-    },
-
-    scrollToBottom() {
         if (this.data.lock || this.data.noMore) {
             return
         }

+ 9 - 9
pages/luckDraw/profile.wxml

@@ -15,42 +15,42 @@
   <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">请登录</button>
   <!-- 优惠券内容 -->
   <view hidden="{{hidden1}}">
-    <view wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}" class="coupon flex-row">
+    <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>
-          <navigator class="coupon-refund flex-row" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
+          <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>
-          </navigator>
+          </view>
         </view>
       </view>
       <view class="coupon-img flex-column">
         <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}"></image>
       </view>
-    </view>
+    </navigator>
     <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂无可用优惠券 ————</view>
-    <view class="no_result" wx:if="{{noMore}}">———— 更多优惠券 | 敬请期待 ————</view>
+    <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>
   </view>
 
   <!-- 奖品 -->
   <view hidden="{{hidden2}}">
-    <view class="prize-content flex-row" wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}">
+    <navigator class="prize-content flex-row" wx:for="{{goodsItemList}}" wx:key="index" data-id="{{item.id}}" 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" data-src="{{item.fullGoodsBigImage}}" catchtap="toLookHitPhoto">
-            <view class="lower-coupon-text">立即使用</view>
+            <view class="lower-coupon-text">立即兑换</view>
           </view>
         </view>
       </view>
       <view class="coupon-img flex-column">
         <image class="coupon-img-url" src="{{item.fullGoodsSmallImage}}" ></image>
       </view>
-    </view>
+    </navigator>
     <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂无可领取奖品 ————</view>
-    <view class="no_result" wx:if="{{noMore}}">———— 更多奖品 | 敬请期待 ————</view>
+    <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>
   </view>
 </view>
 <!-- 底部导航 -->

+ 5 - 5
pages/luckDraw/recordPrize.wxml

@@ -1,21 +1,21 @@
 <!--pages/luckDraw/recordPrize.wxml-->
 <button class="luck-draw-cz" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">请登录</button>
-<view class="{{item.isHit == 1?'record flex-row':'no-record flex-row'}}" wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}">
+<navigator class="{{item.isHit == 1?'record flex-row':'no-record flex-row'}}" wx:for="{{userDrawItemList}}" wx:key="index" data-id="{{item.id}}" target="miniProgram" app-id="wxd92a2d29f8022f40" path="{{item.isHit == 1?'pages/index/index':''}}" extra-data="{foo: 'bar'}" open-type="{{item.isHit == 1?'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>
-      <navigator class="record-refund flex-row" wx:if="{{item.isHit == 1}}" target="miniProgram" app-id="wxd92a2d29f8022f40" path="pages/index/index" extra-data="{foo: 'bar'}" open-type='navigate'>
+      <view class="record-refund flex-row" wx:if="{{item.isHit == 1}}" >
         <view class="lower-record-text">立即使用</view>
-      </navigator>
+      </view>
     </view>
   </view>
   <view class="record-img flex-column">
     <image class="record-img-url" src="{{item.fullGoodsSmallImage}}"></image>
   </view>
-</view>
+</navigator>
 <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂无抽奖记录 ————</view>
-<view class="no_result" wx:if="{{noMore}}">———— 更多抽奖 | 敬请期待 ————</view>
+<view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>
 
 
 <!-- 底部导航 -->

+ 1 - 1
pages/welfareMall/activityInfo/activityInfo.wxss

@@ -68,7 +68,7 @@ height: 30px;
 font-size: 28px;
 font-weight: bold;
 color: #B01717;
-margin-top: 24px;
+margin-top: 27px;
 }
 .info_right_bottom{
 height: 15px;