Skip to content

S
SURPRISED
Commit 27b7b1b6 authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	html/GT_activities.html
parents e656ddb6 976db246
Expand all Show whitespace changes
Inline Side-by-side
Showing with 231 additions and 233 deletions
css/GT_activities.css
View file @ 27b7b1b6
...@@ -14,7 +14,7 @@ p { ...@@ -14,7 +14,7 @@ p {
#box { #box {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-image: url(../images/bg2@3x.png); background-image: url(http://acitvityimage.oytour.com/activity/bg2@3x.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-top: 0.7rem; padding-top: 0.7rem;
...@@ -97,7 +97,7 @@ p { ...@@ -97,7 +97,7 @@ p {
.box_content { .box_content {
width: 100%; width: 100%;
height: 5.2rem; height: 5.2rem;
background-image: url(../images/bg1@3x.png); background-image: url(http://acitvityimage.oytour.com/activity/bg1@3x.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
position: absolute; position: absolute;
...@@ -135,7 +135,7 @@ p { ...@@ -135,7 +135,7 @@ p {
.img_bg_M { .img_bg_M {
width: 100%; width: 100%;
height: 2.14rem; height: 2.14rem;
background-image: url(../images/M_200.png); background-image: url(http://acitvityimage.oytour.com/activity/M_200.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
...@@ -180,7 +180,7 @@ p { ...@@ -180,7 +180,7 @@ p {
justify-content: center; justify-content: center;
/*margin-left: 2.07rem;*/ /*margin-left: 2.07rem;*/
margin-top: 0.05rem; margin-top: 0.05rem;
background-image: url(../images/buy_btn.gif); background-image: url(http://acitvityimage.oytour.com/activity/buy_btn.gif);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
...@@ -249,7 +249,7 @@ p { ...@@ -249,7 +249,7 @@ p {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
background-image: url(../images/notice.png); background-image: url(http://acitvityimage.oytour.com/activity/notice.png);
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
z-index: 999; z-index: 999;
......
html/GT_activities.html
View file @ 27b7b1b6
This diff is collapsed.
html/Rushbuy.html
View file @ 27b7b1b6
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.main { .main {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url(../images/gongxi4.png) no-repeat; background: url(http://acitvityimage.oytour.com/activity/gongxi4.jpg) no-repeat;
background-size: 100%; background-size: 100%;
background-color: #8d54cc; background-color: #8d54cc;
position: relative; position: relative;
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
position: absolute; position: absolute;
left: 18%; left: 18%;
bottom: 15%; bottom: 15%;
background: url(../images/gongxi22.png); background: url(http://acitvityimage.oytour.com/activity/gongxi22.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-position-x: center; background-position-x: center;
...@@ -204,17 +204,17 @@ ...@@ -204,17 +204,17 @@
<body> <body>
<div class="main"> <div class="main">
<div class="box"> <div class="box">
<img class="hongbao" src="../images/gongxi1.png"> <img class="hongbao" src="http://acitvityimage.oytour.com/activity/gongxi1.png">
<span id="RushbuyTime"></span> <span id="RushbuyTime"></span>
<div class="anniu"> <div class="anniu">
</div> </div>
<!-- <img class="anniu" src="../images/gongxi2.png"> --> <!-- <img class="anniu" src="http://acitvityimage.oytour.com/activity/gongxi2.png"> -->
</div> </div>
<div class="readXieyi"> <div class="readXieyi">
<div class="rushNocheck"></div> <div class="rushNocheck"></div>
<div class="rushNocheckTwo"> <div class="rushNocheckTwo">
<img src="../images/xyck.png" alt="" /> <img src="http://acitvityimage.oytour.com/activity/xyck.png" alt="" />
</div> </div>
<span>我已阅读并同意</span><span class="benciXieyi">《本次活动说明》</span> <span>我已阅读并同意</span><span class="benciXieyi">《本次活动说明》</span>
</div> </div>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<script type="text/javascript" src="../js/jquery-1.10.2.js"></script> <script type="text/javascript" src="../js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="../js/md5.js"></script> <script type="text/javascript" src="../js/md5.js"></script>
<script type="text/javascript" src="../js/layer/layer.js"></script> <script type="text/javascript" src="../js/layer/layer.js"></script>
<script type="text/javascript" src="../js/mian.js?r=12312312312"></script> <script type="text/javascript" src="../js/mian.js?r=123123123192"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script> <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<script> <script>
...@@ -411,7 +411,6 @@ ...@@ -411,7 +411,6 @@
} else { } else {
layer.msg(res.message) layer.msg(res.message)
} }
layer.msg(res.message)
// window.location.reload() // window.location.reload()
......
html/coupons.html
View file @ 27b7b1b6
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
</div> </div>
<div class="goToDownLoad"> <div class="goToDownLoad">
<div> <div>
<img class="downloadImg" src="../images/login/godownload.png" alt=""/> <img class="downloadImg" src="http://acitvityimage.oytour.com/activity/godownload.png" alt=""/>
<span onclick="goDownLoad()"> <span onclick="goDownLoad()">
下载同业App使用<img src="../images/login/arrowR.png" alt=""/> 下载同业App使用<img src="http://acitvityimage.oytour.com/activity/arrowR.png" alt=""/>
</span> </span>
</div> </div>
</div> </div>
......
html/login.html
View file @ 27b7b1b6
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
position: relative; position: relative;
height: 100%; height: 100%;
background-color: #FFFFFF; background-color: #FFFFFF;
background-image: url('../images/login/login_bg.png'); background-image: url('http://acitvityimage.oytour.com/activity/login_bg.jpg');
background-size:cover; background-size:cover;
} }
.login_page .page__bd{ .login_page .page__bd{
...@@ -229,22 +229,22 @@ ...@@ -229,22 +229,22 @@
<div class="login_denglu"> <div class="login_denglu">
<div class='page__bd'> <div class='page__bd'>
<div class="headBg"> <div class="headBg">
<img class="headBgImg" src="../images/login/login_content.png"/> <img class="headBgImg" src="http://acitvityimage.oytour.com/activity/login_content.png"/>
<div class='header'> <div class='header'>
<img class='header_image' src='../images/login/login_elp.png'> <img class='header_image' src='http://acitvityimage.oytour.com/activity/login_elp.png'>
<span class='header_span'>Welcome</span> <span class='header_span'>Welcome</span>
</div> </div>
<div class='form'> <div class='form'>
<div class='form_item1'> <div class='form_item1'>
<div class='form_item_inBox'> <div class='form_item_inBox'>
<img class='form_item_ico' src='../images/login/ico_lock1.png'/> <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock1.png'/>
<span class="login_Zh">账号</span> <span class="login_Zh">账号</span>
<input class='form_item_input' id="UserAccount" type='number' placeholder="请输入手机号"></input> <input class='form_item_input' id="UserAccount" type='number' placeholder="请输入手机号"></input>
</div> </div>
</div> </div>
<div class='form_item2'> <div class='form_item2'>
<div class='form_item_inBox'> <div class='form_item_inBox'>
<img class='form_item_ico' src='../images/login/ico_lock2.png'/> <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock2.png'/>
<span class="login_Zh">密码</span> <span class="login_Zh">密码</span>
<input class='form_item_input' id="passWord" type="password" placeholder="请输入密码"></input> <input class='form_item_input' id="passWord" type="password" placeholder="请输入密码"></input>
</div> </div>
...@@ -265,29 +265,29 @@ ...@@ -265,29 +265,29 @@
<div class="login_jihuo"> <div class="login_jihuo">
<div class='page__bd'> <div class='page__bd'>
<div class="headBg" style="height:60rem;"> <div class="headBg" style="height:60rem;">
<img class="headBgImg" src="../images/login/login_content.png"/> <img class="headBgImg" src="http://acitvityimage.oytour.com/activity/login_content.png"/>
<div class='header'> <div class='header'>
<img class='header_image' src='../images/login/login_elp.png'> <img class='header_image' src='http://acitvityimage.oytour.com/activity/login_elp.png'>
<span class='header_span'>Welcome</span> <span class='header_span'>Welcome</span>
</div> </div>
<div class='form'> <div class='form'>
<div class='form_item1'> <div class='form_item1'>
<div class='form_item_inBox'> <div class='form_item_inBox'>
<img class='form_item_ico' src='../images/login/ico_lock1.png'/> <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock1.png'/>
<span class="login_Zh">账号</span> <span class="login_Zh">账号</span>
<input class='form_item_input' type='number' id="Activation_Account" placeholder="请输入手机号"></input> <input class='form_item_input' type='number' id="Activation_Account" placeholder="请输入手机号"></input>
</div> </div>
</div> </div>
<div class='form_item2'> <div class='form_item2'>
<div class='form_item_inBox'> <div class='form_item_inBox'>
<img class='form_item_ico' src='../images/login/ico_lock2.png'/> <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_lock2.png'/>
<span class="login_Zh">密码</span> <span class="login_Zh">密码</span>
<input class='form_item_input' type="password" id="Activation_password" placeholder="请输入密码"></input> <input class='form_item_input' type="password" id="Activation_password" placeholder="请输入密码"></input>
</div> </div>
</div> </div>
<div class='form_item2'> <div class='form_item2'>
<div class='form_item_inBox'> <div class='form_item_inBox'>
<img class='form_item_ico' src='../images/login/ico_yzm.png' style="margin-top:1rem;"/> <img class='form_item_ico' src='http://acitvityimage.oytour.com/activity/ico_yzm.png' style="margin-top:1rem;"/>
<span class="login_Zh">验证码</span> <span class="login_Zh">验证码</span>
<input class='form_validate_input' id="Activation_valicode" placeholder="请输入验证码"></input> <input class='form_validate_input' id="Activation_valicode" placeholder="请输入验证码"></input>
<span class="login_yzm" onclick="getCode()">发送验证码</span> <span class="login_yzm" onclick="getCode()">发送验证码</span>
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
</div> </div>
<div class="login_Agreement"> <div class="login_Agreement">
<div class="login_AgreeTitle"> <div class="login_AgreeTitle">
<img onclick="gobackLogin()" src="../images/login/login_arrowleft.png"/> 用户协议 <img onclick="gobackLogin()" src="http://acitvityimage.oytour.com/activity/login_arrowleft.jpg"/> 用户协议
</div> </div>
<div class="boxcenter"> <div class="boxcenter">
<h1>《用户协议和法律协议》 本协议为您与本APP管理者之间所订立的契约，具有合同的法律效力，请您仔细阅读。</h1> <h1>《用户协议和法律协议》 本协议为您与本APP管理者之间所订立的契约，具有合同的法律效力，请您仔细阅读。</h1>
......
html/pay.html
View file @ 27b7b1b6
...@@ -155,11 +155,11 @@ ...@@ -155,11 +155,11 @@
</div> </div>
<div class="pay_zhifu"> <div class="pay_zhifu">
<img class="pay_one" src="../images/login/wechat.png" alt="" /> <img class="pay_one" src="http://acitvityimage.oytour.com/activity/wechat.png" alt="" />
<span class="pay_two">微信支付</span> <span class="pay_two">微信支付</span>
<div class="pay_three"> <div class="pay_three">
<!-- <div class="pay_circle"></div> --> <!-- <div class="pay_circle"></div> -->
<img src="../images/login/checkbox.png" aly="" /> <img src="http://acitvityimage.oytour.com/activity/checkbox.png" aly="" />
</div> </div>
</div> </div>
</div> </div>
......
html/paySuccess.html
View file @ 27b7b1b6
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
height:100%; height:100%;
position: relative; position: relative;
text-align: center; text-align: center;
background: url('../images/pay/bg.png') no-repeat; background: url('http://acitvityimage.oytour.com/activity/bg.jpg') no-repeat;
background-size:100% 100%; background-size:100% 100%;
padding-top: 3.1rem; padding-top: 3.1rem;
box-sizing: border-box; box-sizing: border-box;
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
.img_bg_M .imgBtn{ .img_bg_M .imgBtn{
margin-top: 0.08rem; margin-top: 0.08rem;
background: url('../images/pay/btn.png') no-repeat; background: url('http://acitvityimage.oytour.com/activity/buy_btn.png') no-repeat;
background-size:100% 100%; background-size:100% 100%;
padding: 0.09rem 0.12rem; padding: 0.09rem 0.12rem;
...@@ -127,12 +127,12 @@ ...@@ -127,12 +127,12 @@
有效截止日期： 有效截止日期：
</p> </p>
<p class="imgBtn" style="font-size: 0.15rem;color: #E03234;">返回活动首页</p> <p class="imgBtn" style="font-size: 0.15rem;color: #E03234;">返回活动首页</p>
<img class="ylImg" src="../images/pay/yl.png" alt=""> <img class="ylImg" src="http://acitvityimage.oytour.com/activity/received@3x.png" alt="">
</div> </div>
<div class="use_oupon"> <div class="use_oupon">
<div class="use_news"> <div class="use_news">
<img src="../images/tx_bg.png" alt=""> <img src="http://acitvityimage.oytour.com/activity/tx_bg.png" alt="">
<div> <div>
<p class="use_o"></p> <p class="use_o"></p>
<p class="use_t"></p> <p class="use_t"></p>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
let href = window.location.href; let href = window.location.href;
// let href = 'https://127.0.0.1:5500/html/GT_activities.html'; // let href = 'https://127.0.0.1:5500/html/GT_activities.html';
// let href='https://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=xcx'; // let href='https://127.0.0.1:5500/html/GT_activities.html?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=xcx';
// console.log("href",href);
let userInfo = {}; let userInfo = {};
let platform=''; let platform='';
...@@ -198,12 +198,11 @@ ...@@ -198,12 +198,11 @@
async: false, async: false,
success: function(res) { success: function(res) {
console.log("res",res);
if (res.resultCode === 1) { if (res.resultCode === 1) {
// let activityEndDate = res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/'); //活动结束时间 // let activityEndDate = res.data.activityEndDate.replace('T', ' ').replace(/-/g, '/'); //活动结束时间
let data=res.data; let data=res.data;
let activityEndDate = data.activityEndDate.split('T')[0].replace(/-/g, '.'); //活动结束时间 let activityEndDate = data.activityEndDate.split('T')[0].replace(/-/g, '.'); //活动结束时间
console.log("re",activityEndDate)
let str=""; let str="";
str+=` str+=`
<div class="img_bg_text" style="position:relative;width: 53%; margin-left: 45%;height: 1.18rem;display: flex;flex-direction: column;align-items: center;padding-top: 0.1rem"> <div class="img_bg_text" style="position:relative;width: 53%; margin-left: 45%;height: 1.18rem;display: flex;flex-direction: column;align-items: center;padding-top: 0.1rem">
......
js/jquery.dataStatistics.js
View file @ 27b7b1b6
...@@ -78,14 +78,14 @@ $.fn.dataStatistics = function(options) { ...@@ -78,14 +78,14 @@ $.fn.dataStatistics = function(options) {
// $(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(http://acitvityimage.oytour.com/activity/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
$('.img_btn p').css("color", "#FFFFFF"); $('.img_btn p').css("color", "#FFFFFF");
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(http://acitvityimage.oytour.com/activity/nobuy_btn.png)");
if (options.nextAc == true) { //显示活动预告 if (options.nextAc == true && $('notice_img').css("display")=="none") { //显示活动预告
$('.dataStatistics').css('display', "none"); $('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex"); $('.deta_replace').css('display', "flex");
$('#notice').css('display', "block"); $('#notice').css('display', "block");
...@@ -212,14 +212,14 @@ $.fn.dataStatistics = function(options) { ...@@ -212,14 +212,14 @@ $.fn.dataStatistics = function(options) {
} else if (nowDate >= activityEndDate || res.data.activityIsEnding == 1) { //活动结束 } else if (nowDate >= activityEndDate || res.data.activityIsEnding == 1) { //活动结束
// $(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(http://acitvityimage.oytour.com/activity/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
$('.img_btn p').css("color", "#FFFFFF"); $('.img_btn p').css("color", "#FFFFFF");
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(http://acitvityimage.oytour.com/activity/nobuy_btn.png)");
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
if (options.nextAc == true) { //显示活动预告 if (options.nextAc == true && $('notice_img').css("display")=="none") { //显示活动预告
$('.dataStatistics').css('display', "none"); $('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex"); $('.deta_replace').css('display', "flex");
$('#notice').css('display', "block"); $('#notice').css('display', "block");
...@@ -234,19 +234,19 @@ $.fn.dataStatistics = function(options) { ...@@ -234,19 +234,19 @@ $.fn.dataStatistics = function(options) {
} else { } else {
$(".received_img").css('display', "block"); $(".received_img").css('display', "block");
$('.img_btn p').html('去使用') $('.img_btn p').html('去使用')
$('.img_btn').css("background-image", "url(../images/buy_btn.png)"); $('.img_btn').css("background-image", "url(http://acitvityimage.oytour.com/activity/buy_btn.png)");
} }
} else { } else {
// $(".received_img").attr("src", ""); // $(".received_img").attr("src", "");
$('.img_bg_M').css("background-image", "url(../images/MJ_200@3x.png)"); $('.img_bg_M').css("background-image", "url(http://acitvityimage.oytour.com/activity/MJ_200@3x.png)");
$('.img_bg_p1').css("color", "#CCCCCC"); $('.img_bg_p1').css("color", "#CCCCCC");
$('.img_bg_p2').css("color", "#CCCCCC"); $('.img_bg_p2').css("color", "#CCCCCC");
$('.img_btn p').css("color", "#FFFFFF"); $('.img_btn p').css("color", "#FFFFFF");
$('.img_btn p').html('活动结束') $('.img_btn p').html('活动结束')
$('.box_content_t').hide() $('.box_content_t').hide()
$('.img_btn').css("background-image", "url(../images/nobuy_btn.png)"); $('.img_btn').css("background-image", "url(http://acitvityimage.oytour.com/activity/nobuy_btn.png)");
if (options.nextAc == true) { //显示活动预告 if (options.nextAc == true && $('notice_img').css("display")=="none") { //显示活动预告
$('.dataStatistics').css('display', "none"); $('.dataStatistics').css('display', "none");
$('.deta_replace').css('display', "flex"); $('.deta_replace').css('display', "flex");
$('#notice').css('display', "block"); $('#notice').css('display', "block");
...@@ -305,7 +305,8 @@ $.fn.dataStatistics = function(options) { ...@@ -305,7 +305,8 @@ $.fn.dataStatistics = function(options) {
// } // }
// localStorage.buyInfo = JSON.stringify(buyInfo) // localStorage.buyInfo = JSON.stringify(buyInfo)
window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}`; // window.location.href = `https://activity.oytour.com/html/Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}`;
window.location.href = `./Rushbuy.html?redemptionPrice=${options.price}&couponId=${options.couponId}&platform=${options.platform}`;
} else { } else {
let data = { let data = {
'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading 'action': 'jump', // showToast->一个提示信息 showHud->一个黑色的loading
......
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