diff --git a/js/billCodePay.js b/js/billCodePay.js
index 5d0ce95..b23d8a8 100644
--- a/js/billCodePay.js
+++ b/js/billCodePay.js
@@ -7,10 +7,13 @@ var webAppParams = null;
 var $btnObj = null;
 var $btnLoad = null;
 var webAppCode = null;//如果是微信，先获取微信code
+var flag = 0;
 window.onload = function () {
     //var root = document.getElementById("root");
     $btnObj = document.getElementById("btnPayOK");
     $btnLoad = document.getElementById("loading");
+    //兑换按钮
+    $discountBtn = document.getElementById("discountBtn");
     $linkPayDetail = getObjectByID("linkPayDetail");
     $linkPayDetail.onclick = webAppClass.linkPayDetailClick;
     var webRoot = window.location.href;
@@ -40,6 +43,8 @@ window.onload = function () {
             alertMsg("没有接收到url参数信息");
         }
     }
+    //兑换按钮事件
+    $discountBtn.onclick = webAppClass.discountClick;
 }
 /**/
 var webAppClass = {
@@ -127,6 +132,95 @@ var webAppClass = {
         $btnLoad.style.display = "block";
         webAppClass.okPay(webAppParams);//唤醒支付
     },
+    //优惠券兑换
+    codediscountClick:function(tmpObj){
+        discountVal = document.getElementById("discountBox").value;
+        // console.log(discountVal)
+        // console.log(discountVal.length)
+        if(discountVal.length > 0){
+            $btnObj.style.display = "none";
+            $btnLoad.style.display = "block";
+            $discountBtn.disabled = true
+            console.log(webAppParams.orderId)
+            var url = webAppRoot + window.webAppH5.discountServer;
+            var discountParams = {
+                app_id:'1',
+                salt:'1',
+                deviceInfo:'1',
+                sign_type:'1',
+                sign:'1',
+                token:'1',
+                terminalSource:7,
+                orderId:webAppParams.orderId,
+                cardNo:discountVal,
+                codeType:0
+            }
+            postRequest(url, discountParams, function (res) {
+                console.log(res)
+                if(res.code==0){
+
+                    document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100)
+                    document.getElementById("discountTip").innerHTML = res.data.couponDescribe
+                    document.getElementById("discountFee").innerHTML = (res.data.discountFee/100)
+                    document.getElementById("discountDesc").style.display="none"
+                    $btnLoad.style.display = "none";
+                    $btnObj.style.display = "block";
+                    flag = 1
+                    webAppClass.okPay(tmpObj);//唤醒支付
+                }else{
+                    $discountBtn.disabled = false
+                    document.getElementById("discountTip").innerHTML = res.message
+                }
+            })
+
+        }else{
+            return
+        }
+    },
+    discountClick: function(){
+        discountVal = document.getElementById("discountBox").value;
+        // console.log(discountVal)
+        // console.log(discountVal.length)
+        if(discountVal.length > 0){
+            $btnObj.style.display = "none";
+            $btnLoad.style.display = "block";
+            $discountBtn.disabled = true
+            console.log(webAppParams.orderId)
+            var url = webAppRoot + window.webAppH5.discountServer;
+            var discountParams = {
+                app_id:'1',
+                salt:'1',
+                deviceInfo:'1',
+                sign_type:'1',
+                sign:'1',
+                token:'1',
+                terminalSource:7,
+                orderId:webAppParams.orderId,
+                cardNo:discountVal,
+                codeType:0
+            }
+            postRequest(url, discountParams, function (res) {
+                console.log(res)
+                if(res.code==0){
+
+                    document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100)
+                    document.getElementById("discountTip").innerHTML = res.data.couponDescribe
+                    document.getElementById("discountFee").innerHTML = (res.data.discountFee/100)
+                    document.getElementById("discountDesc").style.display="none"
+                    $btnLoad.style.display = "none";
+                    $btnObj.style.display = "block";
+                    document.getElementById("discountBox").setAttribute('readonly','readonly');
+                    flag = 1
+                }else{
+                    $discountBtn.disabled = false
+                    document.getElementById("discountTip").innerHTML = res.message
+                }
+            })
+
+        }else{
+            return
+        }
+    },
     //校验该订单当前支付时的费用（排除扫描订单后不支付时长）
     checkParkCost: function () {
         $btnObj.style.display = "none";
@@ -142,9 +236,14 @@ var webAppClass = {
             if (res.code == 0) {//进场
                 var tmpObj = res.data;
                 if (tmpObj) {
-                    webAppClass.setUI(tmpObj);
-                    webAppParams = tmpObj;//重新赋值
-                    webAppClass.okPay(tmpObj);//唤醒支付
+                    if(flag == 1){
+                        webAppClass.codediscountClick(tmpObj);
+                    }else{
+                        webAppClass.setUI(tmpObj);
+                        webAppParams = tmpObj;//重新赋值
+                        webAppClass.okPay(tmpObj);//唤醒支付
+                    }
+
                 } else {
                     alertMsg("没有找到相应订单");
                     $btnLoad.style.display = "none";
diff --git a/js/dynCodePay.js b/js/dynCodePay.js
index 1c44d92..7ed04cd 100644
--- a/js/dynCodePay.js
+++ b/js/dynCodePay.js
@@ -8,9 +8,12 @@ var webAppParams = null;//URL参数
 var $btnObj = null;
 var $btnLoad = null;
 var webAppCode = null;//如果是微信，先获取微信code
+var flag = 0;
 window.onload = function () {
     $btnObj = getObjectByID("btnPayOK");
     $btnLoad = getObjectByID("loading");
+    //兑换按钮
+    $discountBtn = document.getElementById("discountBtn");
     $linkPayDetail = getObjectByID("linkPayDetail");
     $linkPayDetail.onclick = webAppClass.linkPayDetailClick;
     var webRoot = window.location.href;
@@ -39,9 +42,100 @@ window.onload = function () {
     if (state == "wxPay") {
         webAppCode = webAppClass.getCode();
     }
+    //兑换按钮事件
+    $discountBtn.onclick = webAppClass.discountClick;
 }
 /**/
 var webAppClass = {
+    //优惠券兑换
+    codediscountClick:function(tmpObj){
+        discountVal = document.getElementById("discountBox").value;
+        // console.log(discountVal)
+        // console.log(discountVal.length)
+        if(discountVal.length > 0){
+            $btnObj.style.display = "none";
+            $btnLoad.style.display = "block";
+            $discountBtn.disabled = true
+            console.log(webAppParams.orderId)
+            var url = webAppRoot + window.webAppH5.discountServer;
+            var discountParams = {
+                app_id:'1',
+                salt:'1',
+                deviceInfo:'1',
+                sign_type:'1',
+                sign:'1',
+                token:'1',
+                terminalSource:7,
+                orderId:webAppParams.orderId,
+                cardNo:discountVal,
+                codeType:1
+            }
+            postRequest(url, discountParams, function (res) {
+                console.log(res)
+                if(res.code==0){
+
+                    document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100)
+                    document.getElementById("discountTip").innerHTML = res.data.couponDescribe
+                    document.getElementById("discountFee").innerHTML = (res.data.discountFee/100)
+                    document.getElementById("discountDesc").style.display="none"
+                    $btnLoad.style.display = "none";
+                    $btnObj.style.display = "block";
+                    flag = 1
+                    webAppClass.okPay(tmpObj);//唤醒支付
+                }else{
+                    $discountBtn.disabled = false
+                    document.getElementById("discountTip").innerHTML = res.message
+                }
+            })
+
+        }else{
+            return
+        }
+    },
+    discountClick: function(){
+        discountVal = document.getElementById("discountBox").value;
+        // console.log(discountVal)
+        // console.log(discountVal.length)
+        if(discountVal.length > 0){
+            $btnObj.style.display = "none";
+            $btnLoad.style.display = "block";
+            $discountBtn.disabled = true
+            console.log(webAppParams.orderId)
+            var url = webAppRoot + window.webAppH5.discountServer;
+            var discountParams = {
+                app_id:'1',
+                salt:'1',
+                deviceInfo:'1',
+                sign_type:'1',
+                sign:'1',
+                token:'1',
+                terminalSource:7,
+                orderId:webAppParams.orderId,
+                cardNo:discountVal,
+                codeType:1
+            }
+            postRequest(url, discountParams, function (res) {
+                console.log(res)
+                if(res.code==0){
+
+                    document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100)
+                    document.getElementById("discountTip").innerHTML = res.data.couponDescribe
+                    document.getElementById("discountFee").innerHTML = (res.data.discountFee/100)
+                    document.getElementById("discountDesc").style.display="none"
+                    $btnLoad.style.display = "none";
+                    $btnObj.style.display = "block";
+                    document.getElementById("discountBox").setAttribute('readonly','readonly');
+                    flag = 1
+                }else{
+                    $discountBtn.disabled = false
+                    document.getElementById("discountTip").innerHTML = res.message
+                }
+            })
+
+        }else{
+            return
+        }
+    },
     //OK
     okClick: function (ev) {
         //document.getElementById("payTip").innerHTML = "";
@@ -54,6 +148,9 @@ var webAppClass = {
 
     //确定支付
     okPay: function (params) {
+        if(flag == 1){
+            webAppClass.codediscountClick(tmpObj);
+        }
         var orderID = params.orderId;//订单号
         //第一首先判断当前哪种浏览器方式[微信内置、支付宝内置、第三方浏览器]
         var clientType = clientBrowserEx();
diff --git a/js/pay.js b/js/pay.js
index 6db7f15..62bd0cd 100644
--- a/js/pay.js
+++ b/js/pay.js
@@ -47,7 +47,7 @@ window.onload = function () {
 /**/
 var webAppClass = {
     //优惠券兑换
-  discountClick1:function(tmpObj){
+  codediscountClick:function(tmpObj){
     discountVal = document.getElementById("discountBox").value;
     // console.log(discountVal)
     // console.log(discountVal.length)
@@ -80,7 +80,7 @@ var webAppClass = {
           $btnLoad.style.display = "none";
           $btnObj.style.display = "block";
           flag = 1
-          //webAppClass.okPay(tmpObj);//唤醒支付
+          webAppClass.okPay(tmpObj);//唤醒支付
         }else{
           $discountBtn.disabled = false
           document.getElementById("discountTip").innerHTML = res.message
@@ -123,7 +123,7 @@ var webAppClass = {
             document.getElementById("discountDesc").style.display="none"
             $btnLoad.style.display = "none";
             $btnObj.style.display = "block";
-            document.getElementById("discountBox").attr('readonly','readonly');
+            document.getElementById("discountBox").setAttribute('readonly','readonly');
             flag = 1
           }else{
             $discountBtn.disabled = false
@@ -160,7 +160,7 @@ var webAppClass = {
                 var tmpObj = res.data;
                 if (tmpObj) {
                     if(flag == 1){
-                      webAppClass.discountClick1(tmpObj);
+                      webAppClass.codediscountClick(tmpObj);
                     }else{
                       webAppClass.setUI(tmpObj);
                       webAppParams = tmpObj;//重新赋值