From 122bf7c8370118da4438aedaea46ab47f8c4d899 Mon Sep 17 00:00:00 2001 From: fanfan Date: Sat, 18 May 2024 21:40:37 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/dealer/withdraw/apply.vue | 15 ++++++++------- pages/news/recycling/confirm.vue | 2 +- pages/news/user/withdrawal.vue | 31 +++++++++++++++++++++---------- pages/order/detail.vue | 14 +++++++------- pages/order/index.vue | 6 +++--- 5 files changed, 40 insertions(+), 28 deletions(-) diff --git a/pages/dealer/withdraw/apply.vue b/pages/dealer/withdraw/apply.vue index b11a110..3e0e68c 100644 --- a/pages/dealer/withdraw/apply.vue +++ b/pages/dealer/withdraw/apply.vue @@ -21,7 +21,7 @@ {{ words.money.value }}： + @blur="wordsAmount" :placeholder="words.money_placeholder.value" /> @@ -150,6 +150,7 @@ methods: { wordsAmount(e) { + let that=this let amount = e.detail.value let num = null num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1') @@ -168,19 +169,19 @@ .replace(/\./g, "") .replace("$#$", ".") } - if (num > Number(this.settlement.min_money)) { + if (num > Number(that.settlement.min_money)) { uni.showToast({ - title: this.settlement.min_money > 0 ? `最多可用${Number(this.settlement.min_money)}元, 请重新输入` : + title: that.settlement.min_money > 0 ? `最多可用${Number(that.settlement.min_money)}元, 请重新输入` : '暂无可提现金额', icon: 'none', duration: 2000 }) - this.inputValue = '' - this.$forceUpdate(); + that.inputValue = '' + that.$forceUpdate(); } else { if (!num) { // 判断value值是否等于空,为空amount默认0, - this.inputValue = '' - this.$forceUpdate(); + that.inputValue = '' + that.$forceUpdate(); } } }, diff --git a/pages/news/recycling/confirm.vue b/pages/news/recycling/confirm.vue index f931c7d..742dbdf 100644 --- a/pages/news/recycling/confirm.vue +++ b/pages/news/recycling/confirm.vue @@ -56,7 +56,7 @@ 服务时间 - {{server_time?server_time:(type == 2?'请选择预约上门时间':'请选择预约到店时间')}} + {{server_time?server_time:(type == 1?'请选择预约上门时间':'请选择预约到店时间')}} diff --git a/pages/news/user/withdrawal.vue b/pages/news/user/withdrawal.vue index 07be7c4..b24b175 100644 --- a/pages/news/user/withdrawal.vue +++ b/pages/news/user/withdrawal.vue @@ -13,7 +13,7 @@ 提现金 - ￥ + ￥ 全部提现 @@ -288,6 +288,7 @@ }) }, onCheck(e) { + let that = this let amount = e.detail.value let num = null num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1') @@ -306,26 +307,36 @@ .replace(/\./g, "") .replace("$#$", ".") } - if (num > Number(this.balance)) { + if (num > Number(that.balance)) { uni.showToast({ - title: this.balance > 0 ? `最多可用${Number(this.balance)}元, 请重新输入` : '暂无可提现金额', + title: that.balance > 0 ? `最多可用${Number(that.balance)}元, 请重新输入` : '暂无可提现金额', icon: 'none', duration: 2000 }) - this.obj.money = this.balance > 0 ? this.balance : '' - this.$forceUpdate(); + that.obj.money = '' + that.$set(that.obj, 'money', '') } else { if (!num) { - this.obj.money = '' - this.$forceUpdate(); + that.obj.money = '' + that.$set(that.obj, 'money', '') } else { - this.obj.money = num - this.$forceUpdate(); + that.$set(that.obj, 'money', num) + that.obj.money = num } } + }, allMoeny() { //全部体现 - this.obj.money = this.balance + if (this.balance > 0) { + this.obj.money = this.balance + } else { + uni.showToast({ + title: '暂无可提现金额', + icon: 'none', + duration: 2000 + }) + } + }, tabItem(i) { this.obj.source = i; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 76216cb..9534a4f 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -145,10 +145,10 @@ 共{{ order.total_num }}件商品，实付款￥{{ order.pay_price?Number(order.pay_price):order.pay_price }} + v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value"> + v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value"> 取消订单 @@ -266,15 +266,15 @@ + v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value"> 申请开票 + v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value"> 删除订单 取消订单 @@ -283,7 +283,7 @@ + v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)"> 更多 - @@ -313,7 +313,7 @@ 确认收货 + v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value&&order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value"> 催发货