Commit 82ee4529580cf31edafd953668a6e89f9202f9ed
1 parent
404d9b83
商户减免优惠
Showing
4 changed files
with
200 additions
and
174 deletions
home.html
| @@ -33,6 +33,7 @@ | @@ -33,6 +33,7 @@ | ||
| 33 | <div><span>停车时长:</span><span id="staytime"></span></div> | 33 | <div><span>停车时长:</span><span id="staytime"></span></div> |
| 34 | <div><span>进场时间:</span><span id="inparktime"></span></div> | 34 | <div><span>进场时间:</span><span id="inparktime"></span></div> |
| 35 | <div><span>停车总费用:</span><span id="due"></span></div> | 35 | <div><span>停车总费用:</span><span id="due"></span></div> |
| 36 | + <div id="businessFeeWrap"><span>商户优惠减免:</span><span id="businessFee"></span></div> | ||
| 36 | <div><span>已支付金额:</span><span id="paid"></span></div> | 37 | <div><span>已支付金额:</span><span id="paid"></span></div> |
| 37 | <div><span>优惠金额:</span><span id="discountFee"></span><span id="discountDesc"></span></div> | 38 | <div><span>优惠金额:</span><span id="discountFee"></span><span id="discountDesc"></span></div> |
| 38 | <div><span>订单编号: </span><span id="orderNum">1234567890</span> </div> | 39 | <div><span>订单编号: </span><span id="orderNum">1234567890</span> </div> |
| @@ -85,7 +86,7 @@ | @@ -85,7 +86,7 @@ | ||
| 85 | <script src="js/config.js?c=1.1"></script> | 86 | <script src="js/config.js?c=1.1"></script> |
| 86 | <script src="js/common.js?b=2.11"></script> | 87 | <script src="js/common.js?b=2.11"></script> |
| 87 | <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>--> | 88 | <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>--> |
| 88 | -<script src="js/pay.js?i=2.20"></script> | 89 | +<script src="js/pay.js?i=2.60"></script> |
| 89 | </body> | 90 | </body> |
| 90 | 91 | ||
| 91 | </html> | 92 | </html> |
js/list.js
| @@ -14,12 +14,11 @@ function getQueryString(location) { | @@ -14,12 +14,11 @@ function getQueryString(location) { | ||
| 14 | return theRequest; | 14 | return theRequest; |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | - | ||
| 18 | -var func ={ | ||
| 19 | - openid:'', | ||
| 20 | - token:'', | ||
| 21 | - unpaid:'', | ||
| 22 | - countType:'' | 17 | +var func = { |
| 18 | + openid: '', | ||
| 19 | + token: '', | ||
| 20 | + unpaid: '', | ||
| 21 | + countType: '' | ||
| 23 | 22 | ||
| 24 | }; | 23 | }; |
| 25 | 24 | ||
| @@ -34,32 +33,32 @@ $('#payCarNum').text(_carNumber) | @@ -34,32 +33,32 @@ $('#payCarNum').text(_carNumber) | ||
| 34 | */ | 33 | */ |
| 35 | var salt = jsajax.salt(32); | 34 | var salt = jsajax.salt(32); |
| 36 | var sortd = [ | 35 | var sortd = [ |
| 37 | - {keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'}, | ||
| 38 | - {keyname:'deviceInfo',value:'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E'}, | ||
| 39 | - {keyname:'salt',value:salt}, | ||
| 40 | - {keyname:'sign_type',value:'md5'}, | ||
| 41 | - {keyname:'token',value:'8957e613280b46f7ae8aaea71ed17353'}, | ||
| 42 | - {keyname:'pageNum',value:1}, | ||
| 43 | - {keyname:'pageSize',value:10}, | ||
| 44 | - {keyname:'parkState',value:10}, | ||
| 45 | - {keyname:'terminalSource',value:7}, | ||
| 46 | - {keyname:'carNumber',value:_carNumber} | 36 | + { keyname: 'app_id', value: '0eca8f5373ca4866aec2f8e9d9367104' }, |
| 37 | + { keyname: 'deviceInfo', value: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E' }, | ||
| 38 | + { keyname: 'salt', value: salt }, | ||
| 39 | + { keyname: 'sign_type', value: 'md5' }, | ||
| 40 | + { keyname: 'token', value: '8957e613280b46f7ae8aaea71ed17353' }, | ||
| 41 | + { keyname: 'pageNum', value: 1 }, | ||
| 42 | + { keyname: 'pageSize', value: 10 }, | ||
| 43 | + { keyname: 'parkState', value: 10 }, | ||
| 44 | + { keyname: 'terminalSource', value: 7 }, | ||
| 45 | + { keyname: 'carNumber', value: _carNumber } | ||
| 47 | ]; | 46 | ]; |
| 48 | var md5sign = jsajax.getsign(sortd); | 47 | var md5sign = jsajax.getsign(sortd); |
| 49 | var jsondata = { | 48 | var jsondata = { |
| 50 | - app_id:"0eca8f5373ca4866aec2f8e9d9367104", | ||
| 51 | - deviceInfo:"BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", | ||
| 52 | - salt:salt, | ||
| 53 | - sign_type :"md5", | ||
| 54 | - token:'8957e613280b46f7ae8aaea71ed17353', | ||
| 55 | - pageNum:1, | ||
| 56 | - pageSize:10, | ||
| 57 | - parkState:10, | ||
| 58 | - terminalSource:7, | ||
| 59 | - carNumber:_carNumber, | ||
| 60 | - sign:md5sign | 49 | + app_id: "0eca8f5373ca4866aec2f8e9d9367104", |
| 50 | + deviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", | ||
| 51 | + salt: salt, | ||
| 52 | + sign_type: "md5", | ||
| 53 | + token: '8957e613280b46f7ae8aaea71ed17353', | ||
| 54 | + pageNum: 1, | ||
| 55 | + pageSize: 10, | ||
| 56 | + parkState: 10, | ||
| 57 | + terminalSource: 7, | ||
| 58 | + carNumber: _carNumber, | ||
| 59 | + sign: md5sign | ||
| 61 | } | 60 | } |
| 62 | -console.log('停车记录传参 '+JSON.stringify(jsondata)); | 61 | +console.log('停车记录传参 ' + JSON.stringify(jsondata)); |
| 63 | jsajax.defaultReq( | 62 | jsajax.defaultReq( |
| 64 | mUrl.listServer, | 63 | mUrl.listServer, |
| 65 | JSON.stringify(jsondata), | 64 | JSON.stringify(jsondata), |
| @@ -67,12 +66,12 @@ jsajax.defaultReq( | @@ -67,12 +66,12 @@ jsajax.defaultReq( | ||
| 67 | console.log(data.data.dataList) | 66 | console.log(data.data.dataList) |
| 68 | 67 | ||
| 69 | var data = data.data.dataList; | 68 | var data = data.data.dataList; |
| 70 | - if(data.length==0){ | 69 | + if (data.length == 0) { |
| 71 | $('#tip-title').text('暂无停车记录') | 70 | $('#tip-title').text('暂无停车记录') |
| 72 | return | 71 | return |
| 73 | } | 72 | } |
| 74 | - var htmls=''; | ||
| 75 | - for (var i=0;i<data.length;i++) { | 73 | + var htmls = ''; |
| 74 | + for (var i = 0; i < data.length; i++) { | ||
| 76 | var orderFreeDuration = Number((data[i].orderFreeDuration)) | 75 | var orderFreeDuration = Number((data[i].orderFreeDuration)) |
| 77 | var parkDuration = Number((data[i].parkDuration)) | 76 | var parkDuration = Number((data[i].parkDuration)) |
| 78 | var num = ((data[i].unPayFee) / 100).toFixed(2); | 77 | var num = ((data[i].unPayFee) / 100).toFixed(2); |
| @@ -167,12 +166,10 @@ jsajax.defaultReq( | @@ -167,12 +166,10 @@ jsajax.defaultReq( | ||
| 167 | 166 | ||
| 168 | // alert(data.message) | 167 | // alert(data.message) |
| 169 | 168 | ||
| 170 | - | ||
| 171 | }) | 169 | }) |
| 172 | 170 | ||
| 173 | - | ||
| 174 | -var dateFormat = function(msd){ | ||
| 175 | - var time =msd | 171 | +var dateFormat = function (msd) { |
| 172 | + var time = msd | ||
| 176 | 173 | ||
| 177 | if (null != time && "" != time) { | 174 | if (null != time && "" != time) { |
| 178 | 175 | ||
| @@ -196,9 +193,9 @@ var dateFormat = function(msd){ | @@ -196,9 +193,9 @@ var dateFormat = function(msd){ | ||
| 196 | 193 | ||
| 197 | } else if (time >= 60 * 60 * 24) { | 194 | } else if (time >= 60 * 60 * 24) { |
| 198 | 195 | ||
| 199 | - time = parseInt(time / 3600.0/24) + "天" +parseInt((parseFloat(time / 3600.0/24)- | 196 | + time = parseInt(time / 3600.0 / 24) + "天" + parseInt((parseFloat(time / 3600.0 / 24) - |
| 200 | 197 | ||
| 201 | - parseInt(time / 3600.0/24))*24) + "小时" + parseInt((parseFloat(time / 3600.0) - | 198 | + parseInt(time / 3600.0 / 24)) * 24) + "小时" + parseInt((parseFloat(time / 3600.0) - |
| 202 | 199 | ||
| 203 | parseInt(time / 3600.0)) * 60) + "分钟" + | 200 | parseInt(time / 3600.0)) * 60) + "分钟" + |
| 204 | 201 | ||
| @@ -219,47 +216,44 @@ var dateFormat = function(msd){ | @@ -219,47 +216,44 @@ var dateFormat = function(msd){ | ||
| 219 | return time; | 216 | return time; |
| 220 | }; | 217 | }; |
| 221 | 218 | ||
| 222 | - | ||
| 223 | -$(document).on('click','.weui-cells',function () { | 219 | +$(document).on('click', '.weui-cells', function () { |
| 224 | console.log($(this).attr('data-flag')) | 220 | console.log($(this).attr('data-flag')) |
| 225 | var flag = $(this).attr('data-flag') | 221 | var flag = $(this).attr('data-flag') |
| 226 | - if(flag == 0){ | 222 | + if (flag == 0) { |
| 227 | 223 | ||
| 228 | - }else{ | 224 | + } else { |
| 229 | var money = $(this).find('.paymoney').text() | 225 | var money = $(this).find('.paymoney').text() |
| 230 | 226 | ||
| 231 | var carNumber = $(this).find('.carNumber').text() | 227 | var carNumber = $(this).find('.carNumber').text() |
| 232 | //var parkCode = $(this).find('.parkCode').text() | 228 | //var parkCode = $(this).find('.parkCode').text() |
| 233 | var orderId = $(this).find('.orderId').text() | 229 | var orderId = $(this).find('.orderId').text() |
| 234 | - var parkCode= $(this).find('.parkCode').text() | 230 | + var parkCode = $(this).find('.parkCode').text() |
| 235 | // var carNumber = $(this).find('.carNumber').text() | 231 | // var carNumber = $(this).find('.carNumber').text() |
| 236 | var paySrcType = $(this).find('.paySrcType').text() | 232 | var paySrcType = $(this).find('.paySrcType').text() |
| 237 | - if(paySrcType == '欠费'){ | 233 | + if (paySrcType == '欠费') { |
| 238 | paySrcType = 103 | 234 | paySrcType = 103 |
| 239 | - }else{ | 235 | + } else { |
| 240 | paySrcType = 101 | 236 | paySrcType = 101 |
| 241 | } | 237 | } |
| 242 | - localStorage.setItem('paySrcType',paySrcType) | ||
| 243 | - localStorage.setItem('parkCode',parkCode) | 238 | + localStorage.setItem('paySrcType', paySrcType) |
| 239 | + localStorage.setItem('parkCode', parkCode) | ||
| 244 | 240 | ||
| 245 | - getOneorder(carNumber,parkCode,orderId,paySrcType) | 241 | + getOneorder(carNumber, parkCode, orderId, paySrcType) |
| 246 | } | 242 | } |
| 247 | 243 | ||
| 248 | - | ||
| 249 | - | ||
| 250 | }) | 244 | }) |
| 251 | 245 | ||
| 252 | -$(document).on('click','.out-btn',function () { | 246 | +$(document).on('click', '.out-btn', function () { |
| 253 | var _this = $(this).parent().parent().parent(); | 247 | var _this = $(this).parent().parent().parent(); |
| 254 | 248 | ||
| 255 | var money = _this.find('.paymoney').text() | 249 | var money = _this.find('.paymoney').text() |
| 256 | console.log(money) | 250 | console.log(money) |
| 257 | - var _orderId = _this.find('.orderId').text() | 251 | + var _orderId = _this.find('.orderId').text() |
| 258 | 252 | ||
| 259 | var carNumber = _this.find('.carNumber').text() | 253 | var carNumber = _this.find('.carNumber').text() |
| 260 | //var parkCode = $(this).find('.parkCode').text() | 254 | //var parkCode = $(this).find('.parkCode').text() |
| 261 | // var orderId = _this.find('.orderId').text() | 255 | // var orderId = _this.find('.orderId').text() |
| 262 | - var parkCode= _this.find('.parkCode').text() | 256 | + var parkCode = _this.find('.parkCode').text() |
| 263 | // var carNumber = $(this).find('.carNumber').text() | 257 | // var carNumber = $(this).find('.carNumber').text() |
| 264 | 258 | ||
| 265 | var paySrcType = _this.find('.paySrcType').text() | 259 | var paySrcType = _this.find('.paySrcType').text() |
| @@ -272,9 +266,8 @@ $(document).on('click','.out-btn',function () { | @@ -272,9 +266,8 @@ $(document).on('click','.out-btn',function () { | ||
| 272 | // } | 266 | // } |
| 273 | // alert(paySrcType) | 267 | // alert(paySrcType) |
| 274 | console.log(paySrcType) | 268 | console.log(paySrcType) |
| 275 | - localStorage.setItem('paySrcType',paySrcType) | ||
| 276 | - localStorage.setItem('parkCode',parkCode) | ||
| 277 | - | 269 | + localStorage.setItem('paySrcType', paySrcType) |
| 270 | + localStorage.setItem('parkCode', parkCode) | ||
| 278 | 271 | ||
| 279 | var salt = jsajax.salt(32); | 272 | var salt = jsajax.salt(32); |
| 280 | var token = mUrl.GetToken(); | 273 | var token = mUrl.GetToken(); |
| @@ -303,26 +296,24 @@ $(document).on('click','.out-btn',function () { | @@ -303,26 +296,24 @@ $(document).on('click','.out-btn',function () { | ||
| 303 | function (data) { | 296 | function (data) { |
| 304 | console.log(data) | 297 | console.log(data) |
| 305 | 298 | ||
| 306 | - if(data.code=='5005'){ | ||
| 307 | - getOneorder(carNumber,parkCode,_orderId) | 299 | + if (data.code == '5005') { |
| 300 | + getOneorder(carNumber, parkCode, _orderId) | ||
| 308 | 301 | ||
| 309 | - }else{ | 302 | + } else { |
| 310 | //$('.dialog-out').show() | 303 | //$('.dialog-out').show() |
| 311 | - window.location.href='zeroout.html?carNumber='+carNumber | 304 | + window.location.href = 'zeroout.html?carNumber=' + carNumber |
| 312 | } | 305 | } |
| 313 | // alert(data.message) | 306 | // alert(data.message) |
| 314 | 307 | ||
| 315 | - | ||
| 316 | }) | 308 | }) |
| 317 | 309 | ||
| 318 | }) | 310 | }) |
| 319 | -$('.close-btn').on('click',function () { | 311 | +$('.close-btn').on('click', function () { |
| 320 | $('.dialog-out').hide() | 312 | $('.dialog-out').hide() |
| 321 | }) | 313 | }) |
| 322 | 314 | ||
| 323 | - | ||
| 324 | //查询单个待支付单费用 | 315 | //查询单个待支付单费用 |
| 325 | -function getOneorder(carNumber,parkCode,orderId,_paySrcType){ | 316 | +function getOneorder(carNumber, parkCode, orderId, _paySrcType) { |
| 326 | //alert(_paySrcType) | 317 | //alert(_paySrcType) |
| 327 | // var salt = jsajax.salt(32); | 318 | // var salt = jsajax.salt(32); |
| 328 | // var token = mUrl.GetToken(); | 319 | // var token = mUrl.GetToken(); |
| @@ -335,120 +326,117 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ | @@ -335,120 +326,117 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ | ||
| 335 | 326 | ||
| 336 | var _payType = 0; | 327 | var _payType = 0; |
| 337 | 328 | ||
| 338 | - | ||
| 339 | - if (/MicroMessenger/.test(window.navigator.userAgent)) { | ||
| 340 | - _payType = 4 | ||
| 341 | - } else { | ||
| 342 | - _payType = 1 | ||
| 343 | - } | 329 | + if (/MicroMessenger/.test(window.navigator.userAgent)) { |
| 330 | + _payType = 4 | ||
| 331 | + } else { | ||
| 332 | + _payType = 1 | ||
| 333 | + } | ||
| 344 | var jsondata = { | 334 | var jsondata = { |
| 345 | app_id: "0eca8f5373ca4866aec2f8e9d9367104", | 335 | app_id: "0eca8f5373ca4866aec2f8e9d9367104", |
| 346 | - deviceInfo : "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", | ||
| 347 | - salt : salt, | ||
| 348 | - sign : getMd5sign(), | ||
| 349 | - sign_type : "md5", | ||
| 350 | - token : token, | ||
| 351 | - payType:_payType, | ||
| 352 | - paySrcType:_paySrcType, | ||
| 353 | - appId:jsajax.appID, | ||
| 354 | - orderId:orderId, | ||
| 355 | - terminalSource:'7', | ||
| 356 | - parkCode:parkCode, | ||
| 357 | - carNumber:carNumber, | 336 | + deviceInfo: "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", |
| 337 | + salt: salt, | ||
| 338 | + sign: getMd5sign(), | ||
| 339 | + sign_type: "md5", | ||
| 340 | + token: token, | ||
| 341 | + payType: _payType, | ||
| 342 | + paySrcType: _paySrcType, | ||
| 343 | + appId: jsajax.appID, | ||
| 344 | + orderId: orderId, | ||
| 345 | + terminalSource: '7', | ||
| 346 | + parkCode: parkCode, | ||
| 347 | + carNumber: carNumber, | ||
| 358 | 348 | ||
| 359 | } | 349 | } |
| 360 | - console.log('查询单个的入参 '+JSON.stringify(jsondata)+" 请求的接口"+mUrl.oneCardorder); | 350 | + console.log('查询单个的入参 ' + JSON.stringify(jsondata) + " 请求的接口" + mUrl.oneCardorder); |
| 361 | jsajax.defaultReq( | 351 | jsajax.defaultReq( |
| 362 | mUrl.oneCardorder, | 352 | mUrl.oneCardorder, |
| 363 | JSON.stringify(jsondata), | 353 | JSON.stringify(jsondata), |
| 364 | - function(data){ | 354 | + function (data) { |
| 365 | console.log(data) | 355 | console.log(data) |
| 366 | - console.log('获取单个待支付订单 '+JSON.stringify(data)); | ||
| 367 | - if(data.code=='0'){ | 356 | + console.log('获取单个待支付订单 ' + JSON.stringify(data)); |
| 357 | + if (data.code == '0') { | ||
| 368 | //setdiv(); | 358 | //setdiv(); |
| 369 | - setTimeout(function(){ | 359 | + setTimeout(function () { |
| 370 | var datas = data.data | 360 | var datas = data.data |
| 371 | console.log(datas) | 361 | console.log(datas) |
| 372 | var discountFee = datas.discountFee;//已优惠 | 362 | var discountFee = datas.discountFee;//已优惠 |
| 373 | var discountDesc = datas.discountDesc;//已优惠 | 363 | var discountDesc = datas.discountDesc;//已优惠 |
| 374 | var parkCode = datas.parkCode; | 364 | var parkCode = datas.parkCode; |
| 375 | var no = datas.orderId;//.no;//订单id | 365 | var no = datas.orderId;//.no;//订单id |
| 376 | - var inparktime = datas.inparktime;//.inparktime;//进场时间 | ||
| 377 | - var plateno = datas.plateno;//车牌号 | ||
| 378 | - var parkName = datas.parkName;//停车场名称 | ||
| 379 | - var staytime = datas.staytime;//停车时长 | 366 | + var inparktime = datas.inparktime;//.inparktime;//进场时间 |
| 367 | + var plateno = datas.plateno;//车牌号 | ||
| 368 | + var parkName = datas.parkName;//停车场名称 | ||
| 369 | + var staytime = datas.staytime;//停车时长 | ||
| 380 | var due = datas.due;//总计费用 | 370 | var due = datas.due;//总计费用 |
| 381 | var unpaid = datas.unpaid;//待支付 | 371 | var unpaid = datas.unpaid;//待支付 |
| 382 | var paid = datas.paid;//实付 | 372 | var paid = datas.paid;//实付 |
| 383 | var discountType = datas.discountType; | 373 | var discountType = datas.discountType; |
| 374 | + var businessUsedType = datas.businessUsedType //商户信息-是否使用商户券，1-使用，0-未使用 | ||
| 375 | + var businessFee = datas.businessFee //商户减扣金额 | ||
| 384 | 376 | ||
| 385 | - if(datas.discountFee&&datas.discountFee!=''&&datas.discountFee!=undefined){ | 377 | + if (datas.discountFee && datas.discountFee != '' && datas.discountFee != undefined) { |
| 386 | discountFee = datas.discountFee;//已优惠 | 378 | discountFee = datas.discountFee;//已优惠 |
| 387 | - if(datas.discountDesc&&datas.discountDesc!=''&&datas.discountDesc!=undefined){ | 379 | + if (datas.discountDesc && datas.discountDesc != '' && datas.discountDesc != undefined) { |
| 388 | discountDesc = datas.discountDesc;//已优惠 | 380 | discountDesc = datas.discountDesc;//已优惠 |
| 389 | } | 381 | } |
| 390 | } | 382 | } |
| 391 | 383 | ||
| 392 | //console.log('-------------------------------'+discountType); | 384 | //console.log('-------------------------------'+discountType); |
| 393 | //查询到车牌号订单信息 | 385 | //查询到车牌号订单信息 |
| 394 | - var src = 'home.html?carnum='+plateno | ||
| 395 | - +"&inparktime="+inparktime | ||
| 396 | - +"&parkName="+parkName | ||
| 397 | - +"&staytime="+staytime | ||
| 398 | - +"&due="+due | ||
| 399 | - +"&unpaid="+unpaid | ||
| 400 | - +"&paid="+paid | ||
| 401 | - +"&no="+no | ||
| 402 | - +"&disfee="+discountFee | ||
| 403 | - +"&disdesc="+discountDesc | ||
| 404 | - +'&discountType='+discountType | ||
| 405 | - +'&parkCode='+parkCode | ||
| 406 | - +'&orderId='+datas.orderId | ||
| 407 | - +'&discountFee='+datas.discountFee | ||
| 408 | - +'&parkOutTime='+datas.outtime | ||
| 409 | - +'&orderFee='+datas.orderFee | ||
| 410 | - +'&appOrderTimeout='+datas.appOrderTimeout | ||
| 411 | - +'&appId='+datas.appId | ||
| 412 | - +'&orderId='+datas.orderId | ||
| 413 | - +'&_paySrcType='+_paySrcType | ||
| 414 | - +"&"; | 386 | + var src = 'home.html?carnum=' + plateno |
| 387 | + + "&inparktime=" + inparktime | ||
| 388 | + + "&parkName=" + parkName | ||
| 389 | + + "&staytime=" + staytime | ||
| 390 | + + "&due=" + due | ||
| 391 | + + "&unpaid=" + unpaid | ||
| 392 | + + "&paid=" + paid | ||
| 393 | + + "&no=" + no | ||
| 394 | + + "&disfee=" + discountFee | ||
| 395 | + + "&disdesc=" + discountDesc | ||
| 396 | + + '&discountType=' + discountType | ||
| 397 | + + '&parkCode=' + parkCode | ||
| 398 | + + '&orderId=' + datas.orderId | ||
| 399 | + + '&discountFee=' + datas.discountFee | ||
| 400 | + + '&parkOutTime=' + datas.outtime | ||
| 401 | + + '&orderFee=' + datas.orderFee | ||
| 402 | + + '&appOrderTimeout=' + datas.appOrderTimeout | ||
| 403 | + + '&appId=' + datas.appId | ||
| 404 | + + '&orderId=' + datas.orderId | ||
| 405 | + + '&_paySrcType=' + _paySrcType | ||
| 406 | + + "&businessUsedType=" + businessUsedType | ||
| 407 | + + "&businessFee=" + businessFee | ||
| 415 | console.log(src) | 408 | console.log(src) |
| 416 | window.location.assign(encodeURI(src)) | 409 | window.location.assign(encodeURI(src)) |
| 417 | - },100); | 410 | + }, 100); |
| 418 | } | 411 | } |
| 419 | } | 412 | } |
| 420 | ) | 413 | ) |
| 421 | } | 414 | } |
| 422 | 415 | ||
| 423 | - | ||
| 424 | - | ||
| 425 | - | ||
| 426 | -function getMd5sign() | ||
| 427 | -{ | 416 | +function getMd5sign() { |
| 428 | var salt = jsajax.salt(32); | 417 | var salt = jsajax.salt(32); |
| 429 | var token = mUrl.GetToken(); | 418 | var token = mUrl.GetToken(); |
| 430 | if (token == null) { | 419 | if (token == null) { |
| 431 | token = ''; | 420 | token = ''; |
| 432 | } | 421 | } |
| 433 | var sortd = [ | 422 | var sortd = [ |
| 434 | - {keyname:'app_id',value:'0eca8f5373ca4866aec2f8e9d9367104'}, | ||
| 435 | - {keyname:'deviceInfo',value:'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E'}, | ||
| 436 | - {keyname:'salt',value:salt}, | ||
| 437 | - {keyname:'sign_type',value:'md5'}, | ||
| 438 | - {keyname:'token',value:token} | 423 | + { keyname: 'app_id', value: '0eca8f5373ca4866aec2f8e9d9367104' }, |
| 424 | + { keyname: 'deviceInfo', value: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E' }, | ||
| 425 | + { keyname: 'salt', value: salt }, | ||
| 426 | + { keyname: 'sign_type', value: 'md5' }, | ||
| 427 | + { keyname: 'token', value: token } | ||
| 439 | ]; | 428 | ]; |
| 440 | var md5sign = jsajax.getsign(sortd); | 429 | var md5sign = jsajax.getsign(sortd); |
| 441 | return md5sign; | 430 | return md5sign; |
| 442 | 431 | ||
| 443 | } | 432 | } |
| 444 | 433 | ||
| 445 | - | ||
| 446 | -$('.outBtn').on('click',function () { | 434 | +$('.outBtn').on('click', function () { |
| 447 | //window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Chifeng/Threewf/stoppayment/select.html' | 435 | //window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Chifeng/Threewf/stoppayment/select.html' |
| 448 | window.location.href = 'http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/out.html' | 436 | window.location.href = 'http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/out.html' |
| 449 | 437 | ||
| 450 | }) | 438 | }) |
| 451 | -$('.hiddenBtn').on('click',function () { | 439 | +$('.hiddenBtn').on('click', function () { |
| 452 | $('#strTip').hide() | 440 | $('#strTip').hide() |
| 453 | }) | 441 | }) |
| 454 | 442 |
js/pay.js
| @@ -561,6 +561,17 @@ var webAppClass = { | @@ -561,6 +561,17 @@ var webAppClass = { | ||
| 561 | $paid = getObjectByID("paid"),//已支付金额 | 561 | $paid = getObjectByID("paid"),//已支付金额 |
| 562 | $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 | 562 | $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 |
| 563 | $discountFee = getObjectByID("discountFee");//优惠金额 | 563 | $discountFee = getObjectByID("discountFee");//优惠金额 |
| 564 | + $businessFeeWrap = getObjectByID("businessFeeWrap") | ||
| 565 | + $businessFee = getObjectByID("businessFee") | ||
| 566 | + // var businessUsedType = dataselectt[12].split('=')[1]; //商户信息-是否使用商户券，1-使用，0-未使用 | ||
| 567 | + // var businessFee = dataselectt[13].split('=')[1]; //商户减扣金额 | ||
| 568 | + // | ||
| 569 | + // if (businessUsedType == 0) { | ||
| 570 | + // $('.businessFee-wrap').css('display', 'none') | ||
| 571 | + // } else { | ||
| 572 | + // $('.businessFee-wrap').css('display', 'block') | ||
| 573 | + // $('#businessFee').text((businessFee/100).toFixed(2)) | ||
| 574 | + // } | ||
| 564 | 575 | ||
| 565 | if (params != null && params != "") { | 576 | if (params != null && params != "") { |
| 566 | var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); | 577 | var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); |
| @@ -575,6 +586,12 @@ var webAppClass = { | @@ -575,6 +586,12 @@ var webAppClass = { | ||
| 575 | $inparktime.innerHTML = params.inparktime; | 586 | $inparktime.innerHTML = params.inparktime; |
| 576 | $staytime.innerHTML = formatSeconds(params.staytime); | 587 | $staytime.innerHTML = formatSeconds(params.staytime); |
| 577 | 588 | ||
| 589 | + if (params.businessUsedType == 0) { | ||
| 590 | + $('#businessFeeWrap').css('display', 'none') | ||
| 591 | + } else { | ||
| 592 | + $businessFee.innerHTML = '￥' + (params.businessFee / 100).toFixed(2); | ||
| 593 | + } | ||
| 594 | + | ||
| 578 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 | 595 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 |
| 579 | $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); | 596 | $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); |
| 580 | $discountFee.innerHTML = params.discountFee;//优惠金额 | 597 | $discountFee.innerHTML = params.discountFee;//优惠金额 |
listnew.html
| @@ -13,9 +13,9 @@ | @@ -13,9 +13,9 @@ | ||
| 13 | <link rel="apple-touch-icon-precomposed" href="favicon.ico"> | 13 | <link rel="apple-touch-icon-precomposed" href="favicon.ico"> |
| 14 | <link rel="shortcut icon" href="favicon.ico"> | 14 | <link rel="shortcut icon" href="favicon.ico"> |
| 15 | <link rel="Bookmark" href="favicon.ico"> | 15 | <link rel="Bookmark" href="favicon.ico"> |
| 16 | - <meta http-equiv="Pragma" content="no-cache" /> | 16 | + <meta http-equiv="Pragma" content="no-cache"/> |
| 17 | 17 | ||
| 18 | - <meta http-equiv="Expires" content="0" /> | 18 | + <meta http-equiv="Expires" content="0"/> |
| 19 | 19 | ||
| 20 | <link rel="stylesheet" href="//cdn.bootcss.com/weui/1.1.1/style/weui.min.css"> | 20 | <link rel="stylesheet" href="//cdn.bootcss.com/weui/1.1.1/style/weui.min.css"> |
| 21 | <link rel="stylesheet" href="//cdn.bootcss.com/jquery-weui/1.0.1/css/jquery-weui.min.css"> | 21 | <link rel="stylesheet" href="//cdn.bootcss.com/jquery-weui/1.0.1/css/jquery-weui.min.css"> |
| @@ -25,16 +25,20 @@ | @@ -25,16 +25,20 @@ | ||
| 25 | .all_told, .platen_number { | 25 | .all_told, .platen_number { |
| 26 | text-align: center; | 26 | text-align: center; |
| 27 | } | 27 | } |
| 28 | + | ||
| 28 | .all_told { | 29 | .all_told { |
| 29 | padding: 30px 0 10px 0; | 30 | padding: 30px 0 10px 0; |
| 30 | } | 31 | } |
| 32 | + | ||
| 31 | .all_told span { | 33 | .all_told span { |
| 32 | margin-right: 5px; | 34 | margin-right: 5px; |
| 33 | font-size: 22px; | 35 | font-size: 22px; |
| 34 | } | 36 | } |
| 37 | + | ||
| 35 | .discount_money { | 38 | .discount_money { |
| 36 | color: #fc3817; | 39 | color: #fc3817; |
| 37 | } | 40 | } |
| 41 | + | ||
| 38 | .discount { | 42 | .discount { |
| 39 | padding: 4px 7px; | 43 | padding: 4px 7px; |
| 40 | background: #fc3817; | 44 | background: #fc3817; |
| @@ -43,6 +47,7 @@ | @@ -43,6 +47,7 @@ | ||
| 43 | margin-left: 10px; | 47 | margin-left: 10px; |
| 44 | color: #fff; | 48 | color: #fff; |
| 45 | } | 49 | } |
| 50 | + | ||
| 46 | .discount:before { | 51 | .discount:before { |
| 47 | position: absolute; | 52 | position: absolute; |
| 48 | content: ''; | 53 | content: ''; |
| @@ -54,48 +59,54 @@ | @@ -54,48 +59,54 @@ | ||
| 54 | border-bottom: 6px solid transparent; | 59 | border-bottom: 6px solid transparent; |
| 55 | border-right: 6px solid #fc3817; | 60 | border-right: 6px solid #fc3817; |
| 56 | } | 61 | } |
| 57 | - .youhuid{ | 62 | + |
| 63 | + .youhuid { | ||
| 58 | background: #f00; | 64 | background: #f00; |
| 59 | color: #fff; | 65 | color: #fff; |
| 60 | font-size: 13px; | 66 | font-size: 13px; |
| 61 | - padding:2px 5px; | 67 | + padding: 2px 5px; |
| 62 | border-radius: 3px; | 68 | border-radius: 3px; |
| 63 | margin-left: 2px; | 69 | margin-left: 2px; |
| 64 | display: none; | 70 | display: none; |
| 65 | } | 71 | } |
| 66 | - .showTooltips{ | 72 | + |
| 73 | + .showTooltips { | ||
| 67 | display: none; | 74 | display: none; |
| 68 | /*针对苹果新增手势*/ | 75 | /*针对苹果新增手势*/ |
| 69 | cursor: pointer; | 76 | cursor: pointer; |
| 70 | } | 77 | } |
| 71 | - .weui-cells{ | 78 | + |
| 79 | + .weui-cells { | ||
| 72 | /*针对苹果新增手势*/ | 80 | /*针对苹果新增手势*/ |
| 73 | cursor: pointer; | 81 | cursor: pointer; |
| 74 | } | 82 | } |
| 75 | - .dialog-out{ | 83 | + |
| 84 | + .dialog-out { | ||
| 76 | position: absolute; | 85 | position: absolute; |
| 77 | width: 100%; | 86 | width: 100%; |
| 78 | height: 100%; | 87 | height: 100%; |
| 79 | - top:0; | 88 | + top: 0; |
| 80 | right: 0; | 89 | right: 0; |
| 81 | left: 0; | 90 | left: 0; |
| 82 | bottom: 0; | 91 | bottom: 0; |
| 83 | z-index: 1000; | 92 | z-index: 1000; |
| 84 | - background: rgba(0,0,0,.3); | 93 | + background: rgba(0, 0, 0, .3); |
| 85 | display: none; | 94 | display: none; |
| 86 | } | 95 | } |
| 87 | - .dia-con{ | 96 | + |
| 97 | + .dia-con { | ||
| 88 | width: 305px; | 98 | width: 305px; |
| 89 | height: 138px; | 99 | height: 138px; |
| 90 | - padding: 10px ; | ||
| 91 | - background:rgba(255,255,255,1); | ||
| 92 | - border-radius:8px; | 100 | + padding: 10px; |
| 101 | + background: rgba(255, 255, 255, 1); | ||
| 102 | + border-radius: 8px; | ||
| 93 | position: absolute; | 103 | position: absolute; |
| 94 | left: 50%; | 104 | left: 50%; |
| 95 | - top:50%; | ||
| 96 | - transform: translate(-50%,-50%); | 105 | + top: 50%; |
| 106 | + transform: translate(-50%, -50%); | ||
| 97 | } | 107 | } |
| 98 | - .close-btn{ | 108 | + |
| 109 | + .close-btn { | ||
| 99 | float: right; | 110 | float: right; |
| 100 | width: 16px; | 111 | width: 16px; |
| 101 | height: 16px; | 112 | height: 16px; |
| @@ -104,21 +115,24 @@ | @@ -104,21 +115,24 @@ | ||
| 104 | cursor: pointer; | 115 | cursor: pointer; |
| 105 | overflow: hidden; | 116 | overflow: hidden; |
| 106 | } | 117 | } |
| 107 | - .dia-main{ | 118 | + |
| 119 | + .dia-main { | ||
| 108 | margin-left: 30px; | 120 | margin-left: 30px; |
| 109 | margin-top: 30px; | 121 | margin-top: 30px; |
| 110 | height: 52px; | 122 | height: 52px; |
| 111 | padding-left: 90px; | 123 | padding-left: 90px; |
| 112 | background: url("img/out.png") no-repeat; | 124 | background: url("img/out.png") no-repeat; |
| 113 | - background-size: 52px 52px; | 125 | + background-size: 52px 52px; |
| 114 | } | 126 | } |
| 115 | - .dia-text{ | 127 | + |
| 128 | + .dia-text { | ||
| 116 | padding-top: 20px; | 129 | padding-top: 20px; |
| 117 | text-align: center; | 130 | text-align: center; |
| 118 | font-size: 12px; | 131 | font-size: 12px; |
| 119 | color: #999; | 132 | color: #999; |
| 120 | } | 133 | } |
| 121 | - .arrears-btn{ | 134 | + |
| 135 | + .arrears-btn { | ||
| 122 | width: 70px; | 136 | width: 70px; |
| 123 | height: 25px; | 137 | height: 25px; |
| 124 | margin-top: 20px; | 138 | margin-top: 20px; |
| @@ -127,44 +141,49 @@ | @@ -127,44 +141,49 @@ | ||
| 127 | text-align: center; | 141 | text-align: center; |
| 128 | line-height: 25px; | 142 | line-height: 25px; |
| 129 | background: url("img/arrears-bg.png") no-repeat; | 143 | background: url("img/arrears-bg.png") no-repeat; |
| 130 | - background-size:70px 25px ; | 144 | + background-size: 70px 25px; |
| 131 | } | 145 | } |
| 132 | 146 | ||
| 133 | - .strTip{ | 147 | + .strTip { |
| 134 | width: 100%; | 148 | width: 100%; |
| 135 | height: 100%; | 149 | height: 100%; |
| 136 | text-align: center; | 150 | text-align: center; |
| 137 | font-size: 20px; | 151 | font-size: 20px; |
| 138 | - background: rgba(0,0,0,.7); | 152 | + background: rgba(0, 0, 0, .7); |
| 139 | position: fixed; | 153 | position: fixed; |
| 140 | - top:0; | 154 | + top: 0; |
| 141 | left: 0; | 155 | left: 0; |
| 142 | } | 156 | } |
| 143 | - .strWrap{ | 157 | + |
| 158 | + .strWrap { | ||
| 144 | width: 80%; | 159 | width: 80%; |
| 145 | background: #fff; | 160 | background: #fff; |
| 146 | border-radius: 4px; | 161 | border-radius: 4px; |
| 147 | margin: 50px auto 0; | 162 | margin: 50px auto 0; |
| 148 | padding: 0 10px 15px; | 163 | padding: 0 10px 15px; |
| 149 | } | 164 | } |
| 150 | - .strCon{ | 165 | + |
| 166 | + .strCon { | ||
| 151 | text-align: center; | 167 | text-align: center; |
| 152 | font-size: 20px; | 168 | font-size: 20px; |
| 153 | color: #333; | 169 | color: #333; |
| 154 | text-align: center; | 170 | text-align: center; |
| 155 | } | 171 | } |
| 156 | - .header-title{ | 172 | + |
| 173 | + .header-title { | ||
| 157 | padding: 15px 0; | 174 | padding: 15px 0; |
| 158 | font-size: 14px; | 175 | font-size: 14px; |
| 159 | font-weight: 600; | 176 | font-weight: 600; |
| 160 | - border-bottom:1px solid #ccc ; | 177 | + border-bottom: 1px solid #ccc; |
| 161 | color: #333; | 178 | color: #333; |
| 162 | } | 179 | } |
| 163 | - .payCarNum{ | 180 | + |
| 181 | + .payCarNum { | ||
| 164 | font-size: 16px; | 182 | font-size: 16px; |
| 165 | color: #D40202; | 183 | color: #D40202; |
| 166 | } | 184 | } |
| 167 | - .btn{ | 185 | + |
| 186 | + .btn { | ||
| 168 | color: #fff; | 187 | color: #fff; |
| 169 | font-size: 20px; | 188 | font-size: 20px; |
| 170 | 189 | ||
| @@ -173,10 +192,12 @@ | @@ -173,10 +192,12 @@ | ||
| 173 | border-radius: 8px; | 192 | border-radius: 8px; |
| 174 | cursor: pointer; | 193 | cursor: pointer; |
| 175 | } | 194 | } |
| 176 | - .hiddenBtn{ | 195 | + |
| 196 | + .hiddenBtn { | ||
| 177 | background: #79cbbf; | 197 | background: #79cbbf; |
| 178 | } | 198 | } |
| 179 | - .outBtn{ | 199 | + |
| 200 | + .outBtn { | ||
| 180 | background: #509f93; | 201 | background: #509f93; |
| 181 | } | 202 | } |
| 182 | 203 | ||
| @@ -190,7 +211,8 @@ | @@ -190,7 +211,8 @@ | ||
| 190 | 211 | ||
| 191 | 212 | ||
| 192 | <div class="pay-content-padded"> | 213 | <div class="pay-content-padded"> |
| 193 | - <a class="weui-btn weui-btn_primary showTooltips" href="javascript:" id="showTooltips" v-cloak="showTooltips">申请离场</a> | 214 | + <a class="weui-btn weui-btn_primary showTooltips" href="javascript:" id="showTooltips" |
| 215 | + v-cloak="showTooltips">申请离场</a> | ||
| 194 | </div> | 216 | </div> |
| 195 | 217 | ||
| 196 | <div class="dialog-out"> | 218 | <div class="dialog-out"> |
| @@ -206,16 +228,14 @@ | @@ -206,16 +228,14 @@ | ||
| 206 | </div> | 228 | </div> |
| 207 | 229 | ||
| 208 | <!--<div class="strTip" id="strTip">--> | 230 | <!--<div class="strTip" id="strTip">--> |
| 209 | - <!--<div class="strWrap">--> | ||
| 210 | - <!--<div class="header-title">车牌号码确认信息提示</div>--> | ||
| 211 | - <!--<div style="font-size: 13px;color: #333;padding: 15px 0;">请确认您当前缴费的车牌号码</div>--> | ||
| 212 | - <!--<div class="strCon"><span class="payCarNum" id="payCarNum"></span></div>--> | ||
| 213 | - <!--<div class="btn hiddenBtn" style="margin: 15px 0">是我的车,去支付</div>--> | ||
| 214 | - <!--<div class="btn outBtn">不是我的车,手动输入车牌号</div>--> | ||
| 215 | - <!--</div>--> | 231 | +<!--<div class="strWrap">--> |
| 232 | +<!--<div class="header-title">车牌号码确认信息提示</div>--> | ||
| 233 | +<!--<div style="font-size: 13px;color: #333;padding: 15px 0;">请确认您当前缴费的车牌号码</div>--> | ||
| 234 | +<!--<div class="strCon"><span class="payCarNum" id="payCarNum"></span></div>--> | ||
| 235 | +<!--<div class="btn hiddenBtn" style="margin: 15px 0">是我的车,去支付</div>--> | ||
| 236 | +<!--<div class="btn outBtn">不是我的车,手动输入车牌号</div>--> | ||
| 237 | +<!--</div>--> | ||
| 216 | <!--</div>--> | 238 | <!--</div>--> |
| 217 | - | ||
| 218 | - | ||
| 219 | 239 | ||
| 220 | 240 | ||
| 221 | <script src="js/jquery-3.2.1.min.js"></script> | 241 | <script src="js/jquery-3.2.1.min.js"></script> |
| @@ -228,14 +248,14 @@ | @@ -228,14 +248,14 @@ | ||
| 228 | <script src="js/ajax.js"></script> | 248 | <script src="js/ajax.js"></script> |
| 229 | <script type="text/javascript"> | 249 | <script type="text/javascript"> |
| 230 | //微信浏览器中，aler弹框不显示域名 | 250 | //微信浏览器中，aler弹框不显示域名 |
| 231 | -(function(){ | 251 | +(function () { |
| 232 | //先判断是否为微信浏览器 | 252 | //先判断是否为微信浏览器 |
| 233 | var ua = window.navigator.userAgent.toLowerCase(); | 253 | var ua = window.navigator.userAgent.toLowerCase(); |
| 234 | if (ua.match(/MicroMessenger/i) == 'micromessenger') { | 254 | if (ua.match(/MicroMessenger/i) == 'micromessenger') { |
| 235 | //重写alert方法，alert()方法重写，不能传多余参数 | 255 | //重写alert方法，alert()方法重写，不能传多余参数 |
| 236 | - window.alert = function(name){ | 256 | + window.alert = function (name) { |
| 237 | var iframe = document.createElement("IFRAME"); | 257 | var iframe = document.createElement("IFRAME"); |
| 238 | - iframe.style.display="none"; | 258 | + iframe.style.display = "none"; |
| 239 | iframe.setAttribute("src", 'data:text/plain'); | 259 | iframe.setAttribute("src", 'data:text/plain'); |
| 240 | document.documentElement.appendChild(iframe); | 260 | document.documentElement.appendChild(iframe); |
| 241 | window.frames[0].window.alert(name); | 261 | window.frames[0].window.alert(name); |
| @@ -244,6 +264,6 @@ | @@ -244,6 +264,6 @@ | ||
| 244 | } | 264 | } |
| 245 | })(); | 265 | })(); |
| 246 | </script> | 266 | </script> |
| 247 | -<script src="js/list.js?g=11141.31"></script> | 267 | +<script src="js/list.js?g=11.31"></script> |
| 248 | </body> | 268 | </body> |
| 249 | </html> | 269 | </html> |