diff --git a/home.html b/home.html index 62e5130..da29206 100644 --- a/home.html +++ b/home.html @@ -33,6 +33,7 @@
停车时长:
进场时间:
停车总费用:
+
商户优惠减免:
已支付金额:
优惠金额:
订单编号: 1234567890
@@ -85,7 +86,7 @@ - + diff --git a/js/list.js b/js/list.js index 0128dcf..bcb89fa 100644 --- a/js/list.js +++ b/js/list.js @@ -14,12 +14,11 @@ function getQueryString(location) { return theRequest; } - -var func ={ - openid:'', - token:'', - unpaid:'', - countType:'' +var func = { + openid: '', + token: '', + unpaid: '', + countType: '' }; @@ -34,32 +33,32 @@ $('#payCarNum').text(_carNumber) */ var salt = jsajax.salt(32); var sortd = [ - {keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'}, - {keyname:'deviceInfo',value:'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E'}, - {keyname:'salt',value:salt}, - {keyname:'sign_type',value:'md5'}, - {keyname:'token',value:'8957e613280b46f7ae8aaea71ed17353'}, - {keyname:'pageNum',value:1}, - {keyname:'pageSize',value:10}, - {keyname:'parkState',value:10}, - {keyname:'terminalSource',value:7}, - {keyname:'carNumber',value:_carNumber} + { keyname: 'app_id', value: '0eca8f5373ca4866aec2f8e9d9367104' }, + { keyname: 'deviceInfo', value: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E' }, + { keyname: 'salt', value: salt }, + { keyname: 'sign_type', value: 'md5' }, + { keyname: 'token', value: '8957e613280b46f7ae8aaea71ed17353' }, + { keyname: 'pageNum', value: 1 }, + { keyname: 'pageSize', value: 10 }, + { keyname: 'parkState', value: 10 }, + { keyname: 'terminalSource', value: 7 }, + { keyname: 'carNumber', value: _carNumber } ]; var md5sign = jsajax.getsign(sortd); var jsondata = { - app_id:"0eca8f5373ca4866aec2f8e9d9367104", - deviceInfo:"BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", - salt:salt, - sign_type :"md5", - token:'8957e613280b46f7ae8aaea71ed17353', - pageNum:1, - pageSize:10, - parkState:10, - terminalSource:7, - carNumber:_carNumber, - sign:md5sign + app_id: "0eca8f5373ca4866aec2f8e9d9367104", + deviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", + salt: salt, + sign_type: "md5", + token: '8957e613280b46f7ae8aaea71ed17353', + pageNum: 1, + pageSize: 10, + parkState: 10, + terminalSource: 7, + carNumber: _carNumber, + sign: md5sign } -console.log('停车记录传参 '+JSON.stringify(jsondata)); +console.log('停车记录传参 ' + JSON.stringify(jsondata)); jsajax.defaultReq( mUrl.listServer, JSON.stringify(jsondata), @@ -67,12 +66,12 @@ jsajax.defaultReq( console.log(data.data.dataList) var data = data.data.dataList; - if(data.length==0){ + if (data.length == 0) { $('#tip-title').text('暂无停车记录') return } - var htmls=''; - for (var i=0;i= 60 * 60 * 24) { - time = parseInt(time / 3600.0/24) + "天" +parseInt((parseFloat(time / 3600.0/24)- + time = parseInt(time / 3600.0 / 24) + "天" + parseInt((parseFloat(time / 3600.0 / 24) - - parseInt(time / 3600.0/24))*24) + "小时" + parseInt((parseFloat(time / 3600.0) - + parseInt(time / 3600.0 / 24)) * 24) + "小时" + parseInt((parseFloat(time / 3600.0) - parseInt(time / 3600.0)) * 60) + "分钟" + @@ -219,47 +216,44 @@ var dateFormat = function(msd){ return time; }; - -$(document).on('click','.weui-cells',function () { +$(document).on('click', '.weui-cells', function () { console.log($(this).attr('data-flag')) var flag = $(this).attr('data-flag') - if(flag == 0){ + if (flag == 0) { - }else{ + } else { var money = $(this).find('.paymoney').text() var carNumber = $(this).find('.carNumber').text() //var parkCode = $(this).find('.parkCode').text() var orderId = $(this).find('.orderId').text() - var parkCode= $(this).find('.parkCode').text() + var parkCode = $(this).find('.parkCode').text() // var carNumber = $(this).find('.carNumber').text() var paySrcType = $(this).find('.paySrcType').text() - if(paySrcType == '欠费'){ + if (paySrcType == '欠费') { paySrcType = 103 - }else{ + } else { paySrcType = 101 } - localStorage.setItem('paySrcType',paySrcType) - localStorage.setItem('parkCode',parkCode) + localStorage.setItem('paySrcType', paySrcType) + localStorage.setItem('parkCode', parkCode) - getOneorder(carNumber,parkCode,orderId,paySrcType) + getOneorder(carNumber, parkCode, orderId, paySrcType) } - - }) -$(document).on('click','.out-btn',function () { +$(document).on('click', '.out-btn', function () { var _this = $(this).parent().parent().parent(); var money = _this.find('.paymoney').text() console.log(money) - var _orderId = _this.find('.orderId').text() + var _orderId = _this.find('.orderId').text() var carNumber = _this.find('.carNumber').text() //var parkCode = $(this).find('.parkCode').text() // var orderId = _this.find('.orderId').text() - var parkCode= _this.find('.parkCode').text() + var parkCode = _this.find('.parkCode').text() // var carNumber = $(this).find('.carNumber').text() var paySrcType = _this.find('.paySrcType').text() @@ -272,9 +266,8 @@ $(document).on('click','.out-btn',function () { // } // alert(paySrcType) console.log(paySrcType) - localStorage.setItem('paySrcType',paySrcType) - localStorage.setItem('parkCode',parkCode) - + localStorage.setItem('paySrcType', paySrcType) + localStorage.setItem('parkCode', parkCode) var salt = jsajax.salt(32); var token = mUrl.GetToken(); @@ -303,26 +296,24 @@ $(document).on('click','.out-btn',function () { function (data) { console.log(data) - if(data.code=='5005'){ - getOneorder(carNumber,parkCode,_orderId) + if (data.code == '5005') { + getOneorder(carNumber, parkCode, _orderId) - }else{ + } else { //$('.dialog-out').show() - window.location.href='zeroout.html?carNumber='+carNumber + window.location.href = 'zeroout.html?carNumber=' + carNumber } // alert(data.message) - }) }) -$('.close-btn').on('click',function () { +$('.close-btn').on('click', function () { $('.dialog-out').hide() }) - //查询单个待支付单费用 -function getOneorder(carNumber,parkCode,orderId,_paySrcType){ +function getOneorder(carNumber, parkCode, orderId, _paySrcType) { //alert(_paySrcType) // var salt = jsajax.salt(32); // var token = mUrl.GetToken(); @@ -335,120 +326,117 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ var _payType = 0; - - if (/MicroMessenger/.test(window.navigator.userAgent)) { - _payType = 4 - } else { - _payType = 1 - } + if (/MicroMessenger/.test(window.navigator.userAgent)) { + _payType = 4 + } else { + _payType = 1 + } var jsondata = { app_id: "0eca8f5373ca4866aec2f8e9d9367104", - deviceInfo : "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", - salt : salt, - sign : getMd5sign(), - sign_type : "md5", - token : token, - payType:_payType, - paySrcType:_paySrcType, - appId:jsajax.appID, - orderId:orderId, - terminalSource:'7', - parkCode:parkCode, - carNumber:carNumber, + deviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", + salt: salt, + sign: getMd5sign(), + sign_type: "md5", + token: token, + payType: _payType, + paySrcType: _paySrcType, + appId: jsajax.appID, + orderId: orderId, + terminalSource: '7', + parkCode: parkCode, + carNumber: carNumber, } - console.log('查询单个的入参 '+JSON.stringify(jsondata)+" 请求的接口"+mUrl.oneCardorder); + console.log('查询单个的入参 ' + JSON.stringify(jsondata) + " 请求的接口" + mUrl.oneCardorder); jsajax.defaultReq( mUrl.oneCardorder, JSON.stringify(jsondata), - function(data){ + function (data) { console.log(data) - console.log('获取单个待支付订单 '+JSON.stringify(data)); - if(data.code=='0'){ + console.log('获取单个待支付订单 ' + JSON.stringify(data)); + if (data.code == '0') { //setdiv(); - setTimeout(function(){ + setTimeout(function () { var datas = data.data console.log(datas) var discountFee = datas.discountFee;//已优惠 var discountDesc = datas.discountDesc;//已优惠 var parkCode = datas.parkCode; var no = datas.orderId;//.no;//订单id - var inparktime = datas.inparktime;//.inparktime;//进场时间 - var plateno = datas.plateno;//车牌号 - var parkName = datas.parkName;//停车场名称 - var staytime = datas.staytime;//停车时长 + var inparktime = datas.inparktime;//.inparktime;//进场时间 + var plateno = datas.plateno;//车牌号 + var parkName = datas.parkName;//停车场名称 + var staytime = datas.staytime;//停车时长 var due = datas.due;//总计费用 var unpaid = datas.unpaid;//待支付 var paid = datas.paid;//实付 var discountType = datas.discountType; + var businessUsedType = datas.businessUsedType //商户信息-是否使用商户券，1-使用，0-未使用 + var businessFee = datas.businessFee //商户减扣金额 - if(datas.discountFee&&datas.discountFee!=''&&datas.discountFee!=undefined){ + if (datas.discountFee && datas.discountFee != '' && datas.discountFee != undefined) { discountFee = datas.discountFee;//已优惠 - if(datas.discountDesc&&datas.discountDesc!=''&&datas.discountDesc!=undefined){ + if (datas.discountDesc && datas.discountDesc != '' && datas.discountDesc != undefined) { discountDesc = datas.discountDesc;//已优惠 } } //console.log('-------------------------------'+discountType); //查询到车牌号订单信息 - var src = 'home.html?carnum='+plateno - +"&inparktime="+inparktime - +"&parkName="+parkName - +"&staytime="+staytime - +"&due="+due - +"&unpaid="+unpaid - +"&paid="+paid - +"&no="+no - +"&disfee="+discountFee - +"&disdesc="+discountDesc - +'&discountType='+discountType - +'&parkCode='+parkCode - +'&orderId='+datas.orderId - +'&discountFee='+datas.discountFee - +'&parkOutTime='+datas.outtime - +'&orderFee='+datas.orderFee - +'&appOrderTimeout='+datas.appOrderTimeout - +'&appId='+datas.appId - +'&orderId='+datas.orderId - +'&_paySrcType='+_paySrcType - +"&"; + var src = 'home.html?carnum=' + plateno + + "&inparktime=" + inparktime + + "&parkName=" + parkName + + "&staytime=" + staytime + + "&due=" + due + + "&unpaid=" + unpaid + + "&paid=" + paid + + "&no=" + no + + "&disfee=" + discountFee + + "&disdesc=" + discountDesc + + '&discountType=' + discountType + + '&parkCode=' + parkCode + + '&orderId=' + datas.orderId + + '&discountFee=' + datas.discountFee + + '&parkOutTime=' + datas.outtime + + '&orderFee=' + datas.orderFee + + '&appOrderTimeout=' + datas.appOrderTimeout + + '&appId=' + datas.appId + + '&orderId=' + datas.orderId + + '&_paySrcType=' + _paySrcType + + "&businessUsedType=" + businessUsedType + + "&businessFee=" + businessFee console.log(src) window.location.assign(encodeURI(src)) - },100); + }, 100); } } ) } - - - -function getMd5sign() -{ +function getMd5sign() { var salt = jsajax.salt(32); var token = mUrl.GetToken(); if (token == null) { token = ''; } var sortd = [ - {keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'}, - {keyname:'deviceInfo',value:'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E'}, - {keyname:'salt',value:salt}, - {keyname:'sign_type',value:'md5'}, - {keyname:'token',value:token} + { keyname: 'app_id', value: '0eca8f5373ca4866aec2f8e9d9367104' }, + { keyname: 'deviceInfo', value: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E' }, + { keyname: 'salt', value: salt }, + { keyname: 'sign_type', value: 'md5' }, + { keyname: 'token', value: token } ]; var md5sign = jsajax.getsign(sortd); return md5sign; } - -$('.outBtn').on('click',function () { +$('.outBtn').on('click', function () { //window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Chifeng/Threewf/stoppayment/select.html' window.location.href = 'http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/out.html' }) -$('.hiddenBtn').on('click',function () { +$('.hiddenBtn').on('click', function () { $('#strTip').hide() }) diff --git a/js/pay.js b/js/pay.js index 1acc258..8e83f31 100644 --- a/js/pay.js +++ b/js/pay.js @@ -561,6 +561,17 @@ var webAppClass = { $paid = getObjectByID("paid"),//已支付金额 $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 $discountFee = getObjectByID("discountFee");//优惠金额 + $businessFeeWrap = getObjectByID("businessFeeWrap") + $businessFee = getObjectByID("businessFee") + // var businessUsedType = dataselectt[12].split('=')[1]; //商户信息-是否使用商户券，1-使用，0-未使用 + // var businessFee = dataselectt[13].split('=')[1]; //商户减扣金额 + // + // if (businessUsedType == 0) { + // $('.businessFee-wrap').css('display', 'none') + // } else { + // $('.businessFee-wrap').css('display', 'block') + // $('#businessFee').text((businessFee/100).toFixed(2)) + // } if (params != null && params != "") { var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); @@ -575,6 +586,12 @@ var webAppClass = { $inparktime.innerHTML = params.inparktime; $staytime.innerHTML = formatSeconds(params.staytime); + if (params.businessUsedType == 0) { + $('#businessFeeWrap').css('display', 'none') + } else { + $businessFee.innerHTML = '￥' + (params.businessFee / 100).toFixed(2); + } + $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); $discountFee.innerHTML = params.discountFee;//优惠金额 diff --git a/listnew.html b/listnew.html index 6c78769..6008476 100644 --- a/listnew.html +++ b/listnew.html @@ -13,9 +13,9 @@ - + - + @@ -25,16 +25,20 @@ .all_told, .platen_number { text-align: center; } + .all_told { padding: 30px 0 10px 0; } + .all_told span { margin-right: 5px; font-size: 22px; } + .discount_money { color: #fc3817; } + .discount { padding: 4px 7px; background: #fc3817; @@ -43,6 +47,7 @@ margin-left: 10px; color: #fff; } + .discount:before { position: absolute; content: ''; @@ -54,48 +59,54 @@ border-bottom: 6px solid transparent; border-right: 6px solid #fc3817; } - .youhuid{ + + .youhuid { background: #f00; color: #fff; font-size: 13px; - padding:2px 5px; + padding: 2px 5px; border-radius: 3px; margin-left: 2px; display: none; } - .showTooltips{ + + .showTooltips { display: none; /*针对苹果新增手势*/ cursor: pointer; } - .weui-cells{ + + .weui-cells { /*针对苹果新增手势*/ cursor: pointer; } - .dialog-out{ + + .dialog-out { position: absolute; width: 100%; height: 100%; - top:0; + top: 0; right: 0; left: 0; bottom: 0; z-index: 1000; - background: rgba(0,0,0,.3); + background: rgba(0, 0, 0, .3); display: none; } - .dia-con{ + + .dia-con { width: 305px; height: 138px; - padding: 10px ; - background:rgba(255,255,255,1); - border-radius:8px; + padding: 10px; + background: rgba(255, 255, 255, 1); + border-radius: 8px; position: absolute; left: 50%; - top:50%; - transform: translate(-50%,-50%); + top: 50%; + transform: translate(-50%, -50%); } - .close-btn{ + + .close-btn { float: right; width: 16px; height: 16px; @@ -104,21 +115,24 @@ cursor: pointer; overflow: hidden; } - .dia-main{ + + .dia-main { margin-left: 30px; margin-top: 30px; height: 52px; padding-left: 90px; background: url("img/out.png") no-repeat; - background-size: 52px 52px; + background-size: 52px 52px; } - .dia-text{ + + .dia-text { padding-top: 20px; text-align: center; font-size: 12px; color: #999; } - .arrears-btn{ + + .arrears-btn { width: 70px; height: 25px; margin-top: 20px; @@ -127,44 +141,49 @@ text-align: center; line-height: 25px; background: url("img/arrears-bg.png") no-repeat; - background-size:70px 25px ; + background-size: 70px 25px; } - .strTip{ + .strTip { width: 100%; height: 100%; text-align: center; font-size: 20px; - background: rgba(0,0,0,.7); + background: rgba(0, 0, 0, .7); position: fixed; - top:0; + top: 0; left: 0; } - .strWrap{ + + .strWrap { width: 80%; background: #fff; border-radius: 4px; margin: 50px auto 0; padding: 0 10px 15px; } - .strCon{ + + .strCon { text-align: center; font-size: 20px; color: #333; text-align: center; } - .header-title{ + + .header-title { padding: 15px 0; font-size: 14px; font-weight: 600; - border-bottom:1px solid #ccc ; + border-bottom: 1px solid #ccc; color: #333; } - .payCarNum{ + + .payCarNum { font-size: 16px; color: #D40202; } - .btn{ + + .btn { color: #fff; font-size: 20px; @@ -173,10 +192,12 @@ border-radius: 8px; cursor: pointer; } - .hiddenBtn{ + + .hiddenBtn { background: #79cbbf; } - .outBtn{ + + .outBtn { background: #509f93; } @@ -190,7 +211,8 @@
- 申请离场 + 申请离场
@@ -206,16 +228,14 @@
- - - - - - - + + + + + + + - - @@ -228,14 +248,14 @@ - +