Commit a63afeff authored by 徐士卿's avatar 徐士卿

feat:merge

parent ce9f9b6b
......@@ -50,13 +50,13 @@ module.exports = {
"GET /draw/doDraw.do": {
"code": null,
"data": {
"prizeId": "thanks2",
"prizeName": "奖品11111",
"prizeId": "",
"prizeName": "谢谢参与",
"prizeImg": "https://yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",
"productInfos": {
"productId": "1",
"productInfos": [{
"productImg": "//yun.duiba.com.cn/polaris/1.7e95eb40b81b5b15997565f27d7ba22283010265.png",
"productImg": "https://yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",
"productText": "养老专属年龄广,裕享岁月财富长,三五交费投入短,保障期间随心选。"
}, {
"productImg": "//yun.duiba.com.cn/polaris/%E7%BB%84%2093704.1121f8d0e44dee56fbe1d8aa8cabad8312036c55.png",
......
{"preLoadImg":[],"asyncLoadImg":["CodePop/bg.png","CodePop/code.png","ConfirmPop/bg.png","ConfirmPop/cancel.png","ConfirmPop/confirm.png","FillAddress/填写收货地址.png","FillAddress/提交信息按钮-不可点击.png","FillAddress/提交信息按钮-可点击.png","FillAddress/直线.png","FillAddress/返回按钮.png","FillAddress/选择按钮.png","GuidePop/bg.png","GuidePop/btn.png","GuidePop/card.png","GuidePop/ip.png","GuidePop/ip2.png","GuidePop/light.png","GuidePop/prize.png","GuidePop/title.png","GuidePop/upload.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","LoginPop/bg.png","LoginPop/canSubmitBtn.png","LoginPop/cannotSubmit.png","NoPrizeCard/bg.png","NoPrizeCard/bg2.png","NoPrizeCard/camera.png","NoPrizeCard/exchange.png","NoPrizeCard/exchange2.png","NoPrizeCard/prizeImg.png","NoPrizeCard/title.png","PrivacyPop/bg.png","PrizePage/back.png","PrizePage/bg.png","PrizePage/bg2.png","PrizePage/bg_item.png","PrizePage/go-btn.png","PrizePage/gray_btn.png","PrizePage/img.png","PrizePage/stick.png","PrizePop/bg.png","RankNoPrizePop/bg.png","RankNoPrizePop/know.png","RankPrizePop/bg.png","RankPrizePop/light.png","RankPrizePop/prizePicture.png","ReviewFailedPop/bg.png","ReviewFailedPop/reSubmit.png","ReviewSucPop/chou.png","ReviewSucPop/gift.png","ReviewSucPop/light.png","ReviewSucPop/title.png","RulePop/bg.png","SVG/1输出闪亮瞬间标题.svga","SVG/2输出去拜访icon.svga","SVG/3输出首页氛围.svga","SVG/4输出弹窗氛围.svga","SVG/5输出点击切换.svga","SVG/6输出礼盒氛围.svga","SVG/7输出礼盒动效.svga","SaleManPage/IP.png","SaleManPage/PeizeList_item_bg.png","SaleManPage/PictureBG.png","SaleManPage/bg.png","SaleManPage/bianhaoBg.png","SaleManPage/good.png","SaleManPage/idbg.png","SaleManPage/iptxt.png","SaleManPage/logo.png","SaleManPage/man.png","SaleManPage/music_close.png","SaleManPage/music_open.png","SaleManPage/myPhoto.png","SaleManPage/myRank.png","SaleManPage/myRank_btn.png","SaleManPage/nothing.png","SaleManPage/pass.png","SaleManPage/pic.png","SaleManPage/pictureList_item_bianhaoBg.png","SaleManPage/prize.png","SaleManPage/rank.png","SaleManPage/rule.png","SaleManPage/shareBtn.png","SaleManPage/smalltitle.png","SaleManPage/title.png","SaleManPage/uoloadBtn.png","SaleManPage/uploadBg.png","SaleManPage/visit.png","SaleManPage/wait.png","SaleManPage/woman.png","TaskPop/already_btn.png","TaskPop/bg.png","TaskPop/bg_item.png","TaskPop/close.png","TaskPop/complete_btn.png","TaskPop/icon.png","TaskPop/longBackBtn.png","TaskPop/receive_btn.png","TaskPop/toShare_btn.png","UploadPop/bg.png","UploadPop/btn.png","UploadPop/cancel.png","UploadPop/confirm.png","UploadPop/gary_confirm.png","UploadPop/uplaod.png","UploadPop/white.png","commentPop/bg.png","commentPop/btn.png","commentPop/close.png","common/back.png","common/closeBtn.png","common/happyBtn.png","common/light.png","common/task.png","drawChancePop/bg.png","drawChancePop/know_btn.png","drawChancePop/light.png","drawPage/bg.png","drawPage/cover.png","drawPage/draw_btn.png","drawPage/pointer.png","drawPage/prize_info_bg.png","drawPage/prize_info_laba.png","drawPage/turantable_bg.png","drawPage/turantable_box.png","likeLogPage/back.png","likeLogPage/bg.png","likeLogPage/item_line.png","likeLogPage/list_bg.png","likeLogPage/title.png","music/bgm.mp3","noPointPop/bg.png","noPointPop/btn.png","noPointPop/close.png","noPointPop/li8ght.png","opusPage/avatar.png","opusPage/back.png","opusPage/bg.png","opusPage/bg2.png","opusPage/big_pinglun.png","opusPage/dianzan.png","opusPage/infobg.png","opusPage/line.png","opusPage/pinglun.png","opusPage/zan.png","pointSucPop/bg.png","pointSucPop/box.png","pointSucPop/btn.png","pointSucPop/close.png","pointSucPop/light.png","pop_winPrize/prizeImg.png","pop_winPrize/wp_background.png","pop_winPrize/wp_closeButton.png","pop_winPrize/wp_light.png","pop_winPrize/wp_receiveButton.png","sharePage/agentBg.png","sharePage/assist_btn.png","sharePage/assist_text.png","sharePage/bg.png","sharePage/btn.png","sharePage/hand.png","sharePage/join_btn.png","sharePage/logo.png","sharePage/normal.png","sharePage/share_btn.png","sharePage/zanBg.png","sharePage/zanBtn.png","userHomePage/bg.jpg","userHomePage/logo.png","userHomePage/prizeBg.png","userHomePage/prizeBg1.png","userHomePage/prizeBg2.png","userHomePage/prizeBg3.png","userHomePage/prizeBg4.png","userHomePage/rank1.png","userHomePage/rank2.png","userHomePage/rank3.png","userHomePage/rankTitle.png","userHomePage/rankTop.png","userHomePage/subBg.png","userHomePage/timeNumBg.png","userHomePage/uidbg.png","userHomePage/分享好友.png","userHomePage/奖品.png","userHomePage/抽奖.png","userHomePage/拜访清单.png","userHomePage/按钮.png","userHomePage/标题.png","userHomePage/瓜分攻略.png","userHomePage/规则.png","userHomePage/邀请明细.png","yinsirulepop/bg.png","yinsirulepop/btn.png","yinsirulepop/close.png"]}
\ No newline at end of file
{"preLoadImg":[],"asyncLoadImg":["CodePop/bg.png","CodePop/code.png","ConfirmPop/bg.png","ConfirmPop/cancel.png","ConfirmPop/confirm.png","FillAddress/填写收货地址.png","FillAddress/提交信息按钮-不可点击.png","FillAddress/提交信息按钮-可点击.png","FillAddress/直线.png","FillAddress/返回按钮.png","FillAddress/选择按钮.png","GuidePop/bg.png","GuidePop/btn.png","GuidePop/card.png","GuidePop/ip.png","GuidePop/ip2.png","GuidePop/light.png","GuidePop/prize.png","GuidePop/title.png","GuidePop/upload.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","LoginPop/bg.png","LoginPop/canSubmitBtn.png","LoginPop/cannotSubmit.png","NoPrizeCard/bg.png","NoPrizeCard/bg2.png","NoPrizeCard/exchange.png","NoPrizeCard/exchange2.png","NoPrizeCard/picture.png","NoPrizeCard/prizeImg.png","PrivacyPop/bg.png","PrizePage/back.png","PrizePage/bg.png","PrizePage/bg2.png","PrizePage/bg_item.png","PrizePage/go-btn.png","PrizePage/gray_btn.png","PrizePage/img.png","PrizePage/stick.png","PrizePop/bg.png","RankNoPrizePop/bg.png","RankNoPrizePop/know.png","RankPrizePop/bg.png","RankPrizePop/light.png","RankPrizePop/prizePicture.png","ReviewFailedPop/bg.png","ReviewFailedPop/reSubmit.png","ReviewSucPop/chou.png","ReviewSucPop/gift.png","ReviewSucPop/light.png","ReviewSucPop/title.png","RulePop/bg.png","SaleManPage/IP.png","SaleManPage/PeizeList_item_bg.png","SaleManPage/PictureBG.png","SaleManPage/bg.png","SaleManPage/bianhaoBg.png","SaleManPage/good.png","SaleManPage/idbg.png","SaleManPage/iptxt.png","SaleManPage/logo.png","SaleManPage/man.png","SaleManPage/music_close.png","SaleManPage/music_open.png","SaleManPage/myPhoto.png","SaleManPage/myRank.png","SaleManPage/myRank_btn.png","SaleManPage/nothing.png","SaleManPage/pass.png","SaleManPage/pic.png","SaleManPage/pictureList_item_bianhaoBg.png","SaleManPage/prize.png","SaleManPage/rank.png","SaleManPage/rule.png","SaleManPage/shareBtn.png","SaleManPage/smalltitle.png","SaleManPage/title.png","SaleManPage/uoloadBtn.png","SaleManPage/uploadBg.png","SaleManPage/visit.png","SaleManPage/wait.png","SaleManPage/woman.png","TaskPop/already_btn.png","TaskPop/bg.png","TaskPop/bg_item.png","TaskPop/close.png","TaskPop/complete_btn.png","TaskPop/icon.png","TaskPop/longBackBtn.png","TaskPop/receive_btn.png","TaskPop/toShare_btn.png","UploadPop/bg.png","UploadPop/btn.png","UploadPop/cancel.png","UploadPop/confirm.png","UploadPop/gary_confirm.png","UploadPop/uplaod.png","UploadPop/white.png","commentPop/bg.png","commentPop/btn.png","commentPop/close.png","common/back.png","common/closeBtn.png","common/happyBtn.png","common/light.png","common/task.png","drawChancePop/bg.png","drawChancePop/know_btn.png","drawChancePop/light.png","drawPage/bg.png","drawPage/cover.png","drawPage/draw_btn.png","drawPage/pointer.png","drawPage/prize_info_bg.png","drawPage/prize_info_laba.png","drawPage/turantable_bg.png","drawPage/turantable_box.png","likeLogPage/back.png","likeLogPage/bg.png","likeLogPage/item_line.png","likeLogPage/list_bg.png","likeLogPage/title.png","music/bgm.mp3","noPointPop/bg.png","noPointPop/btn.png","noPointPop/close.png","noPointPop/li8ght.png","opusPage/avatar.png","opusPage/back.png","opusPage/bg.png","opusPage/bg2.png","opusPage/big_pinglun.png","opusPage/dianzan.png","opusPage/infobg.png","opusPage/line.png","opusPage/pinglun.png","opusPage/zan.png","pointSucPop/bg.png","pointSucPop/box.png","pointSucPop/btn.png","pointSucPop/close.png","pointSucPop/light.png","pop_winPrize/prizeImg.png","pop_winPrize/wp_background.png","pop_winPrize/wp_closeButton.png","pop_winPrize/wp_light.png","pop_winPrize/wp_receiveButton.png","sharePage/agentBg.png","sharePage/assist_btn.png","sharePage/assist_text.png","sharePage/bg.png","sharePage/btn.png","sharePage/hand.png","sharePage/join_btn.png","sharePage/logo.png","sharePage/normal.png","sharePage/share_btn.png","sharePage/zanBg.png","sharePage/zanBtn.png","svga/1输出分析好友.svga","svga/2输出拜访.svga","svga/3输出首页氛围.svga","svga/4输出弹窗氛围.svga","svga/5输出展开.svga","svga/6输出切换.svga","svga/7输出抽奖.svga","userHomePage/bg.jpg","userHomePage/logo.png","userHomePage/prizeBg.png","userHomePage/prizeBg1.png","userHomePage/prizeBg2.png","userHomePage/prizeBg3.png","userHomePage/prizeBg4.png","userHomePage/rank1.png","userHomePage/rank2.png","userHomePage/rank3.png","userHomePage/rankTitle.png","userHomePage/rankTop.png","userHomePage/subBg.png","userHomePage/timeNumBg.png","userHomePage/uidbg.png","userHomePage/分享好友.png","userHomePage/奖品.png","userHomePage/抽奖.png","userHomePage/拜访清单.png","userHomePage/按钮.png","userHomePage/标题.png","userHomePage/瓜分攻略.png","userHomePage/规则.png","userHomePage/邀请明细.png","yinsirulepop/bg.png","yinsirulepop/btn.png","yinsirulepop/close.png"]}
\ No newline at end of file
src/assets/CodePop/bg.png

27.8 KB | W: | H:

src/assets/CodePop/bg.png

151 KB | W: | H:

src/assets/CodePop/bg.png
src/assets/CodePop/bg.png
src/assets/CodePop/bg.png
src/assets/CodePop/bg.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/CodePop/code.png

1.45 KB | W: | H:

src/assets/CodePop/code.png

1.64 KB | W: | H:

src/assets/CodePop/code.png
src/assets/CodePop/code.png
src/assets/CodePop/code.png
src/assets/CodePop/code.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -18,50 +18,28 @@
.bg {
position: absolute;
left: 110px;
top: 505px;
width: 529px;
height: 562px;
left: 99px;
top: 358px;
width: 553px;
height: 721px;
.sparkBg("CodePop/bg.png")
}
.code {
position: absolute;
left: 165px;
top: 272px;
width: 199px;
height: 197px;
left: 146px;
top: 371px;
width: 261px;
height: 261px;
//.sparkBg("CodePop/code.png")
}
.rankText {
font-size: 30px;
color: rgb(239, 125, 30);
text-transform: uppercase;
line-height: 1;
position: absolute;
left: 15px;
top: 360px;
text-align: center;
width: 490px;
.lineClamp1()
}
.know {
position: absolute;
left: 180px;
top: 829px;
width: 373px;
height: 110px;
.sparkBg("RankNoPrizePop/know.png")
}
.close {
position: absolute;
left: 345px;
top: 1097px;
width: 61px;
height: 61px;
top: 1122px;
width: 60px;
height: 60px;
.sparkBg("common/closeBtn.png")
}
}
\ No newline at end of file
import React from "react";
import {observer} from "mobx-react";
import { observer } from "mobx-react";
import "./NoPrizeCard.less";
import {Button} from "@src/components/Button";
import { Button } from "@src/components/Button";
import modalStore from "@src/store/modal";
import {SvgaPlayer} from "@spark/svgaplayer";
import {RES_PATH} from "../../../sparkrc";
import {Swiper} from "antd-mobile";
import {LOG_KEY, pageView, sensorLog} from "@src/utils/sensors";
import { SvgaPlayer } from "@spark/svgaplayer";
import { RES_PATH } from "../../../sparkrc";
import { Swiper } from "antd-mobile";
import { LOG_KEY, pageView, sensorLog } from "@src/utils/sensors";
import { _throttle, randomNum } from "@src/utils/utils";
@observer
class NoPrizeCard extends React.Component {
state = {
card: true
card: true,
};
componentDidMount() {
pageView("b12137", {
page_name: "祝福语翻转页",
});
......@@ -25,6 +27,18 @@ class NoPrizeCard extends React.Component {
});
}
/** card1文本选择 */
opt1 = () => {
const list = [
'NoPrizeCard/text1.png',
'NoPrizeCard/text2.png',
'NoPrizeCard/text3.png',
'NoPrizeCard/text4.png'
]
const address = list[randomNum(0, 4)]
return address
}
/** 切换按钮*/
clickExchange1 = () => {
sensorLog(LOG_KEY.click, "b12137", "d12138", {
......@@ -36,77 +50,65 @@ class NoPrizeCard extends React.Component {
svg: true
});
setTimeout(()=>{
setTimeout(() => {
this.setState({
svg: false,
card: false,
});
},2000)
}, 2000)
};
/** 关闭按钮*/
clickClose = () => {
clickClose = _throttle(() => {
modalStore.closePop();
};
});
render() {
const {card,svg} = this.state;
const {data,type} = this.props.popData;
console.log(data,123123,type);
const { card, svg } = this.state;
const { data } = this.props.popData;
console.log(data, 123123);
return <div className="NoPrizeCard modal_center">
{
card === true ? <div className="card1">
<div className="bg"/>
<div className="camera"/>
<div className="title"/>
</div>
: (type === 1 ? <Swiper className="prodSwiper"
indicatorProps={{ style: { display: "none" } }}
>
{
data?.productInfos?.map((item,index)=>{
return <Swiper.Item className="prodItem" key={index}>
<img className="bg2" src={item?.productImg}/>
<div className="txt">
{item?.productText}
card === true ?
//翻转前
<div className="card1">
<SvgaPlayer className="bg" src={RES_PATH + "svga/5输出展开.svga"} loop={1} />
<span className="picture"></span>
<img className="text" src={RES_PATH + this.opt1()} />
</div>
</Swiper.Item>
})
}
</Swiper> : <Swiper className="prodSwiper"
//翻转后
: <div>
<SvgaPlayer className="bg" src={RES_PATH + "svga/6输出切换.svga"} loop={1} />
<Swiper className="prodSwiper"
indicatorProps={{ style: { display: "none" } }}
>
{
data?.productInfos?.productInfos?.map((item,index)=>{
data?.productInfos?.productInfos?.map((item, index) => {
return <Swiper.Item className="prodItem" key={index}>
<img className="bg2" src={item?.productImg}/>
<span className="line"></span>
<img className="picture2"
src={item?.productImg}
alt={item?.productText}
/>
<div className="txt">
{item?.productText}
</div>
</Swiper.Item>
})
}
</Swiper>
)
}
{
svg && <SvgaPlayer className="svgcard" src={RES_PATH + "SVG/5输出点击切换.svga"}/>
<Button className="exchange2" />
</div>
}
{
card === true && <Button className="exchange1 md46" onClick={this.clickExchange1}/>
card === true && <Button className="exchange1 md46" onClick={this.clickExchange1} />
}
<Button className="close md47" onClick={this.clickClose}/>
<Button className="close md47" onClick={this.clickClose} />
</div>;
}
}
......
......@@ -9,82 +9,84 @@
.bg {
position: absolute;
left: 107px;
top: 412px;
width: 542px;
height: 736px;
.sparkBg("NoPrizeCard/bg.png")
left: 63px;
top: 256px;
width: 623px;
height: 1053px;
}
.camera {
.picture {
position: absolute;
left: 98px;
top: 935px;
width: 541px;
height: 210px;
.sparkBg("NoPrizeCard/camera.png")
left: 148px;
top: 495px;
width: 473px;
height: 725px;
.sparkBg("NoPrizeCard/picture.png");
.fade-in;
}
.text {
position: absolute;
left: 270px;
top: 1074px;
width: 215px;
height: 115px;
.fade-in;
}
.prodSwiper {
position: absolute;
left: 148px;
top: 0px;
width: 750px;
width: 452px;
height: 1258px;
transition: transform 288ms linear;
transition-delay: 288ms;
.fade-in;
.prodItem {
display: flex;
align-items: center;
justify-content: center;
.bg2 {
.line {
position: absolute;
left: 107px;
top: 412px;
width: 542px;
height: 736px;
left: 5px;
top: 1035px;
width: 438px;
height: 2px;
.sparkBg("NoPrizeCard/line.png")
}
.prize {
.picture2 {
position: absolute;
left: 160px;
top: 463px;
width: 430px;
height: 465px;
object-fit: contain;
.sparkBg("NoPrizeCard/prizeImg.png")
left: 0px;
top: 495px;
width: 452px;
height: 499px;
border-radius: 38px;
.sparkBg("NoPrizeCard/picture2.png")
}
.txt {
font-size: 24px;
color: rgb(163, 55, 33);
line-height: 1.333;
font-size: 23px;
color: rgb(42, 98, 23);
line-height: 1.391;
text-align: left;
position: absolute;
left: 162px;
top: 960px;
width: 422px;
height: 125px;
left: 9px;
top: 1088px;
width: 417px;
height: 86px;
.lineClampN(4)
}
}
}
.title {
position: absolute;
left: 286px;
top: 955px;
width: 180px;
height: 125px;
.sparkBg("NoPrizeCard/title.png")
}
.exchange1 {
position: absolute;
left: 279px;
top: 1170px;
top: 1252px;
width: 191px;
height: 29px;
.sparkBg("NoPrizeCard/exchange.png")
......@@ -92,9 +94,9 @@
.exchange2 {
position: absolute;
left: 304px;
top: 1170px;
width: 132px;
left: 302px;
top: 1252px;
width: 134px;
height: 29px;
.sparkBg("NoPrizeCard/exchange2.png")
}
......@@ -102,17 +104,9 @@
.close {
position: absolute;
left: 345px;
top: 1258px;
width: 61px;
height: 61px;
top: 1332px;
width: 60px;
height: 60px;
.sparkBg("common/closeBtn.png")
}
.svgcard {
position: absolute;
left: 42px;
top: 412px;
width: 611px;
height: 777px;
}
}
\ No newline at end of file
......@@ -50,7 +50,7 @@ class Pop_winprize extends React.Component {
console.log(data, 123123);
return (
<div className="pop_winprize modal_center">
<SvgaPlayer className="wp_light" src={RES_PATH + "SVG/6输出礼盒氛围.svga"} />
<SvgaPlayer className="wp_light" src={RES_PATH + "svga/4输出弹窗氛围.svga"} />
<Button className="wp_closebutton" onClick={this.clickClose} />
<div className="wp_main">
<span className="wp_background"></span>
......
......@@ -76,6 +76,7 @@
top: 0px;
position: absolute;
.sparkBg("pop_winPrize/prizeImg.png");
border-radius: 37px;
}
.prizename {
......
......@@ -119,21 +119,6 @@ class Drawpage extends React.Component {
<span className="bg"></span>
<Button className="back_btn" onClick={this.backHome} />
<Button className="task_btn" onClick={this.goTask} />
{/* 奖品轮播 */}
<div className="prize_info">
<div className="prize_info_bg"></div>
<div className="prize_info_laba"></div>
<div className="prize_info_list">
<Marquee
baseData={carouselVos || []}
time={2000}
direction="top"
renderItem={(item) => (
<div className="prize_info_item">用户 {item.escapePhone} 获得了{item.prizeName}</div>
)}
></Marquee>
</div>
</div>
<Button className="draw_btn_box md36" onClick={this.lottteryHandle}>
<span className="draw_btn"></span>
<span className="left_num">剩余次数:{remainDrawTimes || 0}</span>
......
......@@ -108,10 +108,6 @@
}
.turantable {
// width: 710px;
// height: 707px;
// left: 20px;
// top: 586px;
left: 35px;
top: 476px;
width: 680px;
......@@ -124,15 +120,6 @@
align-items: center;
.turantable_box {
// width: 584px;
// height: 584px;
// top: 56px;
// left: 56px;
// left: 0px;
// top: 0px;
// width: 680px;
// height: 681px;
position: relative;
}
......@@ -186,7 +173,7 @@
.cover {
left: 318px;
top: 461px;
top: 430px;
width: 114px;
height: 138px;
position: absolute;
......
......@@ -97,7 +97,7 @@
opacity: 0;
animation: fadeIn ease-in 1;
animation-fill-mode: forwards;
animation-duration: 1s;
animation-duration: 2s;
}
@keyframes fadeIn {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment