Commit fb827e92e1a2a14596fc6a3d5644caf338556c38
1 parent
2d2e3e4a
登录成功、支付成功提示图标由感叹号改为打勾
Showing
4 changed files
with
44 additions
and
8 deletions
packageA/pages/cart2_ser/cart2_ser.js
@@ -169,7 +169,7 @@ Page({ | @@ -169,7 +169,7 @@ Page({ | ||
169 | await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}) | 169 | await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}) |
170 | .then( | 170 | .then( |
171 | res => { | 171 | res => { |
172 | - console.log('+++++++++', res.data.code); | 172 | + // console.log('+++++++++', res.data.code); |
173 | if(res.data.code == 0) { | 173 | if(res.data.code == 0) { |
174 | good = res.data.data; | 174 | good = res.data.data; |
175 | item.img_url = oo.imghost + good.imgUrl; | 175 | item.img_url = oo.imghost + good.imgUrl; |
@@ -610,7 +610,12 @@ Page({ | @@ -610,7 +610,12 @@ Page({ | ||
610 | let order_id = data.data.order_id; | 610 | let order_id = data.data.order_id; |
611 | th.weixinPay(n, | 611 | th.weixinPay(n, |
612 | function() { | 612 | function() { |
613 | - getApp().showWarning("购买成功"); | 613 | + // getApp().showWarning("购买成功"); |
614 | + wx.showToast({ | ||
615 | + title: '购买成功', | ||
616 | + icon: 'success', | ||
617 | + duration: 2000 | ||
618 | + }); | ||
614 | setTimeout(function() { | 619 | setTimeout(function() { |
615 | wx.reLaunch({ | 620 | wx.reLaunch({ |
616 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, | 621 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, |
@@ -663,7 +668,12 @@ Page({ | @@ -663,7 +668,12 @@ Page({ | ||
663 | signType: n.signType, | 668 | signType: n.signType, |
664 | paySign: n.paySign, | 669 | paySign: n.paySign, |
665 | success: function(n) { | 670 | success: function(n) { |
666 | - console.log(n), getApp().showSuccess("支付成功!"); | 671 | + // console.log(n), getApp().showSuccess("支付成功!"); |
672 | + wx.showToast({ | ||
673 | + title: '支付成功', | ||
674 | + icon: 'success', | ||
675 | + duration: 2000 | ||
676 | + }); | ||
667 | "function" == typeof success && success(); | 677 | "function" == typeof success && success(); |
668 | wx.redirectTo({ | 678 | wx.redirectTo({ |
669 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id, | 679 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id, |
pages/cart/cart2_pt/cart2_pt.js
@@ -713,7 +713,12 @@ Page({ | @@ -713,7 +713,12 @@ Page({ | ||
713 | data: dd, | 713 | data: dd, |
714 | success: function (t) { | 714 | success: function (t) { |
715 | console.log(t); | 715 | console.log(t); |
716 | - app.my_warnning("支付成功", 1, th); | 716 | + // app.my_warnning("支付成功", 1, th); |
717 | + wx.showToast({ | ||
718 | + title: '支付成功', | ||
719 | + icon: 'success', | ||
720 | + duration: 2000 | ||
721 | + }); | ||
717 | setTimeout(function () { | 722 | setTimeout(function () { |
718 | th.setData({ isclose: 0 }); | 723 | th.setData({ isclose: 0 }); |
719 | 724 |
pages/cart/cart_wk/cart_wk.js
@@ -402,7 +402,12 @@ Page({ | @@ -402,7 +402,12 @@ Page({ | ||
402 | } else { | 402 | } else { |
403 | if (t.data.code == 0) { | 403 | if (t.data.code == 0) { |
404 | //---用余额支付--- | 404 | //---用余额支付--- |
405 | - getApp().my_warnning("支付成功", 1, th); | 405 | + // getApp().my_warnning("支付成功", 1, th); |
406 | + wx.showToast({ | ||
407 | + title: '支付成功', | ||
408 | + icon: 'success', | ||
409 | + duration: 2000 | ||
410 | + }); | ||
406 | setTimeout(function () { | 411 | setTimeout(function () { |
407 | th.setData({ isclose: 0 }); | 412 | th.setData({ isclose: 0 }); |
408 | wx.redirectTo({ | 413 | wx.redirectTo({ |
@@ -666,7 +671,12 @@ Page({ | @@ -666,7 +671,12 @@ Page({ | ||
666 | signType: n.signType, | 671 | signType: n.signType, |
667 | paySign: n.paySign, | 672 | paySign: n.paySign, |
668 | success: function (n) { | 673 | success: function (n) { |
669 | - console.log(n), getApp().showSuccess("支付成功!"); | 674 | + // console.log(n), getApp().showSuccess("支付成功!"); |
675 | + wx.showToast({ | ||
676 | + title: '支付成功', | ||
677 | + icon: 'success', | ||
678 | + duration: 2000 | ||
679 | + }); | ||
670 | "function" == typeof success && success(); | 680 | "function" == typeof success && success(); |
671 | }, | 681 | }, |
672 | fail: function (n) { | 682 | fail: function (n) { |
pages/togoin/togoin.js
@@ -109,7 +109,12 @@ Page({ | @@ -109,7 +109,12 @@ Page({ | ||
109 | that.setData({user:user}) | 109 | that.setData({user:user}) |
110 | //如果有会员的话,没有sessionKey | 110 | //如果有会员的话,没有sessionKey |
111 | if(!e.data.data.sessionKey){ | 111 | if(!e.data.data.sessionKey){ |
112 | - getApp().showWarning("登录成功"); | 112 | + // getApp().showWarning("登录成功"); |
113 | + wx.showToast({ | ||
114 | + title: '登录成功', | ||
115 | + icon: 'success', | ||
116 | + duration: 2000 | ||
117 | + }); | ||
113 | getApp().globalData.userInfo=e.data.data; | 118 | getApp().globalData.userInfo=e.data.data; |
114 | getApp().globalData.user_id=e.data.data.user_id; | 119 | getApp().globalData.user_id=e.data.data.user_id; |
115 | getApp().globalData.openid = e.data.data.weapp_openid; | 120 | getApp().globalData.openid = e.data.data.weapp_openid; |
@@ -283,7 +288,13 @@ Page({ | @@ -283,7 +288,13 @@ Page({ | ||
283 | that.setData({user:user}) | 288 | that.setData({user:user}) |
284 | //如果有会员的话,没有sessionKey | 289 | //如果有会员的话,没有sessionKey |
285 | if(!e.data.data.sessionKey){ | 290 | if(!e.data.data.sessionKey){ |
286 | - getApp().showWarning("登录成功"); | 291 | + // getApp().showWarning("登录成功"); |
292 | + wx.showToast({ | ||
293 | + title: '登录成功', | ||
294 | + icon: 'success', | ||
295 | + duration: 2000 | ||
296 | + }); | ||
297 | + | ||
287 | getApp().globalData.userInfo=e.data.data; | 298 | getApp().globalData.userInfo=e.data.data; |
288 | getApp().globalData.user_id=e.data.data.user_id; | 299 | getApp().globalData.user_id=e.data.data.user_id; |
289 | getApp().globalData.openid = e.data.data.weapp_openid; | 300 | getApp().globalData.openid = e.data.data.weapp_openid; |