From da5d0c0f6facae7166d768c2e8f1b5413d211453 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Fri, 14 Jul 2023 18:30:13 +0800 Subject: [PATCH] pos收银支付 --- packageD/pages/user/deposit/prepaid/prepaid.js | 4 ++-- packageD/pages/user/integral/integral.js | 14 ++++++++------ packageE/pages/user/cardinfo/cardinfo.js | 47 ++++++++++++++++++++++++++++++++++++++++------- pages/user/plus/plus.js | 48 +++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 91 insertions(+), 22 deletions(-) diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 0997313..4a63595 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -114,8 +114,8 @@ Page({ if(!th.data.ok_order_sn) return false; var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; getApp().request.promiseGet(ck_url,{}).then(res=>{ - if(ut.ajax_ok(res)){ - var item=res.data.data.pageData[0]; + if(res.data.code==0 && res.data.data){ + var item=res.data.data; if(item.pay_status==1){ //支付支付，返回首页 ut.m_toast('支付成功'); diff --git a/packageD/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index 6863078..7a2c2b6 100644 --- a/packageD/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -295,10 +295,8 @@ Page({ // }) }) }) - - - - }, + + }, //------支付成功页面-------- jumpPaymentPage: function () { console.log("支付成功页面2333"); @@ -348,11 +346,15 @@ Page({ //-- 通联的第三方支付的返回优化 -- ut.is_pay_ok("/packageD/pages/user/deposit/prepaid/msg/msg",null,function (){ + + console.log('show--11') + console.log(th.data.ok_order_sn); + if(!th.data.ok_order_sn) return false; var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; getApp().request.promiseGet(ck_url,{}).then(res=>{ - if(ut.ajax_ok(res)){ - var item=res.data.data.pageData[0]; + if(res.data.code==0 && res.data.data){ + var item=res.data.data; if(item.pay_status==1){ //支付支付，返回首页 ut.m_toast('支付成功'); diff --git a/packageE/pages/user/cardinfo/cardinfo.js b/packageE/pages/user/cardinfo/cardinfo.js index 416b6eb..a3a4b7c 100644 --- a/packageE/pages/user/cardinfo/cardinfo.js +++ b/packageE/pages/user/cardinfo/cardinfo.js @@ -50,6 +50,9 @@ Page({ */ onLoad: function (options) { + //定义第一次进入 + this.data.fir_in=1; + //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -683,8 +686,42 @@ Page({ */ onShow: function () { this.data.paying=0; - ut.fy_back('',0); - t_pay.set_fir(); + var th=this; + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //-- 富友支付插件的优化 -- + ut.fy_back('',0); + t_pay.set_fir(); + + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn,null,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=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[0]; + if(item.pay_status==1){ + //支付支付，返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn); + },1000) + + }else{ + //支付支付，返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } + } + }) + }); + } + + //同步初始化 this.init(); @@ -748,10 +785,7 @@ Page({ //-----立即续费的功能------ xufei:async function(){ - - - - var th = this,is_card = 0,end_time=0; + var th = this,is_card = 0,end_time=0; await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id="+os.stoid+"&type=3", {1:1}).then(res => { if (ut.ajax_ok(res)) { @@ -789,7 +823,6 @@ Page({ if(this.data.paying) return false; this.data.paying=1; - var item = th.data.user_card; var req = {}; req.cardId = item.CardId; diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 5d38a14..902d087 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -56,8 +56,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - var that = this, - th = that; + + //定义第一次进入 + this.data.fir_in=1; + + var that = this,th = that; var store_id = getApp().globalData.setting.stoid; //获取用户设备信息，屏幕宽度 wx.getSystemInfo({ @@ -130,17 +133,48 @@ Page({ onShow: function () { var user_info = getApp().globalData.userInfo; if (!user_info) return false; - ut.fy_back('',0); + + var th = this,that = th; + + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //富友插件支付 + ut.fy_back('',0); + t_pay.set_fir(); + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn,null,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=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[0]; + if(item.pay_status==1){ + //支付支付，返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn); + },1000) + + }else{ + //支付支付，返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } + } + }) + }); + } this.setData({ is_select:0, focus:true, }) - t_pay.set_fir(); - var th = this, - that = th, - app_d = getApp().globalData; + var app_d = getApp().globalData; var store_id = os.stoid; var fir_leader = this.data.fir_leader; -- libgit2 0.21.4