Skip to content

S
SURPRISED
Commit d4cbe1f6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

parents a48cad26 b9d34a6e
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
html/annualMeeting/AnnuaLmeetingHome.html
View file @ d4cbe1f6
...@@ -111,7 +111,10 @@ ...@@ -111,7 +111,10 @@
<div class="rank_mask" id="prize"> <div class="rank_mask" id="prize">
<div class="zhezao"></div> <div class="zhezao"></div>
<div class="prize_box"> <div class="prize_box">
<img id="barcode" /> <p class="jiangp"></p>
<div class="prize_btn">
<span>查看我的奖品</span>
</div>
<div class="prize_Close"></div> <div class="prize_Close"></div>
</div> </div>
...@@ -127,11 +130,12 @@ ...@@ -127,11 +130,12 @@
<script src="../../js/moveJs/jquery.min.js"></script> <script src="../../js/moveJs/jquery.min.js"></script>
<script src="../../js/moveJs/jquery.signalR.min.js"></script> <script src="../../js/moveJs/jquery.signalR.min.js"></script>
<script type="text/javascript" src="../../js/layer/layer.js"></script> <script type="text/javascript" src="../../js/layer/layer.js"></script>
<script src="./js/JsBarcode.all.min.js"></script>
<script src="../../js/mian.js"></script> <script src="../../js/mian.js"></script>
<script> <script>
var href = window.location.href; var href = window.location.href;
// var href = 'http://activity.oytour.com/html/annualMeeting/AnnuaLmeetingHome.html?EmployeeId=1951&EmName=张建国&imgUrl=http://imgfile.oytour.com/Upload/Temporary/20200108014208064.jpg&GiftCode=202001081342098693&e=2019-03-25T00:00:00'; // var href = 'http://activity.oytour.com/html/annualMeeting/AnnuaLmeetingHome.html?EmployeeId=1951&EmName=张建国&imgUrl=http://imgfile.oytour.com/Upload/Temporary/20200108014208064.jpg&GiftCode=202001081342098693&e=2019-03-25T00:00:00';
var param = href.split('?')[1].split("&"); var param = href.split('?')[1].split("&");
...@@ -150,6 +154,11 @@ ...@@ -150,6 +154,11 @@
} }
localStorage.activity = JSON.stringify(activity) localStorage.activity = JSON.stringify(activity)
if(localStorage.showPirze== undefined && GiftCode!=-1){
$('.jiangp').html('恭喜你获得签到奖品'+GiftCode)
$('#prize').css('display','flex')
localStorage.showPirze = 1
}
var MenusList=[]; var MenusList=[];
$("input").on("blur",function(){ $("input").on("blur",function(){
...@@ -373,18 +382,13 @@ ...@@ -373,18 +382,13 @@
}) })
$('.prize_Close').click(function () { $('.prize_Close').click(function () {
$('#prize').css('display','none') $('#prize').css('display','none')
})
$('.prize_btn').click(function () {
$('#prize').css('display','none')
window.location.href = './MyPrize.html'
}) })
//条形码生成
var barcode = document.getElementById('barcode'),
str = GiftCode,
options = {
format: "CODE128",
displayValue: false,
fontSize: 18,
height: 100
};
JsBarcode(barcode, str, options); //原生
// $('#barcode').JsBarcode(str, options); //jQuery
function JumpActivity(type) {//活动进行时的跳转 function JumpActivity(type) {//活动进行时的跳转
if(type == 'mouse'){ if(type == 'mouse'){
window.location.href = `./HitMouse.html` window.location.href = `./HitMouse.html`
......
html/annualMeeting/MyPrize.html
View file @ d4cbe1f6
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<body> <body>
<div class="Box"> <div class="Box">
<div class="Box_top"> <div class="Box_top">
<p>签到奖品</p> <!-- <p>签到奖品</p>-->
</div> </div>
<div class="bttoom_center"> <div class="bttoom_center">
...@@ -165,15 +165,6 @@ ...@@ -165,15 +165,6 @@
</div> </div>
<!-- 我的奖品-->
<div class="rank_mask" id="prize">
<div class="zhezao"></div>
<div class="prize_box">
<img id="barcode" />
<div class="prize_Close"></div>
</div>
</div>
<input style="opacity: 0;position: absolute;left: 0;top:0" id="tokenReadPackage" readonly="readonly" value="" /> <input style="opacity: 0;position: absolute;left: 0;top:0" id="tokenReadPackage" readonly="readonly" value="" />
</div> </div>
...@@ -185,7 +176,6 @@ ...@@ -185,7 +176,6 @@
<script src="../../js/moveJs/jquery.min.js"></script> <script src="../../js/moveJs/jquery.min.js"></script>
<script src="../../js/moveJs/jquery.signalR.min.js"></script> <script src="../../js/moveJs/jquery.signalR.min.js"></script>
<script type="text/javascript" src="../../js/layer/layer.js"></script> <script type="text/javascript" src="../../js/layer/layer.js"></script>
<script src="./js/JsBarcode.all.min.js"></script>
<script src="js/clipboard.min.js"></script> <script src="js/clipboard.min.js"></script>
<script src="../../js/mian.js"></script> <script src="../../js/mian.js"></script>
...@@ -278,25 +268,5 @@ ...@@ -278,25 +268,5 @@
$('.Box_top p').click(function () {
$('#prize').css('display','flex')
})
$('.prize_Close').click(function () {
$('#prize').css('display','none')
})
//条形码生成
var barcode = document.getElementById('barcode'),
str = activity.GiftCode,
options = {
format: "CODE128",
displayValue: false,
fontSize: 18,
height: 100
};
JsBarcode(barcode, str, options); //原生
</script> </script>
</html> </html>
html/annualMeeting/css/Amhome.css
View file @ d4cbe1f6
...@@ -393,14 +393,39 @@ p{ ...@@ -393,14 +393,39 @@ p{
align-items: center; align-items: center;
} }
.prize_box{ .prize_box{
width: 100%; width: 3rem;
height: 2rem; height: 2.97rem;
background: white; position: relative;
background-image: url('../../../images/aM/myPrize_bg.png');
background-size: 100% 100%;
background-repeat: no-repeat;
display: flex;
flex-direction: column;
align-items: center;
/*justify-content: center;*/
}
.prize_box p{
font-size: 0.15rem;
color: #111111;
margin-top: 1.94rem;
width: 90%;
text-align: center;
}
.prize_btn{
width: 2rem;
height: 0.43rem;
position: relative; position: relative;
background-image: url('../../../images/aM/myPrize_btn.png');
background-size: 100% 100%;
background-repeat: no-repeat;
margin-top: 0.15rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 0.16rem;
color: #893630;
} }
.AR{ .AR{
width: 0.515rem; width: 0.515rem;
height: 0.535rem; height: 0.535rem;
...@@ -411,3 +436,4 @@ p{ ...@@ -411,3 +436,4 @@ p{
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
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