fix(pay): (#583) 支付积分前先检查积分余额是否充足

slimkit · Oct 15, 2018 · 53c95aa · 53c95aa · mutoe · Oct 15, 2018
1 parent ff44e94
commit 53c95aa
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/src/components/applyForTop.vue b/src/components/applyForTop.vue
@@ -147,13 +147,14 @@ export default {
   },
   methods: {
     showPasswordConfirm() {
+      if (this.currency < this.amount) {
+        this.$Message.error("积分不足，请充值");
+        this.cancel();
+        return this.$router.push({ name: "currencyRecharge" });
+      }
       this.$refs.password.show();
     },
     applyTop(password) {
-      if (this.currency < this.amount) {
-        this.$router.push({ name: "currencyRecharge" });
-        return this.cancel();
-      }
       if (this.loading || !this.applyType) return;
       this.loading = true;
       const params = {

diff --git a/src/components/payfor.vue b/src/components/payfor.vue
@@ -62,6 +62,10 @@ export default {
         (((this.$store.state.CONFIG || {}).site || {}).currency_name || {})
           .name || "积分"
       );
+    },
+    currentCurrency() {
+      const user = this.$store.state.CURRENTUSER;
+      return user.currency.sum || 0;
     }
   },
   created: function() {
@@ -104,6 +108,11 @@ export default {
     onCancel() {},
     onSuccess() {},
     showPasswordConfirm() {
+      if (this.currentCurrency < this.amount) {
+        this.$Message.error("积分不足，请充值");
+        this.cancel();
+        return this.$router.push({ name: "currencyRecharge" });
+      }
       if (this.node) this.$refs.password.show();
       else this.handleOk();
     },
@@ -116,7 +125,8 @@ export default {
               this.onSuccess(data);
               this.cancel();
             })
-            .catch(() => {
+            .catch(({ response }) => {
+              this.$Message.error(response.data);
               this.cancel();
             })
         : this.cancel();

diff --git a/src/components/reward.vue b/src/components/reward.vue
@@ -86,6 +86,10 @@ export default {
     },
     disabled() {
       return !this.amount > 0;
+    },
+    currentCurrency() {
+      const user = this.$store.state.CURRENTUSER;
+      return user.currency.sum || 0;
     }
   },
   watch: {
@@ -117,6 +121,11 @@ export default {
   },
   methods: {
     showPasswordConfirm() {
+      if (this.currentCurrency < this.amount) {
+        this.$Message.error("积分不足，请充值");
+        this.cancel();
+        return this.$router.push({ name: "currencyRecharge" });
+      }
       this.$refs.password.show();
     },
     reward(password) {

diff --git a/src/page/post/PostNews.vue b/src/page/post/PostNews.vue
@@ -219,6 +219,10 @@ export default {
           .name || "积分"
       );
     },
+    currentCurrency() {
+      const user = this.$store.state.CURRENTUSER;
+      return user.currency.sum || 0;
+    },
     canPostNews() {
       return !this.newsVerified || (this.newsVerified && this.verified);
     },
@@ -357,6 +361,11 @@ export default {
         });
     },
     showPasswordConfirm() {
+      if (this.currentCurrency < this.amount) {
+        this.$Message.error("积分不足，请充值");
+        this.cancel();
+        return this.$router.push({ name: "currencyRecharge" });
+      }
       this.$refs.password.show();
     },
     handleOk() {