diff --git a/MP_verify_RraH33H3qcFBr5f1.txt b/MP_verify_RraH33H3qcFBr5f1.txt new file mode 100644 index 0000000..589178a --- /dev/null +++ b/MP_verify_RraH33H3qcFBr5f1.txt @@ -0,0 +1 @@ +RraH33H3qcFBr5f1 \ No newline at end of file diff --git a/home.html b/home.html index df439ae..06f8861 100644 --- a/home.html +++ b/home.html @@ -33,6 +33,7 @@
停车时长:
进场时间:
停车总费用:
+
商户优惠减免:
已支付金额:
优惠金额:
订单编号: 1234567890
@@ -82,10 +83,10 @@ - - + + - + diff --git a/img/default.png b/img/default.png new file mode 100644 index 0000000..ba8a52b --- /dev/null +++ b/img/default.png diff --git a/img/no.png b/img/no.png new file mode 100644 index 0000000..42f5fef --- /dev/null +++ b/img/no.png diff --git a/img/ok.png b/img/ok.png new file mode 100644 index 0000000..58c5b50 --- /dev/null +++ b/img/ok.png diff --git a/img/zero.png b/img/zero.png old mode 100755 new mode 100644 index f733d9f..f733d9f --- a/img/zero.png +++ b/img/zero.png diff --git a/js/ajax.js b/js/ajax.js index 8a32d0a..e0e0345 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -1,4 +1,4 @@ -var jsajax = jsajax || {}; +var jsajax = jsajax || {}; //任你停赤峰 jsajax.appID = 'wx945eccc8163fd75b'; //获取openid diff --git a/js/config.js b/js/config.js index cc8cecf..f63db25 100644 --- a/js/config.js +++ b/js/config.js @@ -1,4 +1,4 @@ -/* +/* @songcxa @2018-12-14 @移动支付配置[配置项除ip地址外勿动] @@ -7,11 +7,11 @@ window.webAppH5 = {}; /*服务器地址*/ -var webAppRoot = "http://pay.service.renniting.cn/v1"; + var webAppRoot = "http://pay.service.huangshiparking.com"; //test 测试环境 // var webAppRoot = "http://39.98.54.240:8090"; //微信支付结果回调地址 -var webAppPayResult = "http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/page/wxpayResult.html"; +var webAppPayResult = "http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/wxpayResult.html"; /*公共参数*/ webAppH5.comParams = { diff --git a/js/list.js b/js/listnew.js index 46b5028..25abafa 100644 --- a/js/list.js +++ b/js/listnew.js @@ -68,7 +68,7 @@ jsajax.defaultReq( var data = data.data.dataList; if(data.length==0){ - $('#tip-title').text('暂无停车记录') + $('#tip-title').text('您的停车费用为0元，无须缴费，谢谢!') return } var htmls=''; @@ -381,6 +381,8 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ 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){ discountFee = datas.discountFee;//已优惠 @@ -411,7 +413,8 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ +'&appId='+datas.appId +'&orderId='+datas.orderId +'&_paySrcType='+_paySrcType - +"&"; + + "&businessUsedType=" + businessUsedType + + "&businessFee=" + businessFee console.log(src) window.location.assign(encodeURI(src)) },100); @@ -445,7 +448,7 @@ function getMd5sign() $('.outBtn').on('click',function () { //window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Chifeng/Threewf/stoppayment/select.html' - window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/DEV/PDA-Payment/out.html' + window.location.href = 'http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/out.html' }) $('.hiddenBtn').on('click',function () { diff --git a/js/pay.js b/js/pay.js index 504d1af..9ffbf19 100644 --- a/js/pay.js +++ b/js/pay.js @@ -1,4 +1,4 @@ -/* +/* @songcxa @2018-12-14 @移动支付 @@ -647,6 +647,8 @@ var webAppClass = { $paid = getObjectByID("paid"),//已支付金额 $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 $discountFee = getObjectByID("discountFee");//优惠金额 + $businessFeeWrap = getObjectByID("businessFeeWrap") + $businessFee = getObjectByID("businessFee") if (params != null && params != "") { var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); @@ -660,6 +662,14 @@ var webAppClass = { $parkName.innerHTML = params.parkName; $inparktime.innerHTML = params.inparktime; $staytime.innerHTML = formatSeconds(params.staytime); + // alert(params.parkName) + // alert(params.businessFee) + if (params.businessUsedType == 0) { + $('#businessFeeWrap').css('display', 'none') + } else { + var _mon = Number(params.businessFee) + $businessFee.innerHTML = '￥' + ( _mon / 100).toFixed(2); + } $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); diff --git a/js/url.js b/js/url.js index 1859edc..fbc2962 100644 --- a/js/url.js +++ b/js/url.js @@ -1,4 +1,4 @@ -var mUrl = mUrl || {}; +var mUrl = mUrl || {}; //songcxa 15801541129 @@ -89,7 +89,7 @@ mUrl.getJx = function(){ // var cepath = 'http://39.98.54.240:8090'; -var cepath = 'http://pay.service.renniting.cn/v1'; +var cepath = 'http://pay.service.huangshiparking.com'; // http://pay.service.renniting.cn // var cepath = 'http://39.98.54.240:8090' // http://app.api.dyszt.com:8090 diff --git a/list.html b/list.html index 0d5bde1..78661fd 100644 --- a/list.html +++ b/list.html @@ -183,7 +183,7 @@ -
48小时限时补缴优惠
+
@@ -224,7 +224,7 @@ - + - + diff --git a/listnew.html b/listnew.html index 2221e1c..bff6878 100644 --- a/listnew.html +++ b/listnew.html @@ -183,7 +183,7 @@ -
48小时限时补缴优惠
+
@@ -224,8 +224,8 @@ - - + + - + diff --git a/out.html b/out.html index 36dbb90..c8a9685 100644 --- a/out.html +++ b/out.html @@ -15,8 +15,8 @@ - - + + + 扫码查询出场