|
@@ -805,14 +805,14 @@
|
|
|
$(".surePay").on("click", function() {
|
|
|
$(".loading_").show();
|
|
|
let isvip_order=$(".media").attr("isviporder");
|
|
|
+ var order_code_vip=$(".order_code_vip").html();
|
|
|
//vip支付;
|
|
|
- if (isvip_order=="true"){
|
|
|
+ if (order_code_vip!=""){
|
|
|
var orderCode =$(".media").attr("eid");
|
|
|
if(!canpay)return
|
|
|
canpay=false;
|
|
|
$.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode,"pay_way":pay_way},function(r){
|
|
|
if(r.success){
|
|
|
- alert( JSON.stringify(r))
|
|
|
if(pay_way=="wx_app"){
|
|
|
JyObj.wxPay(r.data.res);
|
|
|
}else{
|
|
@@ -837,14 +837,15 @@
|
|
|
if (data.success){
|
|
|
try {
|
|
|
if(pay_way=="wx_app"){
|
|
|
- JyObj.wxPay(data.data)
|
|
|
+ alert("wx");
|
|
|
+ JyObj.wxPay(data.data);
|
|
|
}else{
|
|
|
- JyObj.aliPay(data.data)
|
|
|
+ JyObj.aliPay(data.data);
|
|
|
}
|
|
|
- $('.pay_way').hide(200)
|
|
|
+ $('.pay_way').hide(200);
|
|
|
checkPaySuccess(data.order);
|
|
|
} catch (e) {
|
|
|
- alert(e)
|
|
|
+ alert(e);
|
|
|
}
|
|
|
}
|
|
|
$(".loading_").hide();
|
|
@@ -1066,7 +1067,7 @@
|
|
|
function choosePayWay_vip(orderMoney,orderCode,e){
|
|
|
$(".pay_way").show();
|
|
|
$(".money_pay").text("¥"+orderMoney);
|
|
|
- $(".order_code_vip").text(orderCode)
|
|
|
+ $(".order_code_vip").text(orderCode);
|
|
|
|
|
|
$("#wx").prop("checked",true);
|
|
|
$("#zfb").prop("checked",false);
|
|
@@ -1417,7 +1418,7 @@
|
|
|
}else{
|
|
|
orderMoney_vip=orderMoney_vip1;
|
|
|
}
|
|
|
- console.log(orderMoney_vip)
|
|
|
+ console.log(orderMoney_vip,"===",orderMoney)
|
|
|
if(orderStatus_vip==0){
|
|
|
orderStatus_vip="待付款"
|
|
|
orderHtml=""
|
|
@@ -1426,7 +1427,7 @@
|
|
|
iconHtml=""
|
|
|
iconHtml+='<div class="card-footer">'
|
|
|
+'<a class="btn cancle" onclick="cancelOrder('+id_vip+',this)">取消订单</a>'
|
|
|
- +'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\','+orderMoney+',"'+orderMoney+'",this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
|
|
|
+ +'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\',"'+orderCode_vip+'",this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
|
|
|
+'</div>'
|
|
|
}else if(orderStatus_vip==1){
|
|
|
orderStatus_vip="已完成";
|