Skip to content

A
allCampaign
Commit ba8eee74 by Chao Sun
Options

Merge branch 'master' of http://139.224.139.2:9091/Sweet/allCampaign

parents 7bee0d9c cac833d5
Showing with 177 additions and 103 deletions
2019Double12/css/style.css
...@@ -200,7 +200,7 @@ body .layui-m-layer-msg .layui-m-layercont { ...@@ -200,7 +200,7 @@ body .layui-m-layer-msg .layui-m-layercont {
margin: 15px 0; margin: 15px 0;
} }
#luckDrawModal .invite { #luckDrawModal .close {
width: 200px; width: 200px;
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
...@@ -296,8 +296,8 @@ body .layui-m-layer-msg .layui-m-layercont { ...@@ -296,8 +296,8 @@ body .layui-m-layer-msg .layui-m-layercont {
position: relative; position: relative;
height: 100%; height: 100%;
font-size: 14px; font-size: 14px;
background: url("../images/bg.jpg"), #7e0000; background: url("../images/bg.jpg"), #670706;
padding-top: 115%; padding-top: 100%;
background-size: cover; background-size: cover;
} }
...@@ -313,135 +313,144 @@ body .layui-m-layer-msg .layui-m-layercont { ...@@ -313,135 +313,144 @@ body .layui-m-layer-msg .layui-m-layercont {
top: 15px; top: 15px;
} }
#effectiveDate { .activity_container .participation {
position: absolute; padding: 20px 15px;
left: 0;
right: 0;
top: 14%;
margin: 0 auto;
padding: 5px 10px;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f5ddaf), to(#e8b973));
background-image: linear-gradient(180deg, #f5ddaf, #e8b973);
border-radius: 18px;
color: #c5111d;
font-size: 15px;
width: 220px;
text-align: center;
} }
@media (min-width: 768px) { .redPocketContainer {
#effectiveDate { background: #ec5444;
top: 20%; padding: 7px 10px 20px;
} border: 4px solid #f5cd9a;
border-radius: 7px;
margin-bottom: 54px;
} }
.activity_container .participation { .redPocketContainer > h5 {
background: #fdf4e3; width: 132px;
margin: 30px 10px; height: 32px;
padding: 20px 15px; line-height: 31px;
text-align: center;
background: #620e08;
color: #fff;
border-radius: 6px;
margin: 0 auto 10px;
font-size: 17px;
} }
.activity_container .participation .meetingCeremony { .redPocketContainer > h5 > span:first-child {
margin-bottom: 30px; margin-right: 12px;
} }
.activity_container .participation .meetingCeremony > h5, .remainRedPocket {
.activity_container .participation .invitationCeremony > h5 {
display: flex; display: flex;
align-items: flex-end; justify-content: center;
font-size: 20px; align-items: center;
margin-bottom: 10px; height: 84px;
font-size: 22px;
color: #690203;
font-weight: bold;
background-image: linear-gradient(#fafcf3, #fcd5a6);
border: 1px solid #fff1da;
border-radius: 8px;
margin-bottom: 20px;
box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.28);
} }
.activity_container .participation .meetingCeremony > h5 > span, .remainRedPocket strong {
.activity_container .participation .invitationCeremony > h5 > span { font-size: 32px;
margin-left: 10px;
} }
.activity_container .participation .meetingCeremony .minsu { .redPocketContent {
margin-top: 15px; background-image: linear-gradient(#fafcf3, #fcd5a6);
background: #e8b972; border: 1px solid #fff1da;
color: #fff; box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.28);
padding: 20px 10px; padding-top: 30px;
padding-bottom: 5%;
border-radius: 8px; border-radius: 8px;
} }
.activity_container .participation .meetingCeremony .minsu > h5 { .redPocketContent ul {
font-size: 18px; display: flex;
text-align: center; justify-content: space-around;
letter-spacing: 5px; padding: 0 10px;
} }
.activity_container .participation .meetingCeremony .minsu .tags, .activity_container .participation .meetingCeremony .minsu .reasons { .redPocketContent ul > li {
flex: 1;
position: relative;
margin-right: 15px;
display: flex; display: flex;
margin: 15px 0; justify-content: center;
align-items: center;
} }
.activity_container .participation .meetingCeremony .minsu .tags > div { .redPocketContent ul > li:last-child {
padding: 8px 10px; margin-right: 0;
border-radius: 6px; }
background-color: #fdf4e3;
font-size: 15px; .remainRedPocketCount {
margin-right: 8px; position: absolute;
color: #000; top: -10px;
font-weight: 500; right: 0px;
height: 100px; width: 25px;
flex: 1; height: 25px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-direction: column; font-size: 18px;
color: #fff;
background: #fe4c4c;
border-radius: 50%;
box-shadow: 0px 2px 2px 0 rgba(0, 0, 0, 0.5);
} }
.activity_container .participation .meetingCeremony .minsu .tags > div > p .number { .taskListsContainer ul > li {
font-size: 32px; padding: 10px 7px;
color: #0f5591; border-radius: 8px;
margin: 0 8px; border: 4px solid #f5cd9a;
background: #ec5345;
margin-bottom: 8px;
}
.taskListsContainer ul > li .content {
background-image: linear-gradient(#fefae9, #fcd5a7);
border-radius: 5px;
padding: 9px 15px 14px;
} }
.activity_container .participation .meetingCeremony .minsu .reasons { .taskListsContainer ul > li .content h5 {
font-size: 17px;
color: #620e08;
display: flex; display: flex;
margin: 0 auto;
padding: 5px 18px;
background-color: #f5ddaf;
color: #000000;
border-radius: 30px;
align-items: center; align-items: center;
} }
.activity_container .participation .meetingCeremony .minsu .reasons > span:first-child { .taskListsContainer ul > li .content p {
position: relative; font-size: 14px;
white-space: nowrap; color: #333;
padding-right: 10px; margin-bottom: 8px;
margin-right: 10px; margin-top: 5px;
} }
.activity_container .participation .meetingCeremony .minsu .reasons > span:first-child::after { .taskListsContainer ul > li .content .optionContent {
position: absolute; display: flex;
content: ''; justify-content: space-between;
right: 0;
top: 0;
width: 2px;
height: 100%;
background-color: #000000;
} }
.activity_container .participation .meetingCeremony .goProduct, .activity_container .participation .invitationCeremony .invite { .taskListsContainer ul > li .content div strong {
width: 108px; font-size: 23px;
height: 38px; color: #b2191b;
line-height: 38px;
border: 1px solid #d81e06;
border-radius: 6px;
text-align: center;
margin: 30px auto;
cursor: pointer;
} }
.activity_container .participation .luckDraw > h5 { .taskListsContainer ul > li .content div button {
width: 120px;
height: 32px;
background-image: linear-gradient(#f47555, #ee392e);
color: #fff;
border-radius: 50px;
font-size: 18px; font-size: 18px;
text-align: center; letter-spacing: 1px;
letter-spacing: 5px;
margin-bottom: 15px;
} }
/*被邀请页面*/ /*被邀请页面*/
...@@ -547,17 +556,74 @@ body .layui-m-layer-msg .layui-m-layercont { ...@@ -547,17 +556,74 @@ body .layui-m-layer-msg .layui-m-layercont {
font-size: 18px; font-size: 18px;
} }
#ydintroContent > ul { #ydintroContent > ul, #productIntroContent ul {
display: flex;
} }
#ydintroContent > ul > li { #ydintroContent > ul > li, #productIntroContent > ul > li {
flex: 1;
height: 80px; height: 80px;
padding: 15px 10px; padding: 15px 25px;
background: #ffffff; background: #ffffff;
border-right: 8px solid #0f5591; border-bottom: 8px solid #0f5591;
color: #f7881c; color: #000;
}
#ydintroContent > ul > li, #productIntroContent > ul > li {
display: flex;
}
#productIntroContent > ul > li > div:first-child {
border: 2px solid #2d221e;
width: 80px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
margin-right: 10px;
border-radius: 6px;
font-size: 22px;
font-weight: bold;
color: #000;
}
#productIntroContent > ul > li > div:last-child {
position: relative;
flex: 1;
color: #000000;
letter-spacing: 2px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
border: 2px solid #000;
padding: 10px;
border-radius: 6px;
margin-left: 20px;
}
#productIntroContent > ul > li > div:last-child::before {
content: '';
position: absolute;
left: 0;
top: 50%;
width: 0;
height: 0;
border: 20px solid transparent;
border-right-color: #000000;
margin-left: -40px;
margin-top: -19px;
}
#productIntroContent > ul > li > div:last-child::after {
content: '';
position: absolute;
left: 0;
top: 50%;
width: 0;
height: 0;
border: 18px solid transparent;
border-right-color: #fff;
margin-left: -35px;
margin-top: -17px;
} }
#ydintroContent > ul > li:nth-last-child(1) { #ydintroContent > ul > li:nth-last-child(1) {
...@@ -568,10 +634,18 @@ body .layui-m-layer-msg .layui-m-layercont { ...@@ -568,10 +634,18 @@ body .layui-m-layer-msg .layui-m-layercont {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
width: 50px;
margin-right: 10px;
text-align: center;
} }
#ydintroContent > ul > li > div:last-child { #ydintroContent > ul > li > div:last-child {
font-size: 14px; font-size: 17px;
flex: 1;
}
#ydintroContent > ul > li > div:last-child > h4 {
margin-bottom: 10px;
} }
#productIntroContent, #ydintroContent { #productIntroContent, #ydintroContent {
......
2019Double12/images/bg.jpg
2019Double12/images/bg.jpg

496 KB | W: | H:

2019Double12/images/bg.jpg

371 KB | W: | H:

2019Double12/images/bg.jpg
2019Double12/images/bg.jpg
2019Double12/images/bg.jpg
2019Double12/images/bg.jpg
  • 2-up
  • Swipe
  • Onion skin
questionnaire/src/app/app.component.ts
...@@ -14,7 +14,7 @@ export class AppComponent implements OnInit { ...@@ -14,7 +14,7 @@ export class AppComponent implements OnInit {
ngOnInit() { ngOnInit() {
const customerId = this.commonService.getQueryString('customerId'); const customerId = this.commonService.getQueryString('customerId');
const orderId = this.commonService.getQueryString('orderId'); const orderId = this.commonService.getQueryString('orderId');
const questionnaireSource = this.commonService.getQueryString('questionnaireSource'); const questionnaireSource = this.commonService.getQueryString('source');
sessionStorage.setItem('customerId', customerId); sessionStorage.setItem('customerId', customerId);
sessionStorage.setItem('orderId', orderId); sessionStorage.setItem('orderId', orderId);
sessionStorage.setItem('questionnaireSource', questionnaireSource); sessionStorage.setItem('questionnaireSource', questionnaireSource);
......
questionnaire/src/app/live/live.component.ts
...@@ -173,7 +173,7 @@ export class LiveComponent implements OnInit { ...@@ -173,7 +173,7 @@ export class LiveComponent implements OnInit {
} }
}; };
// questionnaireSource 为 1 表示 自动评测 // questionnaireSource 为 1 表示 自动评测
if (sessionStorage.getItem('questionnaireSource') === '1') { if (sessionStorage.getItem('questionnaireSource') === 'double12') {
if (!param || !param.survey.customerId || param.survey.customerId === 'null' || param.survey.customerId === 'undefined') { if (!param || !param.survey.customerId || param.survey.customerId === 'null' || param.survey.customerId === 'undefined') {
this.loginModalFlag = true; this.loginModalFlag = true;
return; return;
......
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