fix(currency): (#586) 积分提现时若积分不足则前往充值

slimkit · Oct 15, 2018 · ff44e94 · ff44e94
1 parent 9090730
commit ff44e94
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/api/currency.js b/src/api/currency.js
@@ -1,4 +1,5 @@
 import api from "./api";
+import Message from "@/plugins/message";
 
 /**
  * 获取积分配置信息
@@ -56,7 +57,11 @@ export function postCurrencyRecharge(data) {
  * @returns
  */
 export function postCurrencyWithdraw(data) {
-  return api.post("/currency/cash", data, {
-    validateStatus: s => s === 201
-  });
+  return api
+    .post("/currency/cash", data, {
+      validateStatus: s => s === 201
+    })
+    .catch(({ response }) => {
+      Message.error(response.data);
+    });
 }
diff --git a/src/page/currency/CurrencyWithdraw.vue b/src/page/currency/CurrencyWithdraw.vue
@@ -72,7 +72,8 @@ export default {
   },
   computed: {
     ...mapState({
-      currency: "currency"
+      currency: "currency",
+      user: "CURRENTUSER"
     }),
     cash() {
       return this.currency.cash;
@@ -83,13 +84,21 @@ export default {
     },
     disabled() {
       return this.amount < this.cash.min || this.amount > this.cash.max;
+    },
+    currentCurrency() {
+      return this.user.currency.sum || 0;
     }
   },
   mounted() {
     if (!this.cash.rule) this.$store.dispatch("currency/getCurrencyInfo");
   },
   methods: {
     async handleOk() {
+      // 积分不足时前往充值
+      if (this.amount > this.currentCurrency) {
+        this.$Message.error("积分不足，请充值");
+        return this.$router.push({ name: "currencyRecharge" });
+      }
       const { message } = await this.$store.dispatch(
         "currency/requestWithdraw",
         this.amount