From 07a03b59b0f2d12fc739b6de899a67033e71fb73 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 18 Jul 2023 12:38:06 +0800 Subject: [PATCH] 支付的优化 --- packageA/pages/cart2_ser/cart2_ser.js | 3 +++ packageA/pages/details_serviceCard/details_serviceCard.js | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- packageA/pages/myGift/myGift.js | 15 ++++++++++++--- packageA/pages/myGiftDetails/myGiftDetails.js | 26 +++++++++++++++++++++----- utils/pay2.js | 3 ++- 5 files changed, 120 insertions(+), 11 deletions(-) diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 7c830a5..6bfdb12 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -687,6 +687,9 @@ Page({ }, 1000) },function (e){ + + console.log('kkkkkkk'); + wx.showToast({ title: e, icon: 'none', diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index 86b0ed0..fe851d4 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -20,6 +20,9 @@ Page({ */ onLoad: function(options) { + //定义第一次进入 + this.data.fir_in=1; + self = this; this.data.options = options; @@ -47,8 +50,85 @@ Page({ */ onShow: function() { this.data.is_summit_ing=0; - util.fy_back('',0) - t_pay.set_fir(); + + var th=this; + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + util.fy_back('',0) + t_pay.set_fir(); + + var back_url='/pages/user/order_list/order_list?index=2&tabindex=1'; + var err_url='/pages/user/order_list/order_list?index=2&tabindex=1'; + + if(th.data.details) { + //-- 判断一下活动的类型 -- + var prom_type = th.data.details.list[0].prom_type > 0 ? th.data.details.list[0].prom_type : 0; + var order_id = th.data.details.order_id; + var order_sn = th.data.details.order_sn; + + var ck_url = ''; //请求地址 + var req_data = {}; //请求参数 + if (parseInt(prom_type) == 6) { + ck_url = "/api/weshop/rechargeServicelist/page"; + req_data = {store_id: os.stoid, order_id: order_id}; + } else { + ck_url = "/api/weshop/recharge/user/page"; + req_data = {store_id: os.stoid, order_id: order_id, user_id: getApp().globalData.user_id}; + } + + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok(back_url, err_url, function () { + + if (!th.data.details) return false; + + getApp().request.promiseGet(ck_url, + {data: req_data}).then(res => { + if (ut.ajax_ok(res)) { + var item = res.data.data.pageData[0]; + if (parseInt(prom_type) == 6) { + if (item.pt_status == 1 || item.pt_status == 2) { + //支付支付，返回首页 + ut.m_toast('支付成功'); + setTimeout(() => { + getApp().re_to(back_url); + }, 1000) + + } else { + //支付支付，返回首页 + ut.m_toast('支付失败'); + setTimeout(() => { + getApp().re_to(back_url); + }, 1000) + } + + } else { + if (item.pay_status == 1) { + //支付支付，返回首页 + ut.m_toast('支付成功'); + setTimeout(() => { + getApp().re_to(back_url); + }, 1000) + + } else { + //支付支付，返回首页 + ut.m_toast('支付失败'); + setTimeout(() => { + getApp().re_to(back_url); + }, 1000) + } + } + + + } + }) + }); + } + + } + + getApp().check_can_share(); if (app.globalData.userInfo) { if (!this.data.isLogin) { diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js index ea83e63..3f14c5e 100644 --- a/packageA/pages/myGift/myGift.js +++ b/packageA/pages/myGift/myGift.js @@ -4,6 +4,7 @@ let self = null; var os = app.globalData.setting; var t_pay = require("../../../utils/pay2.js"); var util = require('../../../utils/util.js'); +var ut=util; Page({ @@ -110,11 +111,19 @@ Page({ //-- 通联的第三方支付的返回优化 -- util.is_pay_ok("none","none",function (){ if(!th.data.ok_order_sn) return false; - getApp().request.promiseGet("/api/weshop/order/page", - {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{ + + var b_url="/api/weshop/libao/libaoFormvip/page"; + var rq_data={ + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + number: th.data.ok_order_sn + }; + + getApp().request.promiseGet(b_url, + {data:rq_data}).then(res=>{ if(ut.ajax_ok(res)){ var item=res.data.data.pageData[0]; - if(item.pay_status==1){ + if(item.fbillstate==1){ //支付支付，返回首页 util.m_toast('支付成功'); }else{ diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js index fe7cef9..c68e479 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.js +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -82,12 +82,29 @@ Page({ //-- 通联的第三方支付的返回优化 -- ut.is_pay_ok("/packageA/pages/libao_payment/payment?type=2","none",function (){ + + console.log('is_pay_ok'); + console.log(th.data.ok_order_sn); + if(!th.data.ok_order_sn) return false; - getApp().request.promiseGet("/api/weshop/order/page", - {data:{store_id:os.stoid,parent_sn:th.data.ok_order_sn}}).then(res=>{ + + var b_url="/api/weshop/libao/libaoFormvip/page"; + var rq_data={ + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + number: th.data.ok_order_sn + }; + + getApp().request.promiseGet(b_url, + {data:rq_data}).then(res=>{ + + console.log('is_pay_ok2'); + console.log('1111111'); + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[0]; - if(item.pay_status==1){ + if(item.fbillstate==1){ //支付支付，返回首页 ut.m_toast('支付成功'); setTimeout(()=>{ @@ -107,7 +124,6 @@ Page({ } - getApp().check_can_share(); if(app.globalData.userInfo) { if(!this.data.isLogin) { @@ -285,7 +301,7 @@ Page({ },function (msg){ th.data.is_summit_ing=0; getApp().my_warnning(msg, 0, th); - }) + },th) // var url = "/api/weshop/libao/libaoFormvip/libaoOrder"; // getApp().request.post(url, diff --git a/utils/pay2.js b/utils/pay2.js index 0dbb56a..8382532 100644 --- a/utils/pay2.js +++ b/utils/pay2.js @@ -73,9 +73,10 @@ module.exports = { appId: 'wxef277996acc166c3', extraData: p_data, fail(){ + //-- 取消不支付 -- i.wx_paying=0; - "function" == typeof a && a(); + "function" == typeof fail && fail('取消支付'); } }) }else { -- libgit2 0.21.4