Commit 06c1136d8247477de45e220983b74296d4a0621e

Authored by liuqimichale
1 parent 1909a04f

支付 去掉已支付金额

home.html
... ... @@ -89,7 +89,7 @@
89 89 <script src="js/url.js?S=888.60"></script>
90 90 <script src="js/ajax.js?S=84518.60"></script>
91 91 <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>-->
92   -<script src="js/pay.js?S=818.60"></script>
  92 +<script src="js/pay.js?S=11818.60"></script>
93 93 </body>
94 94  
95 95 </html>
... ...
js/common.js
... ... @@ -289,44 +289,44 @@ function funcUrlDel(name) {
289 289 }
290 290 }
291 291  
292   -var userAgent = navigator.userAgent;
293   -var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
294   -
295   -function utilParams(val, orderID, openId) {
296   - var _orderTotalFee = Number($('#due').text()) * 100 //总金额
297   - var fee = $('#discountFee').text()
298   - var _fee = fee.substring(0, fee.length - 1);
299   - var _orderDicountFee = Number(_fee) * 100 //优惠了多少钱
300   - var _orderActFee = _orderTotalFee - _orderDicountFee //实收多少钱
301   - var jsondata;
302   - if (_orderDicountFee > 0) {
303   - jsondata = {
304   - orderBigType: 100,
305   - payOrderType: 101,
306   - rltOrderId: orderID,
307   - payType: val,
308   - terminalSource: 7,
309   - orderActFee: _orderActFee,
310   - orderTotalFee: _orderTotalFee,
311   - orderDicountFee: _orderDicountFee,
312   - payUserId: openId,
313   - terminalOS: isAndroid ? 'AND' : 'IOS',
314   - couponType: 1, //优惠类型
315   - couponCode: $('#discountBox').val(),
316   - };
317   - } else {
318   - jsondata = {
319   - orderBigType: 100,
320   - payOrderType: 101,
321   - rltOrderId: orderID,
322   - payType: val,
323   - terminalSource: 7,
324   - orderActFee: _orderActFee,
325   - orderTotalFee: _orderTotalFee,
326   - payUserId: openId,
327   - terminalOS: isAndroid ? 'AND' : 'IOS',
328   - };
329   - }
330   - return jsondata
331   -}
  292 +// var userAgent = navigator.userAgent;
  293 +// var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
  294 +//
  295 +// function utilParams(val, orderID, openId) {
  296 +// var _orderTotalFee = Number($('#due').text()) * 100 //总金额
  297 +// var fee = $('#discountFee').text()
  298 +// var _fee = fee.substring(0, fee.length - 1);
  299 +// var _orderDicountFee = Number(_fee) * 100 //优惠了多少钱
  300 +// var _orderActFee = _orderTotalFee - _orderDicountFee //实收多少钱
  301 +// var jsondata;
  302 +// if (_orderDicountFee > 0) {
  303 +// jsondata = {
  304 +// orderBigType: 100,
  305 +// payOrderType: 101,
  306 +// rltOrderId: orderID,
  307 +// payType: val,
  308 +// terminalSource: 7,
  309 +// orderActFee: _orderActFee,
  310 +// orderTotalFee: _orderTotalFee,
  311 +// orderDicountFee: _orderDicountFee,
  312 +// payUserId: openId,
  313 +// terminalOS: isAndroid ? 'AND' : 'IOS',
  314 +// couponType: 1, //优惠类型
  315 +// couponCode: $('#discountBox').val(),
  316 +// };
  317 +// } else {
  318 +// jsondata = {
  319 +// orderBigType: 100,
  320 +// payOrderType: 101,
  321 +// rltOrderId: orderID,
  322 +// payType: val,
  323 +// terminalSource: 7,
  324 +// orderActFee: _orderActFee,
  325 +// orderTotalFee: _orderTotalFee,
  326 +// payUserId: openId,
  327 +// terminalOS: isAndroid ? 'AND' : 'IOS',
  328 +// };
  329 +// }
  330 +// return jsondata
  331 +// }
332 332  
... ...
js/pay.js
... ... @@ -9,6 +9,8 @@ var $btnLoad = null;
9 9 var flag = 0;
10 10 var appWxID = getQueryString(window.location).appId;
11 11  
  12 +// var unpaid = getQueryString(window.location).unpaid;//待支付
  13 +
12 14  
13 15 var webAppCode = null;//如果是微信,先获取微信code
14 16 //var $btnLoad = document.getElementById("loading");
... ... @@ -594,7 +596,7 @@ var webAppClass = {
594 596 // alert(JSON.stringify(res.data))
595 597  
596 598 // document.write(res.data);//打开支付表单
597   - window.location.href = res.data.h5PayRequest
  599 + // window.location.href = res.data.h5PayRequest
598 600 } else {//其他情况如【该卡号场内已存在】
599 601 console.log(res.message);
600 602 alertMsg(res.message);
... ... @@ -661,23 +663,24 @@ var webAppClass = {
661 663  
662 664 // alert(getQueryString(window.location).unpaid)
663 665  
  666 +var userAgent = navigator.userAgent;
  667 +var isAndroid = userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1; //android终端
  668 +
664 669 function utilParams(val,orderID,openId) {
665 670 var paySrcType = getQueryString(window.location)._paySrcType
666 671 var _orderTotalFee = Number($('#due').text())*100 //总金额
667 672  
668 673 var _dis = $('#discountFee').text()
669 674 // alert('discountFee内容'+_dis)
670   - var _disMon = _dis.substring(0,_dis.length-1)
  675 + var _disMon = _dis.substring(1,_dis.length-1)
671 676 var _orderDicountFee = Number(_disMon)*100 //优惠了多少钱
672 677  
673   -
674 678 // var _Mon = Number($('#paid').text())*100 //已支付金额
675 679 // alert('优惠了'+_orderDicountFee)
676 680  
677 681  
678 682 var _orderActFee = getQueryString(window.location).unpaid //实收多少钱unpaid
679 683  
680   -
681 684 // var _orderActFee = Number($('#sumMoney').text())*100 //实收多少钱
682 685  
683 686  
... ...