bobo 3 年之前
父節點
當前提交
cd2e534f98
共有 3 個文件被更改,包括 81 次插入74 次删除
  1. 75 73
      pages/luckDraw/detail.wxml
  2. 1 0
      pages/luckDraw/profile.wxml
  3. 5 1
      pages/luckDraw/profile.wxss

+ 75 - 73
pages/luckDraw/detail.wxml

@@ -77,89 +77,91 @@
         </view>
     </view>
 
-</view>
-
-<!-- 中奖对话框 -->
-<view class="dlg" wx:if="{{showHitPrizeDlg}}">
-    <view class="prize-body">
-        <view class="prize-title">
-            恭喜您中奖了!
-            <image src="/images/luck-draw/hbar.png" />
-        </view>
-        <view class="prize-subtitle">{{hitResult.goodsName}}</view>
-        <view class="prize-figure">
-           <!-- 图片封面 -->
-           <image wx:if="{{hitResult.goodsBigImage}}" src="{{hitResult.goodsBigImage}}" />
-           <image src="/images/luck-draw/gift.png" wx:else />
-        </view>
-        <view class="prize-tip">{{hitResult.hitDesc || ""}}</view>
-        <view class="btns">
-            <view class="_btn _confirm" catchtap="closeDlg">确定</view>
-            <navigator class="_btn _exchange" 
-            target = "miniProgram" 
-            app-id="wxd92a2d29f8022f40"
-            path="page/index/index"
-            open-type='navigate'>
-                去使用
-            </navigator>
+    <!-- 中奖对话框 -->
+    <view class="dlg" wx:if="{{showHitPrizeDlg}}">
+        <view class="prize-body">
+            <view class="prize-title">
+                恭喜您中奖了!
+                <image src="/images/luck-draw/hbar.png" />
+            </view>
+            <view class="prize-subtitle">{{hitResult.goodsName}}</view>
+            <view class="prize-figure">
+            <!-- 图片封面 -->
+            <image wx:if="{{hitResult.goodsBigImage}}" src="{{hitResult.goodsBigImage}}" />
+            <image src="/images/luck-draw/gift.png" wx:else />
+            </view>
+            <view class="prize-tip">{{hitResult.hitDesc || ""}}</view>
+            <view class="btns">
+                <view class="_btn _confirm" catchtap="closeDlg">确定</view>
+                <navigator class="_btn _exchange" 
+                target = "miniProgram" 
+                app-id="wxd92a2d29f8022f40"
+                path="page/index/index"
+                extra-data="{foo: 'bar'}"
+                open-type='navigate'>
+                    去使用
+                </navigator>
+            </view>
+            <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
         </view>
-        <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
+        <view class="_layer" catchtap="closeDlg" />
     </view>
-    <view class="_layer" catchtap="closeDlg" />
-</view>
 
-<!-- 未中奖对话框 -->
-<view class="dlg" wx:if="{{showNoHitPrizeDlg}}">
-    <view class="prize-body">
-        <view class="prize-title">
-            再接再厉!
-            <image src="/images/luck-draw/hbar.png" />
-        </view>
-        <view class="prize-subtitle">离奖品只差一个手势~</view>
-        <view class="prize-figure">
-           <image src="/images/luck-draw/nogift.png" />
-        </view>
-        <view class="prize-tip">点击确认继续抽奖!</view>
-        <view class="btns">
-            <view class="_btn _share" catchtap="closeDlg">确认</view>
+    <!-- 未中奖对话框 -->
+    <view class="dlg" wx:if="{{showNoHitPrizeDlg}}">
+        <view class="prize-body">
+            <view class="prize-title">
+                再接再厉!
+                <image src="/images/luck-draw/hbar.png" />
+            </view>
+            <view class="prize-subtitle">离奖品只差一个手势~</view>
+            <view class="prize-figure">
+            <image src="/images/luck-draw/nogift.png" />
+            </view>
+            <view class="prize-tip">点击确认继续抽奖!</view>
+            <view class="btns">
+                <view class="_btn _share" catchtap="closeDlg">确认</view>
+            </view>
+            <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
         </view>
-        <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
+        <view class="_layer" catchtap="closeDlg" />
     </view>
-    <view class="_layer" catchtap="closeDlg" />
-</view>
 
 
-<!-- 需要分享显示 -->
-<view class="dlg" wx:if="{{showNeedShareDlg}}">
-    <view class="prize-body">
-        <view class="prize-title">
-            再接再厉!
-            <image src="/images/luck-draw/hbar.png" />
+    <!-- 需要分享显示 -->
+    <view class="dlg" wx:if="{{showNeedShareDlg}}">
+        <view class="prize-body">
+            <view class="prize-title">
+                再接再厉!
+                <image src="/images/luck-draw/hbar.png" />
+            </view>
+            <view class="prize-subtitle">离奖品只差一个手势~</view>
+            <view class="prize-figure">
+            <image src="/images/luck-draw/nogift.png" />
+            </view>
+            <view class="prize-tip">分享可获得更多抽奖机会!</view>
+            <view class="btns">
+                <button class="_btn _share" open-type="share">分享</button>
+            </view>
+            <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
+        </view>
+        <view class="_layer" catchtap="closeDlg" />
+    </view>
+
+    <!-- 状态 -->
+    <view wx:if="{{status != 2}}" class="status_tip_layer" catchtap="turnActivityListPage">
+        <view class="_text" wx:if="{{errMessage}}">
+            <view>{{errMessage}}</view>
         </view>
-        <view class="prize-subtitle">离奖品只差一个手势~</view>
-        <view class="prize-figure">
-           <image src="/images/luck-draw/nogift.png" />
+        <view wx:elif="{{status == 3}}" class="_text">
+            <view>此活动已结束</view>
+            <view>敬请关注其他活动...</view>
         </view>
-        <view class="prize-tip">分享可获得更多抽奖机会!</view>
-        <view class="btns">
-            <button class="_btn _share" open-type="share">分享</button>
+        <view class="_text" wx:else>
+            <view>距活动开启还剩</view>
+            <view>{{countDownTime}}</view>
         </view>
-        <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
     </view>
-    <view class="_layer" catchtap="closeDlg" />
+
 </view>
 
-<!-- 状态 -->
-<view wx:if="{{status != 2}}" class="status_tip_layer" catchtap="turnActivityListPage">
-    <view class="_text" wx:if="{{errMessage}}">
-        <view>{{errMessage}}</view>
-    </view>
-    <view wx:elif="{{status == 3}}" class="_text">
-         <view>此活动已结束</view>
-         <view>敬请关注其他活动...</view>
-    </view>
-    <view class="_text" wx:else>
-        <view>距活动开启还剩</view>
-        <view>{{countDownTime}}</view>
-    </view>
-</view>

+ 1 - 0
pages/luckDraw/profile.wxml

@@ -105,6 +105,7 @@
             target = "miniProgram" 
             app-id="wxd92a2d29f8022f40"
             path="page/index/index"
+            extra-data="{foo: 'bar'}"
             open-type='navigate'> 
             </navigator>
       </view>

+ 5 - 1
pages/luckDraw/profile.wxss

@@ -118,10 +118,14 @@
   right: 26rpx;
 }
 
-.luck-draw-discount1,.luck-draw-discount2,.luck-draw-zkz4,.luck-draw-zkz5,.luck-draw-zkz21,.luck-draw-zkz22,.luck-draw-zkz2,.luck-draw-djz4,.luck-draw-djz5{
+.luck-draw-discount1,.luck-draw-discount2,.luck-draw-zkz21,.luck-draw-zkz22,.luck-draw-zkz2{
   display: inline-block;
 }
 
+.luck-draw-zkz4, .luck-draw-zkz5, .luck-draw-djz4,.luck-draw-djz5 {
+  display: inline;
+}
+
 .luck-draw-discountj,.luck-draw-zkzj{
   display: inline-block;
 }