cart_pt

yvan.ni
1 parent 657e9b4f
Showing 6 changed files with 44 additions and 11 deletions
pages/cart/cart2_pt/cart2_pt.js → packageE/pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.json → packageE/pages/cart/cart2_pt/cart2_pt.json
pages/cart/cart2_pt/cart2_pt.wxml → packageE/pages/cart/cart2_pt/cart2_pt.wxml
pages/cart/cart2_pt/cart2_pt.wxss → packageE/pages/cart/cart2_pt/cart2_pt.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_show/team_show.js
-var t = getApp(), app = t, a = t.request, e = require("../../../utils/common.js"),
-     s = require("../../../utils/util.js"), ut = s, o = require("../../../utils/md5.js"), to = getApp();
+var t = getApp(), app = t, a = t.request, e = require("../../../../utils/common.js"),
+     s = require("../../../../utils/util.js"), ut = s, o = require("../../../../utils/md5.js"), to = getApp();
 var oo = t.globalData.setting, os = oo;
-var regeneratorRuntime = require('../../../utils/runtime.js');
-var util_pay = require("../../../utils/pay.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+var util_pay = require("../../../../utils/pay.js");
  
 Page({
  
@@ -101,7 +101,7 @@ Page({
     })
   },
   onLoad: function (t) {
-    console.log("onLoad_pt_cart");
+    this.data.fir_in=1;
     var th = this;
     getApp().getConfig2(function (e) {
       th.setData({
@@ -575,12 +575,44 @@ Page({
   //----------子页返回父页触发----------
   onShow: function () {
  
-    var fy=ut.fy_back("/pages/user/order_list/order_list",1);
-    if(fy) return false;
+    var th = this;
+    //判断是不是第一次进入
+    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();
+        //-- 通联的第三方支付的返回优化 --
+        ut.is_pay_ok("/pages/team/team_success/team_success?ordersn=" + th.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.pt_status==1 || item.pt_status==2){
+                  //支付支付，返回首页
+                  ut.m_toast('支付成功');
+                  setTimeout(()=>{
+                    getApp().re_to("/pages/team/team_success/team_success?ordersn=" + th.data.ok_order_sn);
+                  },1000)
+
+                }else{
+                  //支付支付，返回首页
+                  ut.m_toast('支付失败');
+                  setTimeout(()=>{
+                    getApp().goto("/pages/index/index/index");
+                  },1000)
+                }
+            }
+          })
+        });
+
+    }
  
-    util_pay.set_fir();
  
-    var th = this;
     if (th.data.isclose == 0) {
       wx.navigateTo({
         url: "/pages/index/index/index"
@@ -1339,6 +1371,7 @@ 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({
@@ -5308,7 +5308,7 @@ Page({
                     buyNow_pt: function (e) {
                       s.set_b_now(e);
                       wx.navigateTo({
-                        url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id,
+                        url: "/packageE/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id,
                       });
                     },
  
@@ -850,7 +850,7 @@ Page({
  
         s.set_b_now(newd);
         wx.navigateTo({
-          url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
+          url: "/packageE/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
         });
       });
   },