From fb827e92e1a2a14596fc6a3d5644caf338556c38 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 30 Mar 2022 16:15:31 +0800
Subject: [PATCH] 登录成功、支付成功提示图标由感叹号改为打勾

---
 packageA/pages/cart2_ser/cart2_ser.js | 16 +++++++++++++---
 pages/cart/cart2_pt/cart2_pt.js       |  7 ++++++-
 pages/cart/cart_wk/cart_wk.js         | 14 ++++++++++++--
 pages/togoin/togoin.js                | 15 +++++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 9e6f702..21074d0 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -169,7 +169,7 @@ Page({
 					await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {})
 					.then(
 						res => {
-							console.log('+++++++++', res.data.code);
+							// console.log('+++++++++', res.data.code);
 							if(res.data.code == 0) {
 								good = res.data.data;
 								item.img_url = oo.imghost + good.imgUrl;
@@ -610,7 +610,12 @@ Page({
 									let order_id = data.data.order_id;
 									th.weixinPay(n,
 										function() {
-											getApp().showWarning("购买成功");
+											// getApp().showWarning("购买成功");
+											wx.showToast({
+											  title: '购买成功',
+											  icon: 'success',
+											  duration: 2000
+											});
 											setTimeout(function() {
 												wx.reLaunch({
 													url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
@@ -663,7 +668,12 @@ Page({
 			signType: n.signType,
 			paySign: n.paySign,
 			success: function(n) {
-				console.log(n), getApp().showSuccess("支付成功！");
+				// console.log(n), getApp().showSuccess("支付成功！");
+				wx.showToast({
+				  title: '支付成功',
+				  icon: 'success',
+				  duration: 2000
+				});
 				"function" == typeof success && success();
 				wx.redirectTo({
 					url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 0995f91..b91b72d 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -713,7 +713,12 @@ Page({
                 data: dd,
                 success: function (t) {
                   console.log(t);
-                  app.my_warnning("支付成功", 1, th);
+                  // app.my_warnning("支付成功", 1, th);
+									wx.showToast({
+									  title: '支付成功',
+									  icon: 'success',
+									  duration: 2000
+									});
                   setTimeout(function () {
                     th.setData({ isclose: 0 });
 
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 652dae1..502f6a5 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -402,7 +402,12 @@ Page({
         } else {
           if (t.data.code == 0) {
             //---用余额支付---
-            getApp().my_warnning("支付成功", 1, th);
+            // getApp().my_warnning("支付成功", 1, th);
+						wx.showToast({
+						  title: '支付成功',
+						  icon: 'success',
+						  duration: 2000
+						});
             setTimeout(function () {
               th.setData({ isclose: 0 });
               wx.redirectTo({
@@ -666,7 +671,12 @@ Page({
       signType: n.signType,
       paySign: n.paySign,
       success: function (n) {
-        console.log(n), getApp().showSuccess("支付成功！");
+        // console.log(n), getApp().showSuccess("支付成功！");
+				wx.showToast({
+				  title: '支付成功',
+				  icon: 'success',
+				  duration: 2000
+				});
         "function" == typeof success && success();
       },
       fail: function (n) {
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index e9ad5cf..bc99d99 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -109,7 +109,12 @@ Page({
 					 that.setData({user:user})
 		             //如果有会员的话,没有sessionKey
 		             if(!e.data.data.sessionKey){
-						 getApp().showWarning("登录成功");
+						 // getApp().showWarning("登录成功");
+							wx.showToast({
+							  title: '登录成功',
+							  icon: 'success',
+							  duration: 2000
+							});
 		                 getApp().globalData.userInfo=e.data.data;
 						 getApp().globalData.user_id=e.data.data.user_id;
 						 getApp().globalData.openid = e.data.data.weapp_openid;
@@ -283,7 +288,13 @@ Page({
 	  			 that.setData({user:user})
 	               //如果有会员的话,没有sessionKey
 	               if(!e.data.data.sessionKey){
-	  				 getApp().showWarning("登录成功");
+	  				 // getApp().showWarning("登录成功");
+						 wx.showToast({
+						   title: '登录成功',
+						   icon: 'success',
+						   duration: 2000
+						 });
+
 	                   getApp().globalData.userInfo=e.data.data;
 	  				 getApp().globalData.user_id=e.data.data.user_id;
 	  				 getApp().globalData.openid = e.data.data.weapp_openid;
--
libgit2 0.21.4