diff --git a/pages/users/user_money/money.vue b/pages/users/user_money/money.vue index 90bc3ab..b04b0b1 100644 --- a/pages/users/user_money/money.vue +++ b/pages/users/user_money/money.vue @@ -94,7 +94,7 @@ }, { name: '充值记录' }], - changeList: [10, 15, 20, 50, 100], + changeList: [0.01, 15, 20, 50, 100], nowChange: 0, nowPrice: 0, priceCount: 1, @@ -162,6 +162,7 @@ clickTab1(e) { this.curNow = e.index; if (e.index == 1) { + this.recordList = []; this.where.page = 1; this.getCommissionInfo(); } @@ -277,13 +278,17 @@ brokerage: parseFloat(value), }).then(res => { // that.$set(that, 'userInfo.now_money', that.$util.$h.Add(value, that.userInfo.now_money)) - return that.$util.Tips({ - title: '转入成功', - icon: 'success' - }, { - tab: 5, - url: '/pages/users/user_money/index' - }); + uni.showToast({ + icon:'success', + title:'转入成功' + }) + // return that.$util.Tips({ + // title: '转入成功', + // icon: 'success' + // }, { + // tab: 5, + // url: '/pages/users/user_money/index' + // }); }).catch(err => { return that.$util.Tips({ title: err @@ -367,30 +372,35 @@ case 'PAY_ERROR': case 'error': uni.hideLoading(); - return that.$util.Tips({ - title: res.message - }, { - tab: 5, - url: goPages - }); + Toast(res.message) + // return that.$util.Tips({ + // title: res.message + // }, { + // tab: 5, + // url: goPages + // }); break; case 'success': uni.hideLoading(); - if (that.seckillId) - return that.$util.Tips({ - title: res.message, - icon: 'success' - }, { - tab: 4, - url: goPages - }); - return that.$util.Tips({ - title: res.message, - icon: 'success' - }, { - tab: 5, - url: goPages - }); + uni.showToast({ + icon:'success', + title:res.message + }) + // if (that.seckillId) + // return that.$util.Tips({ + // title: res.message, + // icon: 'success' + // }, { + // tab: 4, + // url: goPages + // }); + // return that.$util.Tips({ + // title: res.message, + // icon: 'success' + // }, { + // tab: 5, + // url: goPages + // }); break; case 'alipay': case "alipayQr": @@ -410,20 +420,28 @@ jsConfig.timeStamp = jsConfig.timestamp; // #ifndef APP-PLUS that.$wechat.pay(jsConfig).then(res => { - return that.$util.Tips({ - title: res.message, - icon: 'success' - }, { - tab: 4, - url: goPages - }); + uni.showToast({ + icon:'success', + title:res.message + }) + // return that.$util.Tips({ + // title: res.message, + // icon: 'success' + // }, { + // tab: 4, + // url: goPages + // }); }).catch(res => { - if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({ - title: '取消支付' - }, { - tab: 5, - url: goPages - }); + uni.showToast({ + icon:'success', + title: '取消支付' + }) + // if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({ + // title: '取消支付' + // }, { + // tab: 5, + // url: goPages + // }); }) // #endif // #ifdef APP-PLUS @@ -437,14 +455,19 @@ provider: 'wxpay', orderInfo: jsConfig, success: (e) => { - let url = '/pages/users/user_money/money'; - return that.$util.Tips({ - title: '支付成功', - icon: 'success' - }, { - tab: 4, - url: url - }); + this.getUserInfo() + uni.showToast({ + icon: 'success', + title: '支付成功' + }) + // let url = '/pages/users/user_money/money'; + // return that.$util.Tips({ + // title: '支付成功', + // icon: 'success' + // }, { + // tab: 4, + // url: url + // }); }, fail: (e) => { console.log(e); @@ -452,10 +475,7 @@ content: "支付失败", showCancel: false, success: function(res) { - let url = '/pages/users/user_money/money'; - uni.redirectTo({ - url: url - }) + } }) }, @@ -482,22 +502,27 @@ that.getUserInfo(); that.getRecharge(); // console.log('12323424') - return that.$util.Tips({ - title: '支付成功', - icon: 'success' - }, { - tab: 5, - url: goPages - }); + uni.showToast({ + icon:'success', + title:'支付成功' + }) + // return that.$util.Tips({ + // title: '支付成功', + // icon: 'success' + // }, { + // tab: 5, + // url: goPages + // }); }, fail: function(e) { uni.hideLoading(); - return that.$util.Tips({ - title: '取消支付' - }, { - tab: 5, - url: goPages - }); + Toast('取消支付') + // return that.$util.Tips({ + // title: '取消支付' + // }, { + // tab: 5, + // url: goPages + // }); }, }) break; @@ -505,12 +530,13 @@ case "balance": uni.hideLoading(); //余额不足 - return that.$util.Tips({ - title: res.msg - }, { - tab: 5, - url: goPages - }); + Toast(res.msg) + // return that.$util.Tips({ + // title: res.msg + // }, { + // tab: 5, + // url: goPages + // }); break; // #ifdef H5 case 'h5': @@ -530,13 +556,18 @@ provider: 'alipay', orderInfo: jsConfig, success: (e) => { - return that.$util.Tips({ - title: '支付成功', - icon: 'success' - }, { - tab: 5, - url: goPages - }); + this.getUserInfo() + uni.showToast({ + icon:'success', + title:'支付成功' + }) + // return that.$util.Tips({ + // title: '支付成功', + // icon: 'success' + // }, { + // tab: 5, + // url: goPages + // }); }, fail: (e) => { uni.showModal({ diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png index f92d4c4..cb2f5c9 100644 Binary files a/static/tabbar_icon/a-a.png and b/static/tabbar_icon/a-a.png differ diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png index ee73a64..752fbb2 100644 Binary files a/static/tabbar_icon/a.png and b/static/tabbar_icon/a.png differ diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png index 3451092..01fb60d 100644 Binary files a/static/tabbar_icon/b-a.png and b/static/tabbar_icon/b-a.png differ diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png index 8304862..2549e1e 100644 Binary files a/static/tabbar_icon/b.png and b/static/tabbar_icon/b.png differ diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png index e37a912..72cc533 100644 Binary files a/static/tabbar_icon/d-a.png and b/static/tabbar_icon/d-a.png differ diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png index b66315b..6d081bd 100644 Binary files a/static/tabbar_icon/d.png and b/static/tabbar_icon/d.png differ diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png index ff47370..ce3f075 100644 Binary files a/static/tabbar_icon/e-a.png and b/static/tabbar_icon/e-a.png differ diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png index f12061c..7c8ec8e 100644 Binary files a/static/tabbar_icon/e.png and b/static/tabbar_icon/e.png differ