diff --git a/pages/activity/intimate.vue b/pages/activity/intimate.vue index 7d28b26..678cadb 100644 --- a/pages/activity/intimate.vue +++ b/pages/activity/intimate.vue @@ -31,7 +31,10 @@ - + + + + {{a.server_name}} diff --git a/pages/news/recycling/confirm.vue b/pages/news/recycling/confirm.vue index bfd4d37..f931c7d 100644 --- a/pages/news/recycling/confirm.vue +++ b/pages/news/recycling/confirm.vue @@ -56,7 +56,7 @@ 服务时间 - {{server_time?server_time:'请选择预约到店时间'}} + {{server_time?server_time:(type == 2?'请选择预约上门时间':'请选择预约到店时间')}} diff --git a/pages/news/recycling/detail.vue b/pages/news/recycling/detail.vue index b01c559..e52d444 100644 --- a/pages/news/recycling/detail.vue +++ b/pages/news/recycling/detail.vue @@ -45,10 +45,10 @@ - + 服务 - + @@ -152,6 +152,7 @@ this.userInfo = {} this.isToken = false; } + this.getCarouselList() uni.removeStorageSync("yuyueTime") }, diff --git a/pages/news/user/withdrawal.vue b/pages/news/user/withdrawal.vue index efde0fa..d80ba40 100644 --- a/pages/news/user/withdrawal.vue +++ b/pages/news/user/withdrawal.vue @@ -13,9 +13,10 @@ 提现金 - + + + 全部提现 - 全部提现 @@ -239,8 +240,8 @@ getCode() { // 获取验证码 const that = this - if(that.isClick == false){ - return ; + if (that.isClick == false) { + return; } if (!that.validatePhoneNumber(that.obj.bank_phone)) { uni.showToast({ @@ -250,7 +251,7 @@ return } that.isClick = false - + CaptchaApi.sendSmsCaptcha({ mobile: that.obj.bank_phone }).then(res => { @@ -266,7 +267,7 @@ clearInterval(that.countDownFun) that.isClick = true } - + }, 1000) uni.showToast({ title: res.message @@ -287,17 +288,43 @@ }) }, onCheck(e) { - if (Number(e.detail.value) > Number(this.balance)) { + let amount = e.detail.value + let num = null + num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1') + const startPoint = /^\./g + if (startPoint.test(num)) { + num = amount.replace(startPoint, '0.') + } + if (num && !num.includes('.') && num !== '0') { + num = +num + } + const morePoint = /\.+(\d*|\.+)\./g + if (morePoint.test(num)) { + num = amount + .replace(/\.{2,}/g, ".") + .replace(".", "$#$") + .replace(/\./g, "") + .replace("$#$", ".") + } + console.log(num) + if (num > Number(this.balance)) { // 判断value值是否小于等于100, 如果大于100限制输入100 uni.showToast({ - title: '输入金额不能大于可提现金额', + title: this.balance > 0 ? `最多可用${Number(this.balance)}元, 请重新输入` : '暂无可提现金额', icon: 'none', duration: 2000 }) - this.obj.money = this.balance - return + this.obj.money = this.balance > 0 ? this.balance : '' + this.$forceUpdate(); } else { - this.obj.money = e.detail.value + if (!num) { // 判断value值是否等于空,为空amount默认0, + this.obj.money = '' + this.$forceUpdate(); + } else { + this.obj.money = num + this.$forceUpdate(); + } } + }, allMoeny() { //全部体现 this.obj.money = this.balance @@ -323,11 +350,13 @@ diff --git a/pages/refund/index.vue b/pages/refund/index.vue index 904956c..94e4907 100644 --- a/pages/refund/index.vue +++ b/pages/refund/index.vue @@ -17,7 +17,7 @@ - + {{ item.create_time }} @@ -55,9 +55,7 @@ - -