Skip to content

S
SURPRISED
Commit 51162a43 authored by Mac's avatar Mac
Browse files
Options

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

parents aca2fc5f ee2e11d6
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 25 deletions
html/GT_activities.html
View file @ 51162a43
......@@ -336,9 +336,10 @@
$('.click_use p').html('立即登录');
}
var that=this
var that = this
that.loadData()
function loadData(){
function loadData() {
$.ajax({
type: "POST",
url: `${getApiUrl().urlJava}api/appActivity/getUserPurchaseTime`,
......@@ -348,7 +349,7 @@
success: function(res) {
if (res.resultCode === 1) {
couponId=res.data.couponId;
couponId = res.data.couponId;
//getTicketList(res.data.couponId);
let num = res.data.repertory; //优惠券总共数量
......@@ -470,7 +471,7 @@
$(".received_img").css('display', "block");
$('.img_btn').css("background-image", "url(https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/buy_btn.png)");
//去使用状态显示弹幕
if(couponId!=null&&couponId!=undefined){
if (couponId != null && couponId != undefined) {
getTicketList(couponId);
}
}
......@@ -514,7 +515,7 @@
add: true
}); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
setTimeout(loadData, 3000) //失败后再次3秒后再次调接口
}
// clearInterval(xhtime)
......@@ -527,8 +528,8 @@
len: 4,
add: true
}); //刚进入页面不执行动画
layer.msg(res.message);
setTimeout(loadData,3000) //失败后再次3秒后再次调接口
layer.msg(res.message);
setTimeout(loadData, 3000) //失败后再次3秒后再次调接口
}
});
......@@ -721,4 +722,4 @@
</script>
</body>
</html>
</html>
\ No newline at end of file
html/coupons.html
View file @ 51162a43
......@@ -424,7 +424,7 @@
<div class="coupons_Content">
<!-- <div class="coupons_List">
<div class="Coupon_leftImg">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>
<div class="dikouPrice">
<span>¥</span>20
</div>
......@@ -444,7 +444,7 @@
</div>
<div class="coupons_List">
<div class="Coupon_leftImg">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zyx.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zyx.png" alt=""/>
<div class="dikouPrice">
<span>¥</span>20
</div>
......@@ -544,34 +544,34 @@
str += `<div class="coupons_List">
<div class="Coupon_leftImg">`
if (dataArr[i].couponsUseScope == 1) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 2) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/gty.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/gty.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 7) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zyx.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zyx.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 8) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/ddy.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/ddy.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 5) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/mp.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/mp.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 11) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/dzy.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/dzy.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 10) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/meishi.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/meishi.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 3) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/qz.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/qz.png" alt=""/>`
}
if (dataArr[i].couponsUseScope == 4) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/jp.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/jp.png" alt=""/>`
}
if (dataArr[i].couponEffectStatus == 3) {
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/guoqi.png" alt=""/>`
str += ` <img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/guoqi.png" alt=""/>`
}
str += `<div class="dikouPrice">
......@@ -592,22 +592,22 @@
</div>`
str += `</div>`
if (dataArr[i].fromPlatform == 0) {
str += `<img class="goToUse" src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/all.png"/>`
str += `<img class="goToUse" src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/all.png"/>`
}
if (dataArr[i].fromPlatform == 1) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/app.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/app.png'/>`
}
if (dataArr[i].fromPlatform == 2) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/xcx.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/xcx.png'/>`
}
if (dataArr[i].fromPlatform == 3) {
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/pc.png'/>`
str += `<img class="goToUse" src='https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/pc.png'/>`
}
str += `</div>`
}
} else {
str += `<div class="zanwu">
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/login/zanwu.png" alt=""/>
<img src="https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/activity/zanwu.png" alt=""/>
<div class="zanwurenhe">暂无任何优惠券</div>
</div>`
}
......
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