Skip to content

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

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

parents 00a27c96 ce094de2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1013 additions and 824 deletions
html/GT_activities.html
View file @ 58f09285
This diff is collapsed.
html/Rushbuy.html
View file @ 58f09285
......@@ -18,7 +18,7 @@
.main {
width: 100%;
height: 100%;
background: url(../images/gongxi4.png) no-repeat;
background: url(../images/gongxi4.jpg) no-repeat;
background-size: 100%;
background-color: #8d54cc;
position: relative;
......@@ -238,7 +238,7 @@
<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/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>
......@@ -408,7 +408,6 @@
} else {
layer.msg(res.message)
}
layer.msg(res.message)
// window.location.reload()
......
html/coupons.html
View file @ 58f09285
This diff is collapsed.
html/login.html
View file @ 58f09285
This diff is collapsed.
html/pay.html
View file @ 58f09285
......@@ -155,11 +155,11 @@
</div>
<div class="pay_zhifu">
<img class="pay_one" src="../images/login/wechat.png" alt="" />
<img class="pay_one" src="../images/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="../images/checkbox.png" aly="" />
</div>
</div>
</div>
......@@ -191,7 +191,9 @@
payBtn = false;
changesecond = '00:00';
$(".daojishi").html(changesecond);
$('.pay_btn').css({'background-color':'gray'});
$('.pay_btn').css({
'background-color': 'gray'
});
$(".pay_btn").attr("disabled", true);
setTimeout("goActive()", 2000);
return;
......@@ -229,11 +231,13 @@
}
return result;
};
function goActive(){
function goActive() {
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
// window.location.href = 'http://127.0.0.1:5500/html/paySuccess.html';
}
function pay() {
if (!localStorage.openid) {
window.location.href = 'https://activity.oytour.com/html/GT_activities.html';
......
html/paySuccess.html
View file @ 58f09285
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="span/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="divport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi" />
<meta name="divport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi" />
<meta name="screen-orientation" content="portrait">
</meta>
<meta name="x5-orientation" content="portrait">
......@@ -13,29 +13,56 @@
<title>支付订单</title>
</head>
<style>
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, spanarea, p, blockquote, th, td {
body,
div,
dl,
dt,
dd,
ul,
ol,
li,
h1,
h2,
h3,
h4,
h5,
h6,
pre,
code,
form,
fieldset,
legend,
input,
button,
spanarea,
p,
blockquote,
th,
td {
margin: 0;
padding: 0;
}
html,body{
height:100%;
html,
body {
height: 100%;
margin: 0;
padding: 0;
}
.paySuccess{
width:100%;
height:100%;
.paySuccess {
width: 100%;
height: 100%;
position: relative;
text-align: center;
background: url('../images/pay/bg.png') no-repeat;
background-size:100% 100%;
background: url('../images/bg.jpg') no-repeat;
background-size: 100% 100%;
padding-top: 3.1rem;
box-sizing: border-box;
}
/* */
.img_bg_M .received_img{
.img_bg_M .received_img {
position: absolute;
right: 0.14rem;
top: 0.67rem;
......@@ -43,7 +70,8 @@
height: 0.65rem;
display: none;
}
.img_bg_M{
.img_bg_M {
width: 100%;
height: 2.14rem;
background-image: url(../images/M_200.png);
......@@ -51,21 +79,22 @@
background-repeat: no-repeat;
position: relative;
}
.img_bg_M .imgBtn{
.img_bg_M .imgBtn {
margin-top: 0.08rem;
background: url('../images/pay/btn.png') no-repeat;
background-size:100% 100%;
background: url('../images/buy_btn.png') no-repeat;
background-size: 100% 100%;
padding: 0.09rem 0.12rem;
}
.img_bg_M .ylImg{
.img_bg_M .ylImg {
position: absolute;
right: 0;
bottom: 0;
width: 0.85rem;
}
.use_oupon{
.use_oupon {
width: 3.14rem;
height: 0.4rem;
margin-top: 0.16rem;
......@@ -75,42 +104,48 @@
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;
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;
text-align:left;
text-align: left;
}
.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;
text-align:left;
text-align: left;
}
.click_use p {
font-size: 0.11rem;
color: #E03234;
text-align: center;
line-height: 0.25rem;
}
.click_use {
width: 0.8rem;
height: 0.25rem;
......@@ -127,7 +162,7 @@
有效截止日期：
</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="../images/received@3x.png" alt="">
</div>
<div class="use_oupon">
......@@ -153,27 +188,26 @@
<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", "#");
　　}
$(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';
// console.log("href",href);
let userInfo = {};
let platform='';
let platform = '';
// 判断是app和小程序跳转过来的
if (href.split('?')[1]) {
let param = href.split('?')[1].split("&") ? href.split('?')[1].split("&") : null;
......@@ -184,8 +218,8 @@
secretKey: param[3].split('=')[1]
}
platform = param[4].split('=')[1]
}else{
if (localStorage.u){
} else {
if (localStorage.u) {
userInfo = JSON.parse(localStorage.u);
}
}
......@@ -198,14 +232,13 @@
async: false,
success: function(res) {
console.log("res",res);
if (res.resultCode === 1) {
// 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, '.'); //活动结束时间
console.log("re",activityEndDate)
let str="";
str+=`
let 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">
<p class="img_bg_p1" style="font-size: 0.26rem;color: #E03234;padding-top: 0.1rem;font-weight: bold">无敌抵用券</p>
<p class="img_bg_p2" style="font-size: 0.13rem;color: #E03234;padding-top: 0.07rem;">
......@@ -237,25 +270,25 @@
})
$('.imgBtn').click(function() {
if(platform=="xcx"){
if (platform == "xcx") {
// window.location.href = `http://127.0.0.1:5500/html/GT_activities.html?customerId=${userInfo.customerId}&accountId=${userInfo.accountId}&token=${userInfo.token}&secretKey=${userInfo.secretKey}&platform=xcx`;
window.location.href = `https://activity.oytour.com/html/GT_activities.html?customerId=${userInfo.customerId}&accountId=${userInfo.accountId}&token=${userInfo.token}&secretKey=${userInfo.secretKey}&platform=xcx`;
}
else{
window.location.href="https://activity.oytour.com/html/GT_activities.html"
} else {
window.location.href = "https://activity.oytour.com/html/GT_activities.html"
}
})
$('.click_use').click(function() {
if(platform=="xcx"){
if (platform == "xcx") {
wx.miniProgram.getEnv(function(res) {
window.wx.miniProgram.navigateTo({
url: `/pages/member/Coupon/Coupon`,
});
});
}else{
window.location.href="https://activity.oytour.com/html/coupons.html"
} else {
window.location.href = "https://activity.oytour.com/html/coupons.html"
}
})
</script>
</html>
\ No newline at end of file
js/jquery.dataStatistics.js
View file @ 58f09285
This diff is collapsed.
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