From 89f04e2f2b18aca6fad4e7347b1057a255a71cfc Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 25 May 2022 16:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppCreditPoints/AppIntegralOrder.vue           | 6 +++---
 src/apps/AppCreditPoints/components/sysUserIntegral.vue | 3 +++
 src/apps/AppCreditPoints/giveIntegral.vue               | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppCreditPoints/AppIntegralOrder.vue b/src/apps/AppCreditPoints/AppIntegralOrder.vue
index 8d5dcc85..eafdaa98 100644
--- a/src/apps/AppCreditPoints/AppIntegralOrder.vue
+++ b/src/apps/AppCreditPoints/AppIntegralOrder.vue
@@ -31,9 +31,9 @@
         <div class="fill">兑换人：{{ row.createUserName }}</div>
         <div v-text="row.createTime"/>
       </div>
-      <div v-if="row.orderStatus==0" flex class="flexEnd">
-        <div class="btn" @click="handleCancel(row.id)">取消订单</div>
-        <div class="btn confirm" @click="handleConfirm(row.id)">确认兑换</div>
+      <div v-if="row.orderStatus==0 || row.orderStatus==3" flex class="flexEnd">
+        <div class="btn" v-if="row.orderStatus==0 || row.orderStatus==3" @click="handleCancel(row.id)">取消订单</div>
+        <div class="btn confirm" v-if="row.orderStatus==0" @click="handleConfirm(row.id)">确认兑换</div>
       </div>
       <u-gap height="1"/>
     </div>
diff --git a/src/apps/AppCreditPoints/components/sysUserIntegral.vue b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
index 8a2a8eb7..7df2030c 100644
--- a/src/apps/AppCreditPoints/components/sysUserIntegral.vue
+++ b/src/apps/AppCreditPoints/components/sysUserIntegral.vue
@@ -53,6 +53,9 @@ export default {
       this.current++;
       this.getInfo()
     })
+    uni.$on('updateIntegral', () => {
+      this.getInfo()
+    })
   },
   methods: {
     // 积分排行
diff --git a/src/apps/AppCreditPoints/giveIntegral.vue b/src/apps/AppCreditPoints/giveIntegral.vue
index 7e27aef5..7d8ad1a5 100644
--- a/src/apps/AppCreditPoints/giveIntegral.vue
+++ b/src/apps/AppCreditPoints/giveIntegral.vue
@@ -64,8 +64,11 @@ export default {
         params: {...this.form}
       }).then(res => {
         if (res?.code == 0) {
+          uni.$emit("updateIntegral")
           this.$u.toast("提交成功!")
           uni.navigateBack({})
+        }else {
+          this.$u.toast(res.msg)
         }
       })
     },