支付的优化

yvan.ni
1 parent ff1702f8
Showing 10 changed files with 122 additions and 26 deletions
app.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2_pre.js
packageD/pages/user/deposit/prepaid/prepaid.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/user/order_detail/order_detail.js
@@ -519,6 +519,9 @@ App({
         }
     },
+    re_to(url){
+        wx.redirectTo({ url: url, })  //跳到非tabbar页
+    },
     //显示提示，word提示内容，type 0失败，提示   1成功
     my_warnning(word, type, that, width) {
@@ -128,6 +128,9 @@ Page({
   },
   onLoad: function (t) {
+    //定义第一次进入
+    this.data.fir_in=1;
+
     // console.log('收到的传参', t);
     wx.setNavigationBarTitle({
       title: '填写订单',
@@ -654,11 +657,48 @@ Page({
   //----------子页返回父页触发----------
   onShow: function () {
-    var fy=ut.fy_back('/pages/user/order_list/order_list',1);
-    if(fy) return false;
-
     var th = this;
-    util_pay.set_fir();
+
+    //判断是不是第一次进入
+    if(this.data.fir_in){
+      this.data.fir_in=0;
+    }else{
+        var fy=ut.fy_back('/pages/user/order_list/order_list',1);
+        if(fy) return false;
+        util_pay.set_fir();
+
+        var back="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + this.data.ok_order_sn +
+         "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id +
+         "&goods_name=" + th.data.bn_goods.goods_name;
+
+        //-- 通联的第三方支付的返回优化 --
+        ut.is_pay_ok(back,'/pages/user/order_list/order_list',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().re_to(back);
+                },1000)
+
+              }else{
+                //支付支付，返回首页
+                ut.m_toast('支付失败');
+                setTimeout(()=>{
+                  getApp().re_to("/pages/user/order_list/order_list");
+                },1000)
+              }
+            }
+          })
+        });
+
+    }
+
+
     if (th.data.isclose == 0) {
       wx.navigateTo({
@@ -1477,6 +1517,8 @@ Page({
               //  order_sn: data.data,
               //  type:1,
               // }, 1);
+
+              th.data.ok_order_sn=data.data;
               util_pay.pay(data.data, function () {
                 setTimeout(function () {
                   // wx.reLaunch({
@@ -157,6 +157,10 @@ Page({
         })
       },
     onLoad: function (t) {
+
+        //定义第一次进入
+        this.data.fir_in=1;
+
         wx.setNavigationBarTitle({ title: "填写订单", })
         var th = this;
@@ -191,19 +195,50 @@ Page({
     //----------子页返回父页触发----------
     onShow: function () {
         var th = this;
-        var fy= ut.fy_back('',0,function (){
-            var cps = getCurrentPages();
-            if (cps.length > 1) {
-                wx.navigateBack({ delta: 1 })
-            } else {
-                getApp().goto("/pages/index/index/index");
-            }
+        //判断是不是第一次进入
+        if(this.data.fir_in){
+            this.data.fir_in=0;
+        }else{
+            //富友支付插件
+            var fy= ut.fy_back('',0,function (){
+                var cps = getCurrentPages();
+                if (cps.length > 1) {
+                    wx.navigateBack({ delta: 1 })
+                } else {
+                    getApp().goto("/pages/index/index/index");
+                }
-        })
-        if(fy) return false;
+            })
+            if(fy) return false;
+            util_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().re_to("/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)
+                        }
+                    }
+                })
+            });
+        }
-        util_pay.set_fir();
         th.data.g_cart_q_time = null;
         if (th.data.isclose == 0) {
             wx.navigateTo({
@@ -1667,6 +1702,8 @@ Page({
                             //void e.jumpToCart4({
                             //  order_sn: data.data,
                             //}, 1);
+                            th.data.ok_order_sn=data.data;
+
                             util_pay.pay(data.data, function () {
                                 //app.my_warnning("支付成功",1,th);
                                 //setTimeout(function () {
@@ -304,14 +304,14 @@ Page({
                 //支付支付，返回首页
                 ut.m_toast('支付成功');
                 setTimeout(()=>{
-                  getApp().goto(ok_url);
+                  getApp().re_to(ok_url);
                 },1000)
               }else{
                 //支付支付，返回首页
                 ut.m_toast('支付失败');
                 setTimeout(()=>{
-                  getApp().goto(err_url);
+                  getApp().re_to(err_url);
                 },1000)
               }
             }
@@ -15,6 +15,10 @@ Page({
         perpaid: [], //数据,
         paying:0
       },
+      onLoad:function (){
+          //定义第一次进入
+          this.data.fir_in=1;
+      },
       /* 生命周期函数--监听页面初次渲染完成*/
       onReady: function() {
 		var th=this;
@@ -96,19 +100,27 @@ Page({
 */
   onShow: function () {
+      var th=this;
+      //判断是不是第一次进入
+      if(this.data.fir_in){
+          this.data.fir_in=0;
+      }else{
+          //富友插件
+          ut.fy_back('',0)
+          t_pay.set_fir();
+      }
       wx.setNavigationBarTitle({
           title: "流动资金转预存",
       })
       this.data.paying=0;
-      ut.fy_back('',0)
-      t_pay.set_fir();
-    if(getApp().globalData.user_id && !this.data.is_get){
-       this.yuck();
-    }
+
+        if(getApp().globalData.user_id && !this.data.is_get){
+           this.yuck();
+        }
   },
       //确定充值
@@ -296,7 +296,7 @@ Page({
                 //支付支付，返回首页
                 ut.m_toast('支付成功');
                 setTimeout(()=>{
-                  getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn);
+                  getApp().re_to("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn);
                 },1000)
               }else{
@@ -235,7 +235,7 @@ Page({
                   //支付支付，返回首页
                   ut.m_toast('支付成功');
                   setTimeout(()=>{
-                    getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn);
+                    getApp().re_to("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn);
                   },1000)
                 }else{
@@ -596,7 +596,7 @@ Page({
                   //支付支付，返回首页
                   ut.m_toast('支付成功');
                   setTimeout(()=>{
-                    getApp().goto("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn);
+                    getApp().re_to("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn);
                   },1000)
                 }else{
@@ -120,7 +120,7 @@ Page({
                   //支付支付，返回首页
                   ut.m_toast('支付成功');
                   setTimeout(()=>{
-                    getApp().goto("/pages/payment/pay_success/pay_success?type=1&order_sn=" + th.data.ok_order_sn);
+                    getApp().re_to("/pages/payment/pay_success/pay_success?type=1&order_sn=" + th.data.ok_order_sn);
                   },1000)
                 }else{
@@ -69,14 +69,16 @@ Page({
     onShow: function() {
         var th=this;
+        this.setData({paying:0});
+
         //判断是不是第一次进入
         if(this.data.fir_in){
             this.data.fir_in=0;
         }else{
             //富友支付
             ut.fy_back('',0)
-            this.setData({paying:0});
             py.set_fir();
+
             //通联第三方
             //-- 通联的第三方支付的返回优化 --
             ut.is_pay_ok("back",null,function (){