7

mock/draw.ts

@@ -61,24 +61,18 @@ export default [
         "message": "信息xxx",
         "success": true,
         "data": {
-          "boolPrize": true, // true-中奖，取prizeInfo信息，false-未中奖，取productInfo
-          "productInfos": [
-            {
-              "productImg": "//yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",
-              "productText": "介绍1介绍费1介绍1介绍费1介绍1介绍费1介绍1介绍费1介绍1介绍费1介绍1介绍费1介绍1介绍费1介绍1介绍1介绍费1介绍1介绍1介绍费1介绍1介绍1介绍费1介绍1介绍1介绍费1介绍1"
-            },
-            {
-              "productImg": "//yun.duiba.com.cn/polaris/111.8b981b3fc7d090da2457b4f29b9feec496dc95fd.png",
-              "productText": "介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2介绍2"
-            },
-            {
-              "productImg": "//yun.duiba.com.cn/polaris/mgtv.e5f0709a2a4083bc57ce52ff200a50a2e56b2658.png",
-              "productText": "介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3介绍3"
-            }
-          ],
-          "prizeInfo": {
-            "name": `奖品1`,
-            "icon": `//yun.duiba.com.cn/polaris/jinmoqiang.9e5bbc004f69ab6a3f34d93daeda028616a9f00d.png`,
+          "prize": {
+            "ruleId": "ru_draw",
+            "optionId": "ccccdddd",
+            "optionName": "华为手环",
+            "optionImg": "https://www.baidu.com/hw1.png",
+            "prizeId": "sss_3",
+            "prizeType": 2,
+            "position": 1,
+            "userRecordId": 666,
+            "url": "https://www.baidu.com/order/666",
+            "sendCount": 1,
+            "extra": "{}"
           }
         }
       }

src/panels/AwardPopup/index.jsx

@@ -15,7 +15,7 @@ class AwardPopup extends React.Component {
         super(props);
         // console.log('ddddd::::::', props);
         this.state = {
-            prizeInfo: props.prizeInfo
+            prize: props.prize
         };
     }
 
@@ -32,13 +32,14 @@ class AwardPopup extends React.Component {
     }
 
     render() {
+        const { prize } = this.state;
         return (
             <div className="AwardPopup">
                 <div className="ap_mask"></div>
                 <div className='ap_bg'>
                     <div className='ap_txt'>成功获得奖品</div>
-                    <div className='ap_icon' style={{ backgroundImage: `url(${this.state.prizeInfo.icon})` }}></div>
-                    <div className='ap_award_name'>{this.state.prizeInfo.name}</div>
+                    <div className='ap_icon' style={{ backgroundImage: `url(${prize.optionImg})` }}></div>
+                    <div className='ap_award_name'>{prize.optionName}</div>
                     <div className='ap_btn' onClick={() => this.onReceive()}></div>
                 </div>
                 <div className='ap_close' onClick={() => this.onClose()}></div>

src/panels/AwardPopup/index.less

@@ -16,7 +16,7 @@
         position: absolute;
         width: 641px;
         height: 903px;
-        top: 249px;
+        top: 149px;
         left: 55px;
         .sparkBg("awardPopup/award_bg.png");
 
@@ -67,7 +67,7 @@
         width: 66px;
         height: 66px;
         left: 342px;
-        top: 1242px;
+        top: 1142px;
         .sparkBg("awardPopup/close.png");
     } 
 }
\ No newline at end of file

src/panels/FailPopup/index.less

@@ -16,7 +16,7 @@
         position: absolute;
         width: 596px;
         height: 512px;
-        top: 497px;
+        top: 397px;
         left: 77px;
         .sparkBg("failPopup/fail_bg.png");
 
@@ -92,7 +92,7 @@
         width: 66px;
         height: 66px;
         left: 342px;
-        top: 1142px;
+        top: 1042px;
         .sparkBg("failPopup/close.png");
     }
 }
\ No newline at end of file

src/panels/GiftPackPopup/index.jsx

@@ -47,7 +47,6 @@ class GiftPackPopup extends React.Component {
         return (
             <div className="GiftPackPopup" onClick={() => this.onClose()}>
                 <div className="gpp_mask"></div>
-                {/* <div className='gpp_icon'></div> */}
                 <SvgaPlayer className="output1" src={output1Svga} />
             </div>
         );

src/panels/GiftPackPopup/index.less

@@ -15,16 +15,8 @@
         position: absolute;
         width: 750px;
         height: 1179px;
-        top: 200px;
+        top: 100px;
         left: 0px;
         pointer-events: none;
     }
-    .gpp_icon{
-        position: absolute;
-        width: 325px;
-        height: 342px;
-        top: 641px;
-        left: 214px;
-        .sparkBg("giftPackPopup/gift_pack_icon.png");
-    }
 }
\ No newline at end of file

src/panels/NotWinPopup/index.less

@@ -16,7 +16,7 @@
         position: absolute;
         width: 596px;
         height: 392px;
-        top: 576px;
+        top: 476px;
         left: 77px;
         .sparkBg("notWinPopup/nw_bg.png");
 
@@ -35,7 +35,7 @@
         width: 66px;
         height: 66px;
         left: 342px;
-        top: 1072px;
+        top: 972px;
         .sparkBg("notWinPopup/close.png");
     } 
 }
\ No newline at end of file

src/panels/VictoryPopup/index.jsx

@@ -51,6 +51,7 @@ class VictoryPopup extends React.Component {
         return (
             <div className="VictoryPopup">
                 <div className="vp_mask"></div>
+                <div className='vp_bg'>
                     <div className='vp_title'></div>
                     <div className='vp_ditu_txt'>{gotSpInfo.name}地图</div>
                     <div className='vp_guang'></div>
@@ -61,6 +62,7 @@ class VictoryPopup extends React.Component {
                     <div className='vp_btn' onClick={() => this.onDraw()}></div>
                     <div className='vp_close' onClick={() => this.onClose()}></div>
                 </div>
+            </div>
         );
     }
 };

src/panels/VictoryPopup/index.less

@@ -11,11 +11,19 @@
         background: #000;
         opacity: 0.5;
     }
+    .vp_bg{
+        position: absolute;
+        width: 100%;
+        height: auto;
+        top: 280px;
+        left: 0px;
+        .sparkBg("victoryPopup/title.png");
+    }
     .vp_title{
         position: absolute;
         width: 399px;
         height: 57px;
-        top: 333px;
+        top: 0px;
         left: 174px;
         .sparkBg("victoryPopup/title.png");
     }
@@ -26,14 +34,14 @@
         font-size: 38px;
         font-weight: 400;
         color: #fff;
-        top: 407px;
+        top: 74px;
         left: 0px;
     }
     .vp_guang{
         position: absolute;
         width: 641px;
         height: 580px;
-        top: 389px;
+        top: 56px;
         left: 55px;
         .sparkBg("victoryPopup/guang.png");
     }
@@ -41,7 +49,7 @@
         position: absolute;
         width: 287px;
         height: 327px;
-        top: 493px;
+        top: 163px;
         left: 230px;
         background-size: 100% 100%;
         // .sparkBg("victoryPopup/shanghai.png");
@@ -50,7 +58,7 @@
         position: absolute;
         width: 255px;
         height: 73px;
-        top: 860px;
+        top: 527px;
         left: 248px;
         .sparkBg("victoryPopup/cjjh_tips.png");
         line-height: 90px;
@@ -62,7 +70,7 @@
         position: absolute;
         width: 343px;
         height: 106px;
-        top: 1015px;
+        top: 682px;
         left: 204px;
         .sparkBg("victoryPopup/cj_btn.png");
     }
@@ -71,7 +79,7 @@
         width: 66px;
         height: 66px;
         left: 342px;
-        top: 1242px;
+        top: 870px;
         position: absolute;
         .sparkBg("victoryPopup/close.png");
     }