panhui пре 4 година
родитељ
комит
b2a1ba4ecc
2 измењених фајлова са 10 додато и 5 уклоњено
  1. 4 4
      src/components/auction/deposit.vue
  2. 6 1
      src/views/auction/Detail.vue

+ 4 - 4
src/components/auction/deposit.vue

@@ -96,7 +96,7 @@ export default {
             enable_wx_pub: false,
             hrefUrl: '',
             orderId: 0,
-            timer: null
+            timer: null,
         };
     },
     mounted() {
@@ -237,7 +237,7 @@ export default {
         },
         paySubmit(saveOrder = true) {
             return new Promise((resolve, reject) => {
-                if (this.money && saveOrder) {
+                if (this.info.deposit && saveOrder) {
                     this.$toast.clear();
                     this.$nextTick(() => {
                         if (window.cordova && window.cordova.platformId === 'ios' && this.$store.state.review) {
@@ -247,7 +247,7 @@ export default {
                                 resolve();
                             } else {
                                 this.$http
-                                    .get(`/auction/alipay_h5?id=${this.orderId}`)
+                                    .get(`/payOrder/auction/alipay_h5?id=${this.orderId}`)
                                     .then(res => {
                                         this.$toast.clear();
                                         this.hrefUrl = res;
@@ -353,7 +353,7 @@ export default {
         },
         payEvent(saveOrder = true) {
             this.paySubmit(saveOrder).then(() => {
-                if (this.money) {
+                if (this.info.deposit) {
                     this.$nextTick(() => {
                         if (window.cordova && window.cordova.platformId === 'ios' && this.$store.state.review) {
                             window.store.order('358');

+ 6 - 1
src/views/auction/Detail.vue

@@ -275,7 +275,12 @@ export default {
             return hours;
         },
         isOut() {
-            if (this.recordInfo.bidderPrice && !this.isLeader) {
+            if (
+                this.recordInfo.payDeposit &&
+                this.recordInfo.bidderPrice &&
+                this.recordInfo.bidderPrice !== this.info.deposit &&
+                !this.isLeader
+            ) {
                 return true;
             } else {
                 return false;