From efeb42e412a72af6daa31ef69740b7a96e0cd9b3 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 10 Nov 2023 16:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8F=AF=E8=83=BD=E8=B6=85=E5=87=BA=E6=8C=81?=
 =?UTF-8?q?=E6=9C=89=E7=A7=AF=E5=88=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/user_integral/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index 086b184..09d5f33 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -214,6 +214,9 @@ export default {
   // computed: mapGetters(['isLogin', 'viewColor']),
   computed: {
     expected_acquisition: function() {
+      // 判断：是否超出持有积分
+      if(this.current_mer_info.number < this.convert_integral) this.convert_integral = this.current_mer_info.number;
+      // 计算应得平台积分
       let expectedAcquisition = Math.ceil(this.current_mer_info.mer_integral_platform_rate * this.convert_integral);
 
       return isNaN(expectedAcquisition) ? 0 : expectedAcquisition;