Skip to content

N
nwjs
Commit 07be23c9 authored by qipeng's avatar qipeng
Browse files
Options

自助机BUG修复

parent 6425325b
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 33 deletions
nwjs-v0.25.2-win-ia32/TubidaNewSale/css/common.css
View file @ 07be23c9
...@@ -180,14 +180,14 @@ body{background-size: 100% 100%;} ...@@ -180,14 +180,14 @@ body{background-size: 100% 100%;}
.scanId .foMiddle>p:nth-child(6) span:first-child{color: #00cc8c;} .scanId .foMiddle>p:nth-child(6) span:first-child{color: #00cc8c;}
.scanId .foBottom{margin-top: 160px;} .scanId .foBottom{margin-top: 160px;}
.scanId .foBottom p:nth-child(2){margin-top: 90px;color: #00CC8C;font-size: 34px;} .scanId .foBottom p:nth-child(2){margin-top: 90px;color: #00CC8C;font-size: 34px;}
.foHand{position: absolute;top: 880px;left:405px;} .foHand{position: absolute;top: 780px;left:405px;}
/*reprint页面*/ /*reprint页面*/
.reprint .IMiddle{margin-top: 180px;} .reprint .IMiddle{margin-top: 180px;}
.reprint .IMiddle p{font-size: 36px;} .reprint .IMiddle p{font-size: 36px;}
.reprint .IMiddle p:nth-child(2){margin-top: 10px;} .reprint .IMiddle p:nth-child(2){margin-top: 10px;}
.reprint .IMiddle p:nth-child(3){margin-top: 110px;} .reprint .IMiddle p:nth-child(3){margin-top: 110px;}
.reprint .Ihand{position: absolute;left: 405px;top: 880px;} .reprint .Ihand{position: absolute;left: 405px;top: 780px;}
/*print页面*/ /*print页面*/
.salePrint>p:nth-child(1){margin-top: 260px;font-size: 70px;font-weight: bold;color: #00CC8C;} .salePrint>p:nth-child(1){margin-top: 260px;font-size: 70px;font-weight: bold;color: #00CC8C;}
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/home/base_welcome.js
View file @ 07be23c9
...@@ -18,6 +18,7 @@ $(function () { ...@@ -18,6 +18,7 @@ $(function () {
window.codeName = "ScanCode"; window.codeName = "ScanCode";
window.idName = "ScanID"; window.idName = "ScanID";
function go(url) { function go(url) {
if (!init) { if (!init) {
return; return;
...@@ -46,6 +47,7 @@ $(function () { ...@@ -46,6 +47,7 @@ $(function () {
// 返回根据缓存加载数据的方法 // 返回根据缓存加载数据的方法
setPageLoad(function (cache, $page) { setPageLoad(function (cache, $page) {
console.log(Base)
let res = Base.getRes(cache.data); let res = Base.getRes(cache.data);
if (res.error) { if (res.error) {
showStatus(res.message); showStatus(res.message);
...@@ -57,11 +59,13 @@ $(function () { ...@@ -57,11 +59,13 @@ $(function () {
$sort.hide(); $sort.hide();
$sort_tip.hide(); $sort_tip.hide();
$oBottom.hide(); $oBottom.hide();
if (init) { if (init) {
// todo: 这里调试修改 // todo: 这里调试修改
// Base.config.sale = true; // Base.config.sale = true;
// Base.config.sort = false; // Base.config.sort = false;
//Base.config.sortGuoji = true; //Base.config.sortGuoji = true;
if(Base.config.ermai){ if(Base.config.ermai){
$ermaiIndex.show(); $ermaiIndex.show();
} }
...@@ -75,6 +79,7 @@ $(function () { ...@@ -75,6 +79,7 @@ $(function () {
$commonHead.hide()//公共头部隐藏 $commonHead.hide()//公共头部隐藏
$img_Logo.hide()//底部logo隐藏 $img_Logo.hide()//底部logo隐藏
$body.hide()//长江索道隐藏 $body.hide()//长江索道隐藏
} }
else{ else{
$sale.show(); $sale.show();
...@@ -102,6 +107,7 @@ $(function () { ...@@ -102,6 +107,7 @@ $(function () {
// $sale.click(); // $sale.click();
$oBottom.show(); $oBottom.show();
} }
} }
}); });
}); });
\ No newline at end of file
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/home/index.js
View file @ 07be23c9
...@@ -96,11 +96,51 @@ $(function () { ...@@ -96,11 +96,51 @@ $(function () {
}; };
window.initScenic = function () { window.initScenic = function () {
//排号
if(Base.config.sort){
$(".titleSort").css("display","inline-block");
}else{
$(".titleSort").css("display","none");
}
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".oMiddle").css("color", "#fff");
$(".oBottom p").css("color", "#fff");
$(".whiteStyle").css("color", "#fff");
}
//背景图片，头部logo,二维码控制(马戏城) //背景图片，头部logo,二维码控制(马戏城)
$(".drag").css("background", "url(" + Base.config.bodyBack + ") no-repeat"); Base.config.pictures.forEach(item => {
if(item.pictureType=="selfHelpImg2"){
if(item.items.length!=0){
$(".drag").css("background", "url(" + item.items[0].displayUrl + ") no-repeat");
}
}
});
$(".drag").css("background-size", "100% 100%"); $(".drag").css("background-size", "100% 100%");
$(".logoImg").attr("src", Base.config.logoImg); Base.config.pictures.forEach(item => {
$(".erweima").attr("src", Base.config.erweima); if(item.pictureType=="selfHelpLog"){
if(item.items.length!=0){
$(".logoImg").attr("src",item.items[0].displayUrl)
}
}
});
Base.config.pictures.forEach(item => {
if(item.pictureType=="selfHelpCode"){
if(item.items.length!=0){
$(".erweima").attr("src",item.items[0].displayUrl)
}
}
});
Base.config.pictures.forEach(item => {
if(item.pictureType=="selfHelpImg"){
if(item.items.length!=0){
$("#cjsdBckaground").css("background", "url(" + item.items[0].displayUrl + ") no-repeat");
}
}
});
// $(".logoImg").attr("src", Base.config.logoImg);
// $(".erweima").attr("src", Base.config.erweima);
}; };
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/home/input_id.js
View file @ 07be23c9
...@@ -12,6 +12,11 @@ $(function () { ...@@ -12,6 +12,11 @@ $(function () {
var nextFunc = null; var nextFunc = null;
var isMobile = false; var isMobile = false;
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
/** /**
* 设置值 * 设置值
* @param value 值 * @param value 值
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/buyNum.js
View file @ 07be23c9
...@@ -32,6 +32,10 @@ $(function () { ...@@ -32,6 +32,10 @@ $(function () {
getRangeList: Base.getStoreUrl("sort/time/batchQuery") getRangeList: Base.getStoreUrl("sort/time/batchQuery")
}; };
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
/** /**
* 去掉手机号空格 * 去掉手机号空格
* @param mobile 手机号码 * @param mobile 手机号码
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/buyNumOk.js
View file @ 07be23c9
...@@ -14,6 +14,10 @@ $(function () { ...@@ -14,6 +14,10 @@ $(function () {
// 返回根据缓存加载数据的方法 // 返回根据缓存加载数据的方法
setPageLoad(function (cache, $page) { setPageLoad(function (cache, $page) {
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
let res = Base.getRes(cache.data); let res = Base.getRes(cache.data);
if (res.error) { if (res.error) {
showError(res); showError(res);
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/pay.js
View file @ 07be23c9
...@@ -19,7 +19,10 @@ $(function () { ...@@ -19,7 +19,10 @@ $(function () {
let flag = 0; let flag = 0;
let autoFlag = 0; let autoFlag = 0;
let channelOrderId = 0; let channelOrderId = 0;
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
/** /**
* 请求服务并生成订单,新增成功后调用定时支付。 * 请求服务并生成订单,新增成功后调用定时支付。
*/ */
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/print.js
View file @ 07be23c9
...@@ -6,6 +6,11 @@ $(function () { ...@@ -6,6 +6,11 @@ $(function () {
var total = 0; var total = 0;
var flag = 0; var flag = 0;
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
// 获取设备中心 // 获取设备中心
var hardEvent = { var hardEvent = {
on: function (res) { on: function (res) {
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/product.js
View file @ 07be23c9
...@@ -22,6 +22,10 @@ $(function () { ...@@ -22,6 +22,10 @@ $(function () {
function next() { function next() {
clearTimeout(flag); clearTimeout(flag);
wait(); wait();
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
var channelIdNum = Base.config.checkGroup.buyChannelId var channelIdNum = Base.config.checkGroup.buyChannelId
let dt = new Date().formatString("yyyy-MM-dd"); let dt = new Date().formatString("yyyy-MM-dd");
let data = { let data = {
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/js/sale/scanId.js
View file @ 07be23c9
...@@ -8,6 +8,11 @@ $(function () { ...@@ -8,6 +8,11 @@ $(function () {
let $prevBtn = $body.find(".prevBtn"); let $prevBtn = $body.find(".prevBtn");
let $inputCard = $body.find(".inputCard"); let $inputCard = $body.find(".inputCard");
//专属洞舰背景颜
if(Base.config.companyName =="洞舰1号" ){
$(".whiteStyle").css("color", "#fff");
}
// 获取设备中心 // 获取设备中心
let hardEvent = { let hardEvent = {
on: function (res) { on: function (res) {
...@@ -115,10 +120,18 @@ $(function () { ...@@ -115,10 +120,18 @@ $(function () {
// 修改背景图片 // 修改背景图片
function updateBack(isIn) { function updateBack(isIn) {
let img = "../../img/buyBg.jpg"; let img = ''
if (isIn) { Base.config.pictures.forEach(item => {
img = "../../img/buyBg2.jpg"; if(item.pictureType=="selfHelpImg2"){
} if(item.items.length!=0){
img =item.items[0].displayUrl
}
}
});
//let img = "../../img/buyBg.jpg";
// if (isIn) {
// img = "../../img/buyBg2.jpg";
// }
$("body").css({ $("body").css({
backgroundImage: "url(" + img + ")" backgroundImage: "url(" + img + ")"
}); });
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/home/base_welcome.html
View file @ 07be23c9
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
</div> </div>
<!----------------------------------长江索道第一个页面新版本--------------------------------------------------> <!----------------------------------长江索道第一个页面新版本-------------------------------------------------->
<div class="cjsdFirst ermaiIndex" <div class="cjsdFirst ermaiIndex" id="cjsdBckaground"
style="position: absolute;top: 0;left: 0;z-index: 10;min-width: 1080px;height: 1920px;background:url(../../img/cjsdFirst.jpg) no-repeat;background-size: 100% 100%;"> style="position: absolute;top: 0;left: 0;z-index: 10;min-width: 1080px;height: 1920px;background:url(../../img/buyBg2.jpg) no-repeat;background-size: 100% 100%;">
<p style="position: absolute;bottom: 620px;width: 100%;text-align: center;"> <p style="position: absolute;bottom: 620px;width: 100%;text-align: center;">
<a class="sale" <a class="sale"
style="font-size: 60px;background: rgb(0, 231, 207);line-height: 100px;margin-right: 40px;width: 340px;display: inline-block;border-radius: 10px;text-align: center; color: #ffffff;box-shadow: 5px 5px 10px #d1cab4;"> style="font-size: 60px;background: rgb(0, 231, 207);line-height: 100px;margin-right: 40px;width: 340px;display: inline-block;border-radius: 10px;text-align: center; color: #ffffff;box-shadow: 5px 5px 10px #d1cab4;">
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/home/index.html
View file @ 07be23c9
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
</script> </script>
<body class="drag"> <body class="drag">
<div class="commonHead commonHead1 no_drag"> <div class="commonHead commonHead1 no_drag">
<p><img style="width:180px;" class="logoImg"></p> <p><img style="display: block;width:180px;height: auto;margin: 0 auto;" class="logoImg"></p>
<p class="titleLogin"></p> <p class="titleLogin whiteStyle"></p>
<p class="titleLoginEn"></p> <p class="titleLoginEn whiteStyle"></p>
</div> </div>
<div class="comTop no_drag"> <div class="comTop no_drag">
</div> </div>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="comTime" style="position: absolute;right: 100px;top: 52px;color: #ff001e;font-size: 52px;"> <div class="comTime" style="position: absolute;right: 100px;top: 52px;color: #ff001e;font-size: 52px;">
<p> <p>
<span style="margin-right: 8px;" class="IndexTime">60</span><i <span style="margin-right: 8px;" class="IndexTime">60</span><i
style="position: relative;top: -4px;color: #666;">s</i> style="position: relative;top: -4px;color: #666;" class="whiteStyle">s</i>
</p> </p>
</div> </div>
</body> </body>
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/home/input_id.html
View file @ 07be23c9
<div class="fiBody inputId"> <div class="fiBody inputId">
<div class="fiMiddle"> <div class="fiMiddle">
<p>登记身份信息</p> <p class="whiteStyle">登记身份信息</p>
<p> <p>
<input type="text" placeholder="请输入身份证号、护照" maxlength="18" class="fiId reset" data-field="ID" data-reset=""/> <input type="text" placeholder="请输入身份证号、护照" maxlength="18" class="fiId reset" data-field="ID" data-reset=""/>
</p> </p>
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/buyNum.html
View file @ 07be23c9
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
style="margin-left: 10px;color: #ef0404;" class="reset" data-field="sortTotalTime"></span> style="margin-left: 10px;color: #ef0404;" class="reset" data-field="sortTotalTime"></span>
</p> </p>
<p class="sMp3"> <p class="sMp3">
<span style="overflow:hidden;text-overflow: ellipsis;white-space: nowrap;"> <span class="whiteStyle" style="overflow:hidden;text-overflow: ellipsis;white-space: nowrap;">
<b class="reset" data-field="productName" data-reset=""></b> <b class="reset" data-field="productName" data-reset=""></b>
<b style="font-size:24px;font-weight: normal;"> <b style="font-size:24px;font-weight: normal;">
...@@ -65,14 +65,14 @@ ...@@ -65,14 +65,14 @@
</span> </span>
</p> </p>
<p class="sMp4" style="margin-top: 60px;"> <p class="sMp4" style="margin-top: 60px;">
<span>请选择购票张数</span> <span class="whiteStyle">请选择购票张数</span>
<span class="sInput"> <span class="sInput">
<span class="minus">-</span> <span class="minus">-</span>
<!--<span type="text" class="sInput1" /><i>1</i></span>--> <!--<span type="text" class="sInput1" /><i>1</i></span>-->
<input type="text" class="sInput1 reset" data-field="buyNum" data-reset="1" value="1"/> <input type="text" class="sInput1 reset" data-field="buyNum" data-reset="1" value="1"/>
<span class="plus">+</span> <span class="plus">+</span>
</span> </span>
<span><span style="color: #666;">总金额</span><br/><span><i style="font-size: 28px;">￥</i><i <span><span class="whiteStyle" style="color: #666;">总金额</span><br/><span><i style="font-size: 28px;">￥</i><i
class="priceT reset" data-field="salePricePayTotal" data-reset="0">0</i></span></span> class="priceT reset" data-field="salePricePayTotal" data-reset="0">0</i></span></span>
</p> </p>
<div class="pn_Service"> <div class="pn_Service">
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
温馨提示: 单个耳麦押金<i class="depositPrice2" style="color: #FF0000;font-weight: bold;">0</i>元，归还时退还。 温馨提示: 单个耳麦押金<i class="depositPrice2" style="color: #FF0000;font-weight: bold;">0</i>元，归还时退还。
</p> </p>
<p class="sP3" style="margin-top: 60px;"> <p class="sP3" style="margin-top: 60px;">
<span>请输入手机号码</span> <span class="whiteStyle">请输入手机号码</span>
<span><input maxlength="11" class="sInput2 reset" data-field="mobile" data-reset=""/><br/><i <span><input maxlength="11" class="sInput2 reset" data-field="mobile" data-reset=""/><br/><i
id="mobile_error" style="display: none;"><img id="mobile_error" style="display: none;"><img
src="../../img/warning.png">请输入正确的手机号码</i></span> src="../../img/warning.png">请输入正确的手机号码</i></span>
...@@ -113,9 +113,7 @@ ...@@ -113,9 +113,7 @@
<div class="sBright"> <div class="sBright">
<img width="329px" class="erweima"/> <img width="329px" class="erweima"/>
<p> <p>
关注<span class="titleLogin"></span>公众号，手机直 关注<span class="titleLogin"></span>公众号，手机直接购票<span class="titleSort">排号</span>，还可获取更多<span class="titleLogin"></span>资讯及周边玩乐
接购票排号，还可获取更多索
道资讯及周边玩乐
</p> </p>
</div> </div>
</div> </div>
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/buyNumOk.html
View file @ 07be23c9
<div class="tBody buyNumOk"> <div class="tBody buyNumOk">
<p class="tp1"> <p class="tp1 whiteStyle">
请确认您的购票信息 请确认您的购票信息
</p> </p>
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/pay.html
View file @ 07be23c9
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<div class="wait" style="font-size: 48px;color: #00CC8C;">正在初始化订单中，请稍后...</div> <div class="wait" style="font-size: 48px;color: #00CC8C;">正在初始化订单中，请稍后...</div>
<div class="success" style="display: none;"> <div class="success" style="display: none;">
<p style="font-size: 36px;">请扫描下面的二维码进行支付，支付成功会打印门票.</p> <p class="whiteStyle" style="font-size: 36px;">请扫描下面的二维码进行支付，支付成功会打印门票.</p>
<p style="margin-top: 80px;"><img data-field="PayCodeUrl" src="../../img/wait.png"/></p> <p style="margin-top: 80px;"><img data-field="PayCodeUrl" src="../../img/wait.png"/></p>
<p style="margin-top: 30px;"> <p style="margin-top: 30px;">
<img src="../../img/alipay.png" style="width: 142px;margin:0 45px 0 -15px;" /> <img src="../../img/alipay.png" style="width: 142px;margin:0 45px 0 -15px;" />
<img src="../../img/weChart.png" style="width: 110px;position: relative;top: -18px;" /> <img src="../../img/weChart.png" style="width: 110px;position: relative;top: -18px;" />
</p> </p>
<p style="margin-top: 60px;font-size: 48px;">请在<span <p style="margin-top: 60px;font-size: 48px;" class="whiteStyle">请在<span
id="payTime" data-field="PayCodeUrlTime" style="color:#ff001e;margin: 0 10px;">0</span>秒内支付. id="payTime" data-field="PayCodeUrlTime" style="color:#ff001e;margin: 0 10px;">0</span>秒内支付.
</p> </p>
<p style="width: 80%;margin: 0 auto;margin-top: 80px;font-size: 42px;color:#ff001e;line-height: 80px;text-align: left;"> <p style="width: 80%;margin: 0 auto;margin-top: 80px;font-size: 42px;color:#ff001e;line-height: 80px;text-align: left;">
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/print.html
View file @ 07be23c9
<div class="siBody salePrint"> <div class="siBody salePrint">
<p>支付成功！</p> <p>支付成功！</p>
<p>正在打印出票，请稍等...</p> <p class="whiteStyle">正在打印出票，请稍等...</p>
<p>第<span data-field="printPos">1</span><span class="printTag">/</span><span data-field="printTotal">1</span>张</p> <p class="whiteStyle">第<span data-field="printPos">1</span><span class="printTag">/</span><span data-field="printTotal">1</span>张</p>
<p data-field="msg" style="font-size: 36px;color: #FF0000;margin-top: 60px;"></p> <p data-field="msg" style="font-size: 36px;color: #FF0000;margin-top: 60px;"></p>
<div class="foBottom"> <div class="foBottom">
<p> <p>
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/product.html
View file @ 07be23c9
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<!--${sale.productName}--> <!--${sale.productName}-->
{@/each} {@/each}
</script> </script>
<p style="text-align: center;">欢迎使用<span class="titleLogin"></span></p> <p style="text-align: center;" class="whiteStyle">欢迎使用<span class="titleLogin"></span></p>
<p style="text-align: center;">自助购票系统</p> <p style="text-align: center;" class="whiteStyle">自助购票系统</p>
<!--<p>请选择购票类型</p>--> <!--<p>请选择购票类型</p>-->
<div class="pn_product"> <div class="pn_product">
<!-- 将产品列表放于此 --> <!-- 将产品列表放于此 -->
......
nwjs-v0.25.2-win-ia32/TubidaNewSale/page/sale/scanId.html
View file @ 07be23c9
<div class="foBody scanId"> <div class="foBody scanId">
<div class="foMiddle"> <div class="foMiddle whiteStyle">
<p>乘坐<span class="titleLogin"></span>需进行身份验证</p> <p>乘坐<span class="titleLogin"></span>需进行身份验证</p>
<p>请将身份证<span style="color: red">插入</span>扫描区</p> <p>请将身份证<span style="color: red">插入</span>扫描区</p>
<p>当前验证第<i class="reset" data-field="buyNumPos" data-reset="1">1</i>张票，总共需验证<i <p class="whiteStyle">当前验证第<i class="reset" data-field="buyNumPos" data-reset="1">1</i>张票，总共需验证<i
class="reset" data-field="buyNum" data-reset="0">0</i>张票</p> class="reset" data-field="buyNum" data-reset="0">0</i>张票</p>
<p><img src="../../img/foId.png"></p> <p><img src="../../img/foId.png"></p>
<p> <p>
......
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