bobo 3 роки тому
батько
коміт
2033eb5d5b

BIN
images/luck-draw/nogift.png


+ 1 - 1
pages/luckDraw/detail.js

@@ -145,7 +145,7 @@ Page({
             opptyMaxVal: activity.opptyMaxVal || 0,
             opptyMaxVal: activity.opptyMaxVal || 0,
             status: activity.status,
             status: activity.status,
             themePic: activity.themePic || 'https://dy.shpr.top/welfareGo/head-bg-draw.png', // 来个默认值
             themePic: activity.themePic || 'https://dy.shpr.top/welfareGo/head-bg-draw.png', // 来个默认值
-            popBgPic: activity.popBgPic || 'https://ks3-cn-shanghai.ksyun.com/pb001/web/hsay/publicPath/25c1b7b4-a155-4f7d-b36f-de665ffa3e5a.png',
+            popBgPic: activity.popBgPic || 'https://ks3-cn-shanghai.ksyun.com/pb001/web/hsay/publicPath/7e45b12e-43c5-490a-885d-d81b7b0917c2.png',
             boxBgPic: activity.boxBgPic || 'https://dy.shpr.top/welfareGo/gift-box.png',
             boxBgPic: activity.boxBgPic || 'https://dy.shpr.top/welfareGo/gift-box.png',
             bgColor: activity.bgColor || '#BF2637',
             bgColor: activity.bgColor || '#BF2637',
         })
         })

+ 6 - 9
pages/luckDraw/detail.wxml

@@ -82,13 +82,12 @@
         <view class="prize-body">
         <view class="prize-body">
             <view class="prize-title">
             <view class="prize-title">
                 恭喜您中奖了!
                 恭喜您中奖了!
-                <image src="/images/luck-draw/hbar.png" />
             </view>
             </view>
             <view class="prize-subtitle">{{hitResult.goodsName}}</view>
             <view class="prize-subtitle">{{hitResult.goodsName}}</view>
             <view class="prize-figure">
             <view class="prize-figure">
             <!-- 图片封面 -->
             <!-- 图片封面 -->
-            <image wx:if="{{hitResult.goodsBigImage}}" src="{{hitResult.goodsBigImage}}" />
-            <image src="/images/luck-draw/gift.png" wx:else />
+            <image wx:if="{{hitResult.goodsBigImage}}" src="{{hitResult.goodsBigImage}}" mode="aspectFit" />
+            <image src="/images/luck-draw/gift.png" mode="aspectFit" wx:else />
             </view>
             </view>
             <view class="prize-tip">{{hitResult.hitDesc || ""}}</view>
             <view class="prize-tip">{{hitResult.hitDesc || ""}}</view>
             <view class="btns">
             <view class="btns">
@@ -106,17 +105,16 @@
         <view class="prize-body">
         <view class="prize-body">
             <view class="prize-title">
             <view class="prize-title">
                 再接再厉!
                 再接再厉!
-                <image src="/images/luck-draw/hbar.png" />
             </view>
             </view>
             <view class="prize-subtitle">离奖品只差一个手势~</view>
             <view class="prize-subtitle">离奖品只差一个手势~</view>
             <view class="prize-figure">
             <view class="prize-figure">
-            <image src="/images/luck-draw/nogift.png" />
+               <image src="/images/luck-draw/nogift.png" mode="aspectFit" />
             </view>
             </view>
             <view class="prize-tip">点击确认继续抽奖!</view>
             <view class="prize-tip">点击确认继续抽奖!</view>
             <view class="btns">
             <view class="btns">
                 <view class="_btn _share" catchtap="closeDlg">确认</view>
                 <view class="_btn _share" catchtap="closeDlg">确认</view>
             </view>
             </view>
-            <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
+            <image class="_bg" src="{{popBgPic}}" />
         </view>
         </view>
         <view class="_layer" catchtap="closeDlg" />
         <view class="_layer" catchtap="closeDlg" />
     </view>
     </view>
@@ -127,17 +125,16 @@
         <view class="prize-body">
         <view class="prize-body">
             <view class="prize-title">
             <view class="prize-title">
                 再接再厉!
                 再接再厉!
-                <image src="/images/luck-draw/hbar.png" />
             </view>
             </view>
             <view class="prize-subtitle">离奖品只差一个手势~</view>
             <view class="prize-subtitle">离奖品只差一个手势~</view>
             <view class="prize-figure">
             <view class="prize-figure">
-            <image src="/images/luck-draw/nogift.png" />
+            <image src="/images/luck-draw/nogift.png" mode="aspectFit" />
             </view>
             </view>
             <view class="prize-tip">分享可获得更多抽奖机会!</view>
             <view class="prize-tip">分享可获得更多抽奖机会!</view>
             <view class="btns">
             <view class="btns">
                 <button class="_btn _share" open-type="share">分享</button>
                 <button class="_btn _share" open-type="share">分享</button>
             </view>
             </view>
-            <image class="_bg" src="/images/luck-draw/hitdlgbg.png" />
+            <image class="_bg" src="{{popBgPic}}" />
         </view>
         </view>
         <view class="_layer" catchtap="closeDlg" />
         <view class="_layer" catchtap="closeDlg" />
     </view>
     </view>

+ 33 - 49
pages/luckDraw/detail.wxss

@@ -282,16 +282,16 @@
     position: fixed;
     position: fixed;
 }
 }
 .prize-body {
 .prize-body {
-    width: 630rpx;
-    height: 750rpx;
+    width: 750rpx;
+    height: 700rpx;
     position: absolute;
     position: absolute;
-    left: calc(100vw / 2 - 630rpx / 2);
-    top: calc(100vh / 2 - 750rpx / 2);
+    left: calc(100vw / 2 - 750rpx / 2);
+    top: calc(100vh / 2 - 700rpx / 2);
     z-index: 1;
     z-index: 1;
 }
 }
 .prize-body ._bg {
 .prize-body ._bg {
-    width: 630rpx;
-    height: 750rpx;
+    width: 750rpx;
+    height: 700rpx;
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
     top: 0;
     top: 0;
@@ -299,51 +299,42 @@
 }
 }
 
 
 .prize-title {
 .prize-title {
-    width: 534rpx;
+    width: 100vw;
     height: 134rpx;
     height: 134rpx;
     position: absolute;
     position: absolute;
-    left: calc(630rpx / 2 - 534rpx / 2);
-    top: 112rpx;
+    left: 0;
+    top: 57rpx;
     z-index: 0;
     z-index: 0;
     text-align: center;
     text-align: center;
-    font-size: 68rpx;
+    font-size: 32rpx;
     color: #F9635F;
     color: #F9635F;
     font-weight: 800;
     font-weight: 800;
     line-height: 134rpx;
     line-height: 134rpx;
 }
 }
-.prize-title image {
-    width: 534rpx;
-    height: 134rpx;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: -1;
-}
 
 
 .prize-figure {
 .prize-figure {
-    width: 306rpx;
-    height: 216rpx;
+    width: 271rpx;
+    height: 162rpx;
     position: absolute;
     position: absolute;
-    left: 164rpx;
-    top: 365rpx;
+    left: calc(100vw / 2 - 271rpx / 2);
+    top: 229rpx;
 }
 }
 .prize-figure image {
 .prize-figure image {
-    width: 306rpx;
-    height: 216rpx;
+    width: 271rpx;
+    height: 162rpx;
 }
 }
 
 
 .prize-subtitle {
 .prize-subtitle {
     width: 100%;
     width: 100%;
     height: 35rpx;
     height: 35rpx;
-    font-size: 34rpx;
-    color: #fff;
+    font-size: 26rpx;
+    color: #EA443A;
     line-height: 35rpx;
     line-height: 35rpx;
     position: absolute;
     position: absolute;
-    top: 265rpx;
+    top: 198rpx;
     left: 0;
     left: 0;
     text-align: center;
     text-align: center;
     box-sizing: border-box;
     box-sizing: border-box;
-    padding: 0 120rpx;
     overflow: hidden;
     overflow: hidden;
     white-space: nowrap;
     white-space: nowrap;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
@@ -352,48 +343,41 @@
 .prize-tip {
 .prize-tip {
     width: 100%;
     width: 100%;
     font-size: 30rpx;
     font-size: 30rpx;
-    height: 50rpx;
     position: absolute;
     position: absolute;
-    top: 595rpx;
+    top: 426rpx;
     left: 0;
     left: 0;
     text-align: center;
     text-align: center;
     color: #fff;
     color: #fff;
     box-sizing: border-box;
     box-sizing: border-box;
-    padding: 0 60rpx;
     overflow: hidden;
     overflow: hidden;
     white-space: nowrap;
     white-space: nowrap;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
 }
 }
 
 
 .dlg .btns {
 .dlg .btns {
-    height: 96rpx;
+    height: 176rpx;
     width: 100%;
     width: 100%;
     position: absolute;
     position: absolute;
-    top: 651rpx;
+    top: 485rpx;
     display: flex;
     display: flex;
-    justify-content:center;
+    flex-direction: column;
+    justify-content: space-between;
 }
 }
 .dlg .btns ._btn {
 .dlg .btns ._btn {
-    height: 80rpx;
-    background: #FC7A73;
-    border-radius: 28rpx;
-    line-height: 80rpx;
+    height: 72rpx;
+    background: #E14B3F;
+    border-radius: 8rpx;
+    line-height: 70rpx;
     text-align: center;
     text-align: center;
     color: #fff;
     color: #fff;
+    border: 1px solid #FBD09E;
     font-size: 36rpx;
     font-size: 36rpx;
-    font-weight: 600;
-    margin: 0 10rpx;
     box-shadow:rgba(229, 80, 79, 1) 0 0 5px;
     box-shadow:rgba(229, 80, 79, 1) 0 0 5px;
+    width: 388rpx;
+    margin: auto;
+    font-weight: normal;
 }
 }
-.dlg ._confirm {
-    width: 240rpx;
-}
-.dlg ._exchange {
-    width: 240rpx;
-}
-.dlg ._share {
-    width: 400rpx;
-}
+
 .dlg button._share {
 .dlg button._share {
     padding: 0;
     padding: 0;
     margin: 0;
     margin: 0;