From adff31c7efafb81130e0887c1f7e2cb900b993da Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Fri, 12 Apr 2024 11:56:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lang/en.json | 1 + lang/zh.json | 1 + pages/plugins/coin/convert/convert.vue | 19 +++++++++++----- .../user-orderaftersale-detail.css | 2 +- .../user-orderaftersale-detail.vue | 22 ++++++++++--------- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/lang/en.json b/lang/en.json index b91d8ef9..9d0ee07d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -28,6 +28,7 @@ "all": "All", "share": "Share", "return": "Return", + "view_text": "Check", "processing_in_text": "Processing", "loading_in_text": "Loading", "upload_in_text": "Uploading", diff --git a/lang/zh.json b/lang/zh.json index 2046f265..527bda48 100644 --- a/lang/zh.json +++ b/lang/zh.json @@ -28,6 +28,7 @@ "all": "全部", "share": "分享", "return": "返回", + "view_text": "查看", "processing_in_text": "处理中...", "loading_in_text": "加载中...", "upload_in_text": "上传中...", diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue index 3d80ae46..600fc0ef 100644 --- a/pages/plugins/coin/convert/convert.vue +++ b/pages/plugins/coin/convert/convert.vue @@ -18,7 +18,7 @@ - + {{ accounts_list[send_accounts_id_index]['platform_symbol'] }}{{ accounts_list[send_accounts_id_index]['default_coin'] }} @@ -214,23 +214,31 @@ popup_coin_status: true, }); }, + // 切换账户 coin_checked_event(e) { + var index = parseInt(e.currentTarget.dataset.index || 0); + var old_index = (this.coin_type == 1) ? this.receive_accounts_id_index : this.send_accounts_id_index; + if(index == old_index) { + app.globalData.showToast('转出和接收选择不能相同'); + return false; + } if (this.coin_type == 1) { this.setData({ - send_accounts_id_index: parseInt(e.currentTarget.dataset.index || 0), + send_accounts_id_index: index, send_accounts_id: e.currentTarget.dataset.value, }); } else { this.setData({ - receive_accounts_id_index: parseInt(e.currentTarget.dataset.index || 0), + receive_accounts_id_index: index, receive_accounts_id: e.currentTarget.dataset.value, }); } this.setData({ - coin_index: parseInt(e.currentTarget.dataset.index || 0), + coin_index: index, popup_coin_status: false, }); }, + // 关闭账户选择弹窗 popup_coin_status_close_event() { this.setData({ popup_coin_status: false, @@ -251,7 +259,8 @@ convert_bool: !this.convert_bool, }); }, - default_value_change(e) { + // 需要转换的值事件 + default_coin_change_event(e) { this.setData({ default_value: e.detail.value, convert_value: Math.round(e.detail.value * this.accounts_list[this.receive_accounts_id_index]['platform_rate'] * 100) / 100, diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.css b/pages/user-orderaftersale-detail/user-orderaftersale-detail.css index 6a7149fb..77be831a 100644 --- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.css +++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.css @@ -18,7 +18,7 @@ * 类型选择 */ .choose-type .choose-item { - width: calc(50% - 55rpx); + width: calc(50% - 60rpx); -webkit-transition: border-color .2s ease-in; -moz-transition: border-color .2s ease-in; -ms-transition: border-color .2s ease-in; diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue index f2a56416..92c8cda2 100644 --- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue +++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue @@ -66,7 +66,7 @@ {{ new_aftersale_data.tips_msg.title }} - 查看 >> + {{$t('common.view_text')}} >> @@ -87,7 +87,7 @@ {{ new_aftersale_data.tips_msg.title }} - 查看 >> + {{$t('common.view_text')}} >> @@ -410,7 +410,7 @@ export default { return_money_goods_reason: data.return_money_goods_reason || [], aftersale_type_list: data.aftersale_type_list || [], return_goods_address: data.return_goods_address || null, - form_price: data.returned_data || null != null ? data.returned_data.refund_price : 0, + form_price: data.returned_data || null != null ? data.returned_data.refund_price : '', plugins_intellectstools_data: data.plugins_intellectstools_data || null, }); } else { @@ -590,14 +590,16 @@ export default { images: this.form_images_list.length > 0 ? JSON.stringify(this.form_images_list) : "", }; - // 防止金额大于计算的金额 - if (form_data["price"] > this.returned_data["refund_price"]) { - form_data["price"] = this.returned_data["refund_price"]; + // 防止金额大于计算的金额 + var refund_price = parseFloat(this.returned_data["refund_price"]); + if (form_data["price"] > refund_price) { + form_data["price"] =refund_price; } - // 防止数量大于计算的数量 - if (form_data["number"] > this.returned_data["returned_quantity"]) { - form_data["number"] = this.returned_data["returned_quantity"]; + // 防止数量大于计算的数量 + var returned_quantity = parseInt(this.returned_data["returned_quantity"]); + if (form_data["number"] > returned_quantity) { + form_data["number"] = returned_quantity; } // 数据校验 @@ -617,7 +619,7 @@ export default { fields: "number", msg: this.$t('user-orderaftersale-detail.user-orderaftersale-detail.dn3423'), }); - } + } // 校验参数并提交 if (app.globalData.fields_check(form_data, validation)) {