From 06c1136d8247477de45e220983b74296d4a0621e Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Fri, 28 Aug 2020 15:05:16 +0800
Subject: [PATCH] 支付  去掉已支付金额

---
 home.html    |  2 +-
 js/common.js | 80 ++++++++++++++++++++++++++++++++++++++++----------------------------------------
 js/pay.js    | 11 +++++++----
 3 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/home.html b/home.html
index 82a13db..8cea0c5 100644
--- a/home.html
+++ b/home.html
@@ -89,7 +89,7 @@
 <script src="js/url.js?S=888.60"></script>
 <script src="js/ajax.js?S=84518.60"></script>
 <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>-->
-<script src="js/pay.js?S=818.60"></script>
+<script src="js/pay.js?S=11818.60"></script>
 </body>
 
 </html>
diff --git a/js/common.js b/js/common.js
index 15405ee..5165672 100644
--- a/js/common.js
+++ b/js/common.js
@@ -289,44 +289,44 @@ function funcUrlDel(name) {
   }
 }
 
-var userAgent = navigator.userAgent;
-var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
-
-function utilParams(val, orderID, openId) {
-  var _orderTotalFee = Number($('#due').text()) * 100 //总金额
-  var fee = $('#discountFee').text()
-  var _fee = fee.substring(0, fee.length - 1);
-  var _orderDicountFee = Number(_fee) * 100  //优惠了多少钱
-  var _orderActFee = _orderTotalFee - _orderDicountFee  //实收多少钱
-  var jsondata;
-  if (_orderDicountFee > 0) {
-    jsondata = {
-      orderBigType: 100,
-      payOrderType: 101,
-      rltOrderId: orderID,
-      payType: val,
-      terminalSource: 7,
-      orderActFee: _orderActFee,
-      orderTotalFee: _orderTotalFee,
-      orderDicountFee: _orderDicountFee,
-      payUserId: openId,
-      terminalOS: isAndroid ? 'AND' : 'IOS',
-      couponType: 1, //优惠类型
-      couponCode: $('#discountBox').val(),
-    };
-  } else {
-    jsondata = {
-      orderBigType: 100,
-      payOrderType: 101,
-      rltOrderId: orderID,
-      payType: val,
-      terminalSource: 7,
-      orderActFee: _orderActFee,
-      orderTotalFee: _orderTotalFee,
-      payUserId: openId,
-      terminalOS: isAndroid ? 'AND' : 'IOS',
-    };
-  }
-  return jsondata
-}
+// var userAgent = navigator.userAgent;
+// var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
+//
+// function utilParams(val, orderID, openId) {
+//   var _orderTotalFee = Number($('#due').text()) * 100 //总金额
+//   var fee = $('#discountFee').text()
+//   var _fee = fee.substring(0, fee.length - 1);
+//   var _orderDicountFee = Number(_fee) * 100  //优惠了多少钱
+//   var _orderActFee = _orderTotalFee - _orderDicountFee  //实收多少钱
+//   var jsondata;
+//   if (_orderDicountFee > 0) {
+//     jsondata = {
+//       orderBigType: 100,
+//       payOrderType: 101,
+//       rltOrderId: orderID,
+//       payType: val,
+//       terminalSource: 7,
+//       orderActFee: _orderActFee,
+//       orderTotalFee: _orderTotalFee,
+//       orderDicountFee: _orderDicountFee,
+//       payUserId: openId,
+//       terminalOS: isAndroid ? 'AND' : 'IOS',
+//       couponType: 1, //优惠类型
+//       couponCode: $('#discountBox').val(),
+//     };
+//   } else {
+//     jsondata = {
+//       orderBigType: 100,
+//       payOrderType: 101,
+//       rltOrderId: orderID,
+//       payType: val,
+//       terminalSource: 7,
+//       orderActFee: _orderActFee,
+//       orderTotalFee: _orderTotalFee,
+//       payUserId: openId,
+//       terminalOS: isAndroid ? 'AND' : 'IOS',
+//     };
+//   }
+//   return jsondata
+// }
 
diff --git a/js/pay.js b/js/pay.js
index 6a523c3..65eda7b 100644
--- a/js/pay.js
+++ b/js/pay.js
@@ -9,6 +9,8 @@ var $btnLoad = null;
 var flag = 0;
 var appWxID = getQueryString(window.location).appId;
 
+// var unpaid = getQueryString(window.location).unpaid;//待支付
+
 
 var webAppCode = null;//如果是微信，先获取微信code
 //var $btnLoad = document.getElementById("loading");
@@ -594,7 +596,7 @@ var webAppClass = {
         // alert(JSON.stringify(res.data))
 
         // document.write(res.data);//打开支付表单
-        window.location.href = res.data.h5PayRequest
+        // window.location.href = res.data.h5PayRequest
       } else {//其他情况如【该卡号场内已存在】
         console.log(res.message);
         alertMsg(res.message);
@@ -661,23 +663,24 @@ var webAppClass = {
 
 // alert(getQueryString(window.location).unpaid)
 
+var userAgent = navigator.userAgent;
+var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
+
 function utilParams(val,orderID,openId) {
   var paySrcType = getQueryString(window.location)._paySrcType
   var _orderTotalFee =  Number($('#due').text())*100 //总金额
 
   var _dis = $('#discountFee').text()
   // alert('discountFee内容'+_dis)
-  var _disMon = _dis.substring(0,_dis.length-1)
+  var _disMon = _dis.substring(1,_dis.length-1)
   var _orderDicountFee = Number(_disMon)*100  //优惠了多少钱
 
-
   // var _Mon =  Number($('#paid').text())*100 //已支付金额
   // alert('优惠了'+_orderDicountFee)
 
 
   var _orderActFee = getQueryString(window.location).unpaid //实收多少钱unpaid
 
-
   // var _orderActFee = Number($('#sumMoney').text())*100  //实收多少钱
 
 
--
libgit2 0.21.4