Commit bcf9fa58 by libai

Merge branch 'master' of git.yabolive.net:libai/footseen-large-website into master

parents e982a55e 0e887194
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png"> <link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png">
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta content="telephone=no" name="format-detection"> <meta content="telephone=no" name="format-detection">
......
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
</body> </body>
<script src="../lib/jquery-3.1.1.min.js"></script> <script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../lib/spark-md5.min.js"></script> <script src="../lib/spark-md5.min.js"></script>
<script src="../lib/default.js?v=2022120502"></script> <script src="../lib/default.js?v=2022120901"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script> <script src="../layer-v3.1.0/layer/layer.js"></script>
<!-- <script src="../lib/inobounce.js"></script> --> <!-- <script src="../lib/inobounce.js"></script> -->
......
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/swiper.min.js"></script> <script src="lib/swiper.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<script> <script>
$(function(){ $(function(){
var browserLang = navigator.language var browserLang = navigator.language
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png"> <link rel="apple-touch-icon-precomposed" href="icon/fox-icon.png">
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta content="telephone=no" name="format-detection"> <meta content="telephone=no" name="format-detection">
...@@ -408,8 +408,21 @@ ...@@ -408,8 +408,21 @@
$(function(){ $(function(){
//判斷渠道 //判斷渠道
if(sessionStorage.pmt!=undefined&&sessionStorage.pmt!='undefined'){ if(sessionStorage.pmt!=undefined&&sessionStorage.pmt!='undefined'){
if(sessionStorage.pmt=="other"){
$.ajax({
url:$ip+'activeLog/h5Active',
data:{
pmt:'other',
pageID:localStorage.canvasCode
},
success:function(data){
history.pushState('','','/mobile/');
sessionStorage.pmt='undefined'
}
})
return;
}
var pmtNumber=sessionStorage.pmt.split('/d/')[1] var pmtNumber=sessionStorage.pmt.split('/d/')[1]
console.log(pmtNumber)
$.ajax({ $.ajax({
url:$ip+'frontPage/queryLinkNumberCid', url:$ip+'frontPage/queryLinkNumberCid',
type: 'get', type: 'get',
...@@ -423,7 +436,6 @@ $(function(){ ...@@ -423,7 +436,6 @@ $(function(){
// console.log(data) // console.log(data)
if(data.code==1){ if(data.code==1){
myCid=data.h5Cid myCid=data.h5Cid
} }
} }
}) })
...@@ -433,10 +445,24 @@ $(function(){ ...@@ -433,10 +445,24 @@ $(function(){
pmt:myCid, pmt:myCid,
pageID:localStorage.canvasCode pageID:localStorage.canvasCode
}, },
async:false,
success:function(data){ success:function(data){
history.pushState('','','/mobile/'); // history.pushState('','','/mobile/');
sessionStorage.pmt='undefined' // sessionStorage.pmt='undefined'
sessionStorage.myCid=myCid sessionStorage.myCid=myCid
$.ajaxSetup({
global: false,
type: 'get',
data: {
lang:2,
os:'h5',
cid:sessionStorage.myCid,
webVersion:'1000',
uid: localStorage.uid,
token: localStorage.token,
},
dataType: "JSON"
})
} }
}) })
} }
...@@ -693,8 +719,8 @@ $(function(){ ...@@ -693,8 +719,8 @@ $(function(){
pageID:localStorage.canvasCode, pageID:localStorage.canvasCode,
}, },
success:function(data){ success:function(data){
if(sessionStorage.myCid!=undefined&&sessionStorage.myCid!="undefined") window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"" window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+""
else window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr=ftsH5"
} }
}) })
...@@ -764,8 +790,8 @@ $(function(){ ...@@ -764,8 +790,8 @@ $(function(){
pageID:localStorage.canvasCode, pageID:localStorage.canvasCode,
}, },
success:function(data){ success:function(data){
if(sessionStorage.myCid!=undefined&&sessionStorage.myCid!="undefined") window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"" window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+""
else window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr=ftsH5&uid="+localStorage.uid+""
} }
}) })
...@@ -1221,17 +1247,17 @@ $(function(){ ...@@ -1221,17 +1247,17 @@ $(function(){
} }
if(startY<e.changedTouches[0].clientY){ if(startY<e.changedTouches[0].clientY){
//向下 //向下
var ua = window.navigator.userAgent.toLowerCase(); // var ua = window.navigator.userAgent.toLowerCase();
if (/iphone|ipad|ipod/.test(ua)) { // if (/iphone|ipad|ipod/.test(ua)) {
if(sessionStorage.type!="pwa")return; // if(sessionStorage.type!="pwa")return;
if($("body").offset().top!=0)return; // if($("body").offset().top!=0)return;
if(zwidth>3){ // if(zwidth>3){
setTimeout(function(){ // setTimeout(function(){
window.location.reload() // window.location.reload()
},300) // },300)
} // }
} // }
} }
}) })
......
...@@ -27,8 +27,8 @@ sessionStorage.topicId=data.topicId ...@@ -27,8 +27,8 @@ sessionStorage.topicId=data.topicId
if(data.tag==undefined)data.tag='' if(data.tag==undefined)data.tag=''
sessionStorage.tag=data.tag sessionStorage.tag=data.tag
sessionStorage.qd=data.qd sessionStorage.qd=data.qd
if(sessionStorage.myCid==undefined||sessionStorage.myCid=="undefined")sessionStorage.myCid='ftsH5'
if(data.go!=undefined)sessionStorage.go=data.go if(data.go!=undefined)sessionStorage.go=data.go
if(sessionStorage.type==undefined||sessionStorage.type=="undefined"){ if(sessionStorage.type==undefined||sessionStorage.type=="undefined"){
sessionStorage.type=data.type; sessionStorage.type=data.type;
} }
...@@ -78,7 +78,7 @@ if(data.back!=undefined)backGo=data.back; ...@@ -78,7 +78,7 @@ if(data.back!=undefined)backGo=data.back;
data: { data: {
lang:2, lang:2,
os:'h5', os:'h5',
cid:'ftsH5', cid:sessionStorage.myCid,
webVersion:'1000', webVersion:'1000',
uid: localStorage.uid, uid: localStorage.uid,
token: localStorage.token, token: localStorage.token,
......
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/swiper.min.js"></script> <script src="lib/swiper.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<script> <script>
$(function(){ $(function(){
var browserLang = navigator.language var browserLang = navigator.language
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/keywords.js"></script> <script src="../lib/keywords.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<script> <script>
</script> </script>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</script> </script>
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
......
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
</body> </body>
<script src="../lib/jquery-3.1.1.min.js"></script> <script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../lib/spark-md5.min.js"></script> <script src="../lib/spark-md5.min.js"></script>
<script src="../lib/default.js?v=2022120502"></script> <script src="../lib/default.js?v=2022120901"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script> <script src="../layer-v3.1.0/layer/layer.js"></script>
<!-- <script src="../lib/inobounce.js"></script> --> <!-- <script src="../lib/inobounce.js"></script> -->
...@@ -925,8 +925,8 @@ $(function(){ ...@@ -925,8 +925,8 @@ $(function(){
pageID:localStorage.canvasCode, pageID:localStorage.canvasCode,
}, },
success:function(data){ success:function(data){
if(sessionStorage.myCid!=undefined&&sessionStorage.myCid!="undefined") window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"" window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+""
else window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr=ftsH5&uid="+localStorage.uid+""
} }
}) })
}) })
...@@ -1771,8 +1771,7 @@ $(function(){ ...@@ -1771,8 +1771,7 @@ $(function(){
pageID:localStorage.canvasCode, pageID:localStorage.canvasCode,
}, },
success:function(data){ success:function(data){
if(sessionStorage.myCid!=undefined&&sessionStorage.myCid!="undefined")window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+"" window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr="+sessionStorage.myCid+"&uid="+localStorage.uid+""
else window.location.href="https://www.footseen.com/footseen/phonepay/applepay.html?lang=2&gofrom=web&cidStr=ftsH5&uid="+localStorage.uid+""
} }
}) })
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</script> </script>
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script> <script src="layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/keywords.js"></script> <script src="../lib/keywords.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<script> <script>
</script> </script>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</script> </script>
<script src="lib/jquery-3.1.1.min.js"></script> <script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/spark-md5.min.js"></script> <script src="lib/spark-md5.min.js"></script>
<script src="lib/default.js?v=2022120502"></script> <script src="lib/default.js?v=2022120901"></script>
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
......
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 sign in to comment