Skip to content

S
SURPRISED
Commit d0eed48a authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 51aa1170 5a649ba2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1025 additions and 451 deletions
css/GT_activities.css
View file @ d0eed48a
html,body{
height:100%;
html,
body {
height: 100%;
margin: 0;
padding: 0;
}
p{
display:block;
-webkit-margin-before:0;
-webkit-margin-after:0;
p {
display: block;
-webkit-margin-before: 0;
-webkit-margin-after: 0;
}
#box{
#box {
width: 100%;
height: 100%;
background-image: url(../images/bg2@3x.png);
......@@ -21,21 +20,24 @@ p{
padding-top: 0.7rem;
position: relative;
}
.wx_bg{
width:100%;
height:100%;
background: rgba(00,00,00,0.6);
.wx_bg {
width: 100%;
height: 100%;
background: rgba(00, 00, 00, 0.6);
position: fixed;
top:0;
z-index:999;
top: 0;
z-index: 999;
text-align: center;
display: none;
}
.wx_bg img{
width:2.5rem;
margin-top:50%;
.wx_bg img {
width: 2.5rem;
margin-top: 50%;
}
.box_title{
.box_title {
width: 80%;
margin-left: 10%;
height: 2.38rem;
......@@ -43,15 +45,17 @@ p{
border-radius: 0.08rem;
position: relative;
}
.box_title .G_img{
.box_title .G_img {
width: 0.56rem;
height: 0.57rem;
position: absolute;
left: 1.23rem;
top: -0.235rem;
}
.box_title h5{
font-size: 0.28rem;
.box_title h5 {
font-size: 0.26rem;
color: #C72220;
margin-block-start: 0;
margin-block-end: 0;
......@@ -59,35 +63,38 @@ p{
padding-top: 0.35rem;
/*font-weight: bold;*/
}
.box_title .box_limit{
.box_title .box_limit {
width: 2.6rem;
margin: 0.2rem auto;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.box_text{
.box_text {
font-size: 0.2rem;
color: #111111;
float: left;
}
.box_d{
.box_d {
width: 0.45rem;
height: 0.7rem;
background: #C72220;
float: left;
margin: 0 0.05rem;
border-radius: 0.05rem;
}
.box_d p{
.box_d p {
font-size: 0.54rem;
color: white;
text-align: center;
line-height: 0.7rem;
}
.box_content{
.box_content {
width: 100%;
height: 5.2rem;
background-image: url(../images/bg1@3x.png);
......@@ -97,32 +104,35 @@ p{
left: 0;
top: 1.48rem;
}
.box_content .box_content_t{
.box_content .box_content_t {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
margin-top: 0.1rem;
}
.t_name{
.t_name {
font-size: 0.16rem;
color: white;
}
.time_view{
.time_view {
width: 0.37rem;
height: 0.31rem;
border-radius: 0.07rem;
background: #FAB001;
}
.time_view p{
.time_view p {
font-size: 0.25rem;
color: #E03234;
text-align: center;
line-height: 0.31rem;
}
.img_bg_M{
.img_bg_M {
width: 100%;
height: 2.14rem;
background-image: url(../images/M_200.png);
......@@ -131,17 +141,37 @@ p{
position: relative;
}
/*.img_bg_p1{*/
/* font-size: 0.3rem;*/
/* color: #E03234;*/
/* padding-top: 0.2rem;*/
/*}*/
/*.img_bg_p2{*/
/* font-size: 0.14rem;*/
/* color: #E03234;*/
/* height: 0.2rem;*/
/*}*/
.img_btn{
.img_btn {
width: 1.4rem;
height: 0.38rem;
/*background: #FAB001;*/
......@@ -155,27 +185,30 @@ p{
background-repeat: no-repeat;
}
.img_btn p{
.img_btn p {
font-size: 0.16rem;
color: #E03234;
}
.explain_box{
.explain_box {
background: #C72220;
padding: 0.15rem;
}
.explain{
.explain {
width: 100%;
background: #E03234;
overflow: auto;
}
.explain p{
.explain p {
font-size: 0.12rem;
color: #FFFFFF;
margin: 0.15rem;
line-height: 0.2rem;
}
.img_bg_M .received_img{
.img_bg_M .received_img {
position: absolute;
right: 0.14rem;
top: 0.67rem;
......@@ -183,7 +216,8 @@ p{
height: 0.65rem;
display: none;
}
.box_title_2{
.box_title_2 {
width: 90%;
display: flex;
flex-direction: row;
......@@ -191,12 +225,13 @@ p{
justify-content: center;
margin-left: 5%;
}
.box_title_2 p{
.box_title_2 p {
font-size: 0.26rem;
color: #FFFFFF;
}
#notice{
#notice {
width: 100%;
height: 100%;
position: absolute;
......@@ -207,7 +242,8 @@ p{
z-index: 100;
display: none;
}
.notice_img{
.notice_img {
width: 2.66rem;
height: 3.18rem;
position: absolute;
......@@ -222,20 +258,22 @@ p{
opacity: 1;
display: none;
}
.notice_img img{
.notice_img img {
width: 1.99rem;
height: 0.63rem;
margin-left: 0.3rem;
}
.notice_name{
.notice_name {
font-size: 0.16rem;
color: #FFFFFF;
text-align: center;
margin-top: 0;
}
.notice_content,.notice_content2{
.notice_content,
.notice_content2 {
font-size: 0.10rem;
color: #FFFFFF;
text-align: center;
......@@ -243,7 +281,8 @@ p{
margin-left: 3%;
line-height: 0.2rem;
}
.c_close{
.c_close {
width: 1.2rem;
height: 0.35rem;
border-radius: 0.06rem;
......@@ -253,12 +292,13 @@ p{
justify-content: center;
margin: 0.4rem auto;
}
.c_close p{
.c_close p {
font-size: 0.16rem;
color: #9B0612;
}
.use_oupon{
.use_oupon {
width: 3.14rem;
height: 0.4rem;
margin-top: 0.16rem;
......@@ -268,84 +308,93 @@ p{
align-items: center;
justify-content: space-between;
}
.use_news{
.use_news {
display: flex;
flex-direction: row;
align-items: center;
}
.use_news img{
.use_news img {
width: 0.4rem;
height: 0.4rem;
/*border-radius: 0.2rem;*/
overflow: hidden;
}
.use_news div{
.use_news div {
height: 0.4rem;
margin-left: 0.1rem;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.use_news div p:nth-child(1){
.use_news div p:nth-child(1) {
font-size: 0.12rem;
color: #111111;
}
.use_news div p:nth-child(2){
.use_news div p:nth-child(2) {
font-size: 0.1rem;
color: #888888;
width: 1.8rem;
overflow: hidden;
}
.click_use{
.click_use {
width: 0.8rem;
height: 0.25rem;
border:solid 1px #E03234
border: solid 1px #E03234
}
.click_use p{
.click_use p {
font-size: 0.11rem;
color: #E03234;
text-align: center;
line-height: 0.25rem;
}
.deta_replace{
.deta_replace {
width: 2rem;
height: 0.7rem;
display: none;
flex-direction: row;
justify-content: space-between;
}
.replace_box{
.replace_box {
width: 0.46rem;
height: 100%;
display: inline-block;
position: relative;
}
.replace_top{
.replace_top {
width: 0.46rem;
height:50% ;
height: 50%;
background: #C72220;
border-bottom: 1px solid #FFFFFF;
box-sizing: border-box;
border-radius: 10px 10px 0 0;
}
.replace_bottom{
height:50% ;
.replace_bottom {
height: 50%;
background: #C72220;
box-sizing: border-box;
border-radius: 0 0 10px 10px;
}
.replace_text{
.replace_text {
width: 0.46rem;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
.replace_text p{
.replace_text p {
color: #FFFFFF;
font-family: "Helvetica Neue", Helvetica, sans-serif;
font-size: 0.54rem;
......@@ -354,13 +403,13 @@ p{
text-align: center;
}
.app_share{
.app_share {
width: 100%;
height: 0.35rem;
display: none;
}
.app_sharebox{
.app_sharebox {
width: 90%;
margin-left: 5%;
height: 0.35rem;
......@@ -368,51 +417,58 @@ p{
flex-direction: row;
align-items: center;
}
.app_sharebox p{
.app_sharebox p {
font-size: 0.14rem;
color: white;
margin-right: 0.1rem;
}
.app_sharebox img{
.app_sharebox img {
width: 0.2rem;
height: 0.2rem;
margin-left: 0.15rem;
}
.Noticewarp{
.Noticewarp {
overflow: hidden;
height: 0.3rem;
line-height: 0.3rem;
width: 100%;
position: absolute;
top:2.7rem;
z-index:999;
top: 2.7rem;
z-index: 999;
}
.Noticewarp .scroll {
width: 200%;
float: left;
position: relative;
}
.Noticewarp a {
color: #fff;
width: auto;
float: left;
padding:0 0.2rem 0 0.05rem;
height:0.3rem;
padding: 0 0.2rem 0 0.05rem;
height: 0.3rem;
text-decoration: none;
margin-right:0.1rem;
border-radius:1rem;
background: rgba(0,0,0,0.5);
font-size:0.1rem;
margin-right: 0.1rem;
border-radius: 1rem;
background: rgba(0, 0, 0, 0.5);
font-size: 0.1rem;
display: inline-block;
}
.scroll a img{
width:0.25rem;
height:0.25rem;
.scroll a img {
width: 0.25rem;
height: 0.25rem;
vertical-align: middle;
position: relative;
top:-0.02rem;
border-radius:50%;
top: -0.02rem;
border-radius: 50%;
}
.Noticewarp a:last-child{
margin-right:0;
.Noticewarp a:last-child {
margin-right: 0;
}
\ No newline at end of file
html/GT_activities.html
View file @ d0eed48a
This diff is collapsed.
html/Rushbuy.html
View file @ d0eed48a
This diff is collapsed.
html/coupons.html
View file @ d0eed48a
......@@ -380,9 +380,9 @@
</div>
<div class="goToDownLoad">
<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()">
下载同业App使用<img src="../images/login/arrowR.png" alt=""/>
下载同业App使用<img src="http://acitvityimage.oytour.com/activity/arrowR.png" alt=""/>
</span>
</div>
</div>
......@@ -395,6 +395,18 @@
<script>
$(function(){
pushHistory();
　　　　window.addEventListener("popstate", function(e) {
　　　　//根据自己的需求实现自己的功能
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
　　}, false);
　　function pushHistory() {
　　　　var state = {
　　　　title: "title",
　　　　url: "#"
　　};
　　　　window.history.pushState(state, "title", "#");
　　}
$(document).click(function(e){
var target = $(e.target);
if(target.closest(".coupons_Navone").length != 0) return;
......
html/login.html
View file @ d0eed48a
......@@ -19,7 +19,7 @@
position: relative;
height: 100%;
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;
}
.login_page .page__bd{
......@@ -229,22 +229,22 @@
<div class="login_denglu">
<div class='page__bd'>
<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'>
<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>
</div>
<div class='form'>
<div class='form_item1'>
<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>
<input class='form_item_input' id="UserAccount" type='number' placeholder="请输入手机号"></input>
</div>
</div>
<div class='form_item2'>
<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>
<input class='form_item_input' id="passWord" type="password" placeholder="请输入密码"></input>
</div>
......@@ -265,29 +265,29 @@
<div class="login_jihuo">
<div class='page__bd'>
<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'>
<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>
</div>
<div class='form'>
<div class='form_item1'>
<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>
<input class='form_item_input' type='number' id="Activation_Account" placeholder="请输入手机号"></input>
</div>
</div>
<div class='form_item2'>
<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>
<input class='form_item_input' type="password" id="Activation_password" placeholder="请输入密码"></input>
</div>
</div>
<div class='form_item2'>
<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>
<input class='form_validate_input' id="Activation_valicode" placeholder="请输入验证码"></input>
<span class="login_yzm" onclick="getCode()">发送验证码</span>
......@@ -304,7 +304,7 @@
</div>
<div class="login_Agreement">
<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 class="boxcenter">
<h1>《用户协议和法律协议》 本协议为您与本APP管理者之间所订立的契约，具有合同的法律效力，请您仔细阅读。</h1>
......
html/pay.html
View file @ d0eed48a
......@@ -155,11 +155,11 @@
</div>
<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>
<div class="pay_three">
<!-- <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>
......@@ -230,7 +230,7 @@
return result;
};
function goActive(){
window.location.href = 'https://activity.oytour.com/html/paySuccess.html';
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
// window.location.href = 'http://127.0.0.1:5500/html/paySuccess.html';
}
......
html/paySuccess.html
View file @ d0eed48a
......@@ -153,6 +153,20 @@
<script type="text/javascript" src="../js/mian.js"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<script>
$(function(){
　　pushHistory();
　　　　window.addEventListener("popstate", function(e) {
　　　　//根据自己的需求实现自己的功能
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
　　}, false);
　　function pushHistory() {
　　　　var state = {
　　　　title: "title",
　　　　url: "#"
　　};
　　　　window.history.pushState(state, "title", "#");
　　}
});
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?customerId=1549&accountId=1182&token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1NzM0NjY2NjMuMCwiZXhwIjoxNTczNTUzMDYzLjAsInVzZXJJbmZvIjp7InVpZCI6IjExODIiLCJyZXF1ZXN0RnJvbSI6NH19.hX2b2MqSWYmWS0k3YsthxW-T6UxarIm5rdbqCVQtxdQ&secretKey=5d5e16254bd741c486fe2b83b42171d2&platform=xcx';
......
js/jquery.dataStatistics.js
View file @ d0eed48a
This diff is collapsed.
js/mian.js
View file @ d0eed48a
let locationName = window.location.hostname;
function getApiUrl() {
let url = {
urlPost: "https://reborn.oytour.com/api/common/post",
//urlPost: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.2.214:8082/api/common/post",
//urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
urlJava: "https://efficient.oytour.com/"
}
return url
let url = {
urlPost: "https://reborn.oytour.com/api/common/post",
//urlPost: locationName.indexOf('oytour') !== -1 ? "http://reborn.oytour.com/api/common/post" : "http://192.168.2.214:8082/api/common/post",
//urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
urlJava: "https://efficient.oytour.com/"
}
return url
}
String.prototype.myReplace=function(f,e){ //时间格式化 苹果手机-替换为/
var reg=new RegExp(f,"g"); //创建正则RegExp对象
return this.replace(reg,e);
String.prototype.myReplace = function(f, e) { //时间格式化 苹果手机-替换为/
var reg = new RegExp(f, "g"); //创建正则RegExp对象
return this.replace(reg, e);
}
function getLocalStorage() {
var localStorageData = window.localStorage["userInfo"];
if (localStorageData != undefined) {
return JSON.parse(localStorageData);
} else {
return null;
}
var localStorageData = window.localStorage["userInfo"];
if (localStorageData != undefined) {
return JSON.parse(localStorageData);
} else {
return null;
}
}
function getLocalStorage2() {
var localStorageData = window.localStorage["userInfo2"];
if (localStorageData != undefined) {
return JSON.parse(localStorageData);
} else {
return null;
}
var localStorageData = window.localStorage["userInfo2"];
if (localStorageData != undefined) {
return JSON.parse(localStorageData);
} else {
return null;
}
}
function clearLocalStorage() {
window.localStorage.removeItem('userInfo')
window.localStorage.removeItem('userInfo')
}
function getAjaxData(cmd, msg, tk) {
if (msg == null || msg == "") {
msg = {}
}
let timestamp = (new Date()).valueOf();
let token = "";
let key = "";
if (getLocalStorage() != null) {
token = getLocalStorage().token;
key = getLocalStorage().secretKey;
}
let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
let md5Str = hex_md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
let postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": tk ? tk : token,
"sign": md5Str
}
return JSON.stringify(postData)
if (msg == null || msg == "") {
msg = {}
}
let timestamp = (new Date()).valueOf();
let token = "";
let key = "";
if (getLocalStorage() != null) {
token = getLocalStorage().token;
key = getLocalStorage().secretKey;
}
let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
let md5Str = hex_md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
let postData = {
"msg": msg,
"cmd": cmd,
"timestamp": timestamp,
"token": tk ? tk : token,
"sign": md5Str
}
return JSON.stringify(postData)
}
function getJavaData(msg) {
if (msg == null || msg == "") {
msg = {}
}
let timestamp = (new Date()).valueOf();
let token = "";
let key = "";
if (getLocalStorage() != null) {
token = getLocalStorage().token;
key = getLocalStorage().SecretKey;
} else if (getLocalStorage2() != null) {
if (getLocalStorage2() != null) {
token = getLocalStorage2().token;
key = getLocalStorage2().secretKey;
}
}
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : JSON.parse(localStorage.userInfo2) ? JSON.parse(localStorage.userInfo2) : ''
let uid = userInfo.accountId ? userInfo.accountId : 0
let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
let md5Str = hex_md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
let postData = {
"groupId": 2,
"msg": msg,
"uid": uid,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
return JSON.stringify(postData)
if (msg == null || msg == "") {
msg = {}
}
let timestamp = (new Date()).valueOf();
let token = "";
let key = "";
if (getLocalStorage() != null) {
token = getLocalStorage().token;
key = getLocalStorage().secretKey;
} else if (getLocalStorage2() != null) {
if (getLocalStorage2() != null) {
token = getLocalStorage2().token;
key = getLocalStorage2().secretKey;
}
}
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : JSON.parse(localStorage.userInfo2) ? JSON.parse(localStorage.userInfo2) : ''
let uid = userInfo.accountId ? userInfo.accountId : 0
let encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
let md5Str = hex_md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
let postData = {
"groupId": 2,
"msg": msg,
"uid": uid,
"timestamp": timestamp,
"token": token,
"sign": md5Str
}
return JSON.stringify(postData)
}
function getJavaA(msg, tk) {
......@@ -110,4 +114,4 @@ function getJavaA(msg, tk) {
"uid": uid,
}
return JSON.stringify(postData)
}
}
\ No newline at end of file
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