From e8cffe6528ffadec6da30d49275daa720aa865cf Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 16 Jun 2020 19:01:54 +0800
Subject: [PATCH] 1。  0元支付成功的优化

---
 pages/user/cardinfo/cardinfo.js | 10 ++++++++--
 utils/pay2.js                   |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 9cb5ffa..2c9f692 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -810,12 +810,18 @@ Page({
   },
   
   //--支付成功，跳转到等级卡续费页面--
-  success:function () {
-      getApp().my_warnning("支付成功",0,this);
+  success:function (ind) {
+      if(ind==1){
+          getApp().my_warnning("升级成功",0,this);
+      }else{
+          getApp().my_warnning("支付成功",0,this);
+      }
       this.init();
   },
 
 
+
+
  //------计算俩种卡的------
  change_card:async function (e) {
      var th = this,card_id =e.currentTarget.dataset.cid ,end_time=0;
diff --git a/utils/pay2.js b/utils/pay2.js
index a99a44c..084a4a2 100644
--- a/utils/pay2.js
+++ b/utils/pay2.js
@@ -8,7 +8,11 @@ module.exports = {
             data: dd,
             success: function(t) {
                 if(t.data.code==0){
-                    i.weixinPay(t.data.data, succ,fail);
+                    if(t.data.data=="升级成功"){
+                        "function" == typeof succ && succ(1);
+                    }else{
+                        i.weixinPay(t.data.data, succ,fail);
+                    }
                 }else{
                     "function" == typeof fail && fail();
                 }
--
libgit2 0.21.4