Skip to content

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

1

parent a6b250c3
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 103 deletions
css/center.css
View file @ 03cb1ffe
.center .top{
padding: 1.5rem .5rem;
background-color: #E9553A;
position: relative;
}
.center .top .login_out{
position: absolute;
right: 1rem;
top: 0.8rem;
color: white;
font-size: 1.2rem;
}
.center .top_content{
margin: 0 1.2rem;
......
html/ActivityList.html
View file @ 03cb1ffe
......@@ -70,12 +70,15 @@
if (res.resultCode === 1) {
$('.name').html(res.data.customerName)
$('.address').html(res.data.address)
$('.top_content .left').html(`<img class="photo" src="${res.data.businessCardPhotos ? res.data.businessCardPhotos[0] : '../images/default_head_img.jpg'}" alt="">`)
}
},
error: function (res) {
}
});
getList()
function getList() {
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/sell/lottery/getB2bLotteryList`,
......@@ -96,6 +99,7 @@
}
});
}
function assemble(data) {
let domList = ''
dataList = data;
......@@ -137,6 +141,7 @@
<div class="left">
<img src="${x.image ? x.image : '../images/bg_z1@3x.png'}" alt="">
<span class="orange">未开始</span>
<span style="display:none" class="green">进行中</span>
</div>
<div class="right">
<p>${x.lotteryName}</p>
......@@ -161,19 +166,21 @@
}
$(function () {
$("input[name='noBegin']").each(function () {
var cparent = $(this).parents(".data-show-box");
let cparent = $(this).parents(".data-show-box");
let gparent = $(this).parents('.list_item');
// var listItem = $(this).parents(".list-iteam");
console.log($(this).val());
$.leftTime($(this).val(), function (d) {
if (d.status) {
var $dateShow1 = cparent;
var dd = parseInt(d.d) * 24 + parseInt(d.h)
if (d.status) {
$dateShow1.find(".h").html(dd >= 10 ? dd : "0" + dd);
$dateShow1.find(".m").html(d.m);
$dateShow1.find(".s").html(d.s);
} else {
// listItem.find(".no-start").hide();
// listItem.find(".start").show();
let $dateShow2 = gparent;
$dateShow2.find('.orange').hide()
$dateShow2.find('.green').show()
$dateShow1.find('span').hide()
}
});
});
......
html/center.html
View file @ 03cb1ffe
......@@ -22,16 +22,17 @@
<body>
<div class="center">
<div class="top" onclick="loginOut()">
<div class="top">
<div class="top_content">
<div class="left">
<img src="../images/default_head_img.jpg" alt="">
</div>
<div class="right">
<p class="name"></p>
<p class="address"></p>
</div>
</div>
<div class="login_out" onclick="loginOut()">退出</div>
</div>
<div class="row clearfix">
<div class="col-xs-4 active_" name="list_1">
......@@ -105,7 +106,6 @@
let pageSize = 999;
let issuingState1 = '';
let issuingState2 = '';
let loginOutNum = 0;
$('.row .col-xs-4').click(function () { // 点击切换
$(this).addClass('active_').siblings().removeClass('active_')
$('.list_1').hide();
......@@ -131,6 +131,7 @@
if (res.resultCode === 1) {
$('.name').html(res.data.customerName)
$('.address').html(res.data.address)
$('.top_content .left').html(`<img class="photo" src="${res.data.businessCardPhotos ? res.data.businessCardPhotos[0] : '../images/default_head_img.jpg'}" alt="">`)
}
},
error: function (res) {
......@@ -271,15 +272,11 @@
});
}
function loginOut() {
if (loginOutNum < 5) {
loginOutNum++
} else {
clearLocalStorage()
setTimeout(() => {
window.location.href = '../login.html';
}, 500)
}
}
$(function () {
$('#layer_').click(function () {
$(this).hide()
......
js/draw.js
View file @ 03cb1ffe
......@@ -49,20 +49,26 @@ function getLotteryAwardItem() {
let data = res.data
if (data.length > 0) {
data.forEach((x, index) => {
LotteryAward.push(x.awardName)
LotteryAward.push({
name: x.awardName,
id: x.awardType
})
colors.push((index % 2 == 0) ? "#ffeebe" : "#ffbe04")
turnplate.noBegun = false
});
} else {
for (let i = 0; i < 6; i++) {
LotteryAward.push('暂无奖项')
LotteryAward.push({
name: '暂无奖项',
id: 0
})
colors.push((i % 2 == 0) ? "#ffeebe" : "#ffbe04")
turnplate.noBegun = true
}
}
setTimeout(() => {
$('.spinner').hide()
},1000)
}, 1000)
}
},
error: function (res) {
......@@ -97,13 +103,13 @@ $(document).ready(function () {
$('.pointer').click(function () {
if (turnplate.bRotate || turnplate.noBegun) return;
if (remainingCount === 0 || !remainingCount) return layer.msg("抽奖次数已用完")
if (!type || type === '2' || remainingCount < 1) {
if (!type || type === '2') {
return layer.msg("请在活动时间内参与！")
} else {
return layer.msg("抽奖次数已用完!")
}
}
// if (!type || type === '2' || remainingCount < 1) {
// if (!type || type === '2') {
// return layer.msg("请在活动时间内参与！")
// } else {
// return layer.msg("抽奖次数已用完!")
// }
// }
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/sell/lottery/getLotteryAward`,
......@@ -112,13 +118,23 @@ $(document).ready(function () {
async: false,//使用同步的方式,true为异步方式
success: function (res) {
if (res.resultCode === 1) {
remainingCount = remainingCount - 1
$('#remainingCount').html(remainingCount)
if (res.data.awardName === '奖项已抽完') {
return layer.msg('本次活动奖品已抽完！')
if (res.data.winningType === 2) {
LotteryAward.forEach((x, index) => {
if (x.id === 1) {
rotateFn(index + 1, res.data.awardName);
turnplate.bRotate = !turnplate.bRotate;
setTimeout(() => {
$('.status').html(`很遗憾`)
$('.your').html(`未中奖`)
$('.tips').show()
}, turnplate.time)
}
remainingCount--
})
} else {
LotteryAward.forEach((x, index) => {
if (x === res.data.awardName) {
if (x.name === res.data.awardName) {
rotateFn(index + 1, res.data.awardName);
turnplate.bRotate = !turnplate.bRotate;
setTimeout(() => {
......@@ -128,15 +144,15 @@ $(document).ready(function () {
} else if (res.data.winningType === 1) {
$('.status').html(`恭喜你`)
$('.your').html(`获得奖品 <span class="reward">${res.data.awardName}</span>`)
} else if (res.data.winningType === 2) {
$('.status').html(`很遗憾`)
$('.your').html(`奖品已抽完`)
}
$('.tips').show()
},turnplate.time)
}, turnplate.time)
}
})
}
} else if (res.resultCode === 0) {
layer.msg(res.message)
}
},
error: function (res) {
// alert("提交失败" + JSON.stringify(res));
......@@ -199,7 +215,7 @@ function drawRouletteWheel() {
//----绘制奖品开始----
var text = turnplate.restaraunts[i];
var text = turnplate.restaraunts[i].name;
var line_height = 17;
//translate方法重新映射画布上的 (0,0) 位置
ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
......@@ -208,29 +224,29 @@ function drawRouletteWheel() {
ctx.rotate(angle + arc / 2 + Math.PI / 2);
/** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
if (text.indexOf("盘") > 0) {//判断字符进行换行
var texts = text.split("盘");
for (var j = 0; j < texts.length; j++) {
ctx.font = j == 0 ? 'bold 20px Microsoft YaHei' : 'bold 18px Microsoft YaHei';
if (j == 0) {
ctx.fillText(texts[j] + "盘", -ctx.measureText(texts[j] + "盘").width / 2, j * line_height);
} else {
ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height * 1.2); //调整行间距
}
}
} else if (text.indexOf("盘") == -1 && text.length > 8) {//奖品名称长度超过一定范围
text = text.substring(0, 8) + "||" + text.substring(8);
var texts = text.split("||");
for (var j = 0; j < texts.length; j++) {
ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height);
}
} else {
// if (text.indexOf("盘") > 0) {//判断字符进行换行
// var texts = text.split("盘");
// for (var j = 0; j < texts.length; j++) {
// ctx.font = j == 0 ? 'bold 20px Microsoft YaHei' : 'bold 18px Microsoft YaHei';
// if (j == 0) {
// ctx.fillText(texts[j] + "盘", -ctx.measureText(texts[j] + "盘").width / 2, j * line_height);
// } else {
// ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height * 1.2); //调整行间距
// }
// }
// } else if (text.indexOf("盘") == -1 && text.length > 8) {//奖品名称长度超过一定范围
// text = text.substring(0, 8) + "||" + text.substring(8);
// var texts = text.split("||");
// for (var j = 0; j < texts.length; j++) {
// ctx.fillText(texts[j], -ctx.measureText(texts[j]).width / 2, j * line_height);
// }
// } else {
//在画布上绘制填色的文本。文本的默认颜色是黑色
//measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
}
// }
//添加对应图标
......
login.html
View file @ 03cb1ffe
......@@ -21,13 +21,13 @@
<p>账户登录</p>
<div class="login_phone">
<img class="logo" src="images/phone.png" alt="">
<input type="phone" class="form-control input-border-none" id="phone1"
<input type="phone" class="form-control input-border-none" id="phone1" autocomplete="new-password"
onfocus="activeFun('login_phone','active')" onblur="activeFun('login_phone', null, 1)"
placeholder="请输入手机号码">
</div>
<div class="login_pwd">
<img class="logo" src="images/password.png" alt="">
<input type="password" class="form-control input-border-none" id="password1"
<input type="password" class="form-control input-border-none" id="password1" autocomplete="new-password"
onfocus="activeFun('login_pwd','active')" onblur="activeFun('login_pwd')" placeholder="请输入密码">
</div>
<div class="other_login">
......@@ -41,13 +41,13 @@
<p>验证码登录</p>
<div class="login_phone">
<img class="logo" src="images/phone.png" alt="">
<input type="phone" class="form-control input-border-none" id="phone2"
<input type="phone" class="form-control input-border-none" id="phone2" autocomplete="new-password"
onfocus="activeFun('login_phone','active')" onblur="activeFun('login_phone', null, 2)"
placeholder="请输入手机号码">
</div>
<div class="login_pwd">
<img class="logo" src="images/password.png" alt="">
<input type="text" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')"
<input type="text" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')" autocomplete="new-password"
onblur="activeFun('login_pwd')" id="2" placeholder="请输入验证码">
<input class="btn btn-default" type="button" id="getCode1" onclick="sendemail('getCode1',2)" value="获取验证码" />
</div>
......@@ -61,17 +61,17 @@
<p>账号激活</p>
<div class="login_phone">
<img class="logo" src="images/phone.png" alt="">
<input type="phone" class="form-control input-border-none" onfocus="activeFun('login_phone','active')"
<input type="phone" class="form-control input-border-none" onfocus="activeFun('login_phone','active')" autocomplete="new-password"
onblur="activeFun('login_phone')" id="phone3" placeholder="请输入手机号码">
</div>
<div class="login_pwd">
<img class="logo" src="images/password.png" alt="">
<input type="password" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')"
<input type="password" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')" autocomplete="new-password"
onblur="activeFun('login_pwd')" id="password4" placeholder="请设置密码">
</div>
<div class="login_pwd">
<img class="logo" src="images/password.png" alt="">
<input type="text" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')"
<input type="text" class="form-control input-border-none" onfocus="activeFun('login_pwd','active')" autocomplete="new-password"
onblur="activeFun('login_pwd', null, 3)" id="password3" placeholder="请输入验证码">
<input class="btn btn-default" type="button" id="getCode2" onclick="sendemail('getCode2',3)" value="获取验证码" />
</div>
......@@ -182,8 +182,8 @@
});
} else if (res.resultCode == 1) {
} else {
} else if (res.message === "该账号不存在"){
return layer.msg(res.message)
}
},
error: function (res) {
......
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