From e053b6be6b0abea5c715dbb864cd06ea22dd501e Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Mon, 25 Mar 2019 17:31:35 +0800
Subject: [PATCH] echo

---
 app/Domains/Real/Commands/Sync/OrderBaseSync.php  | 3 ---
 frontend/src/views/artisan/real-sync/js/edit.js   | 4 ++--
 frontend/src/views/artisan/real-sync/js/refund.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/Domains/Real/Commands/Sync/OrderBaseSync.php b/app/Domains/Real/Commands/Sync/OrderBaseSync.php
index a03cf498..3aa7e20b 100644
--- a/app/Domains/Real/Commands/Sync/OrderBaseSync.php
+++ b/app/Domains/Real/Commands/Sync/OrderBaseSync.php
@@ -218,6 +218,3 @@ class OrderBaseSync extends Command
         return $orderItems;
     }
 }
-
-
-echo strtotime('2018-10-01 00:00:00') - strtotime('2018-08-01 00:00:00');
diff --git a/frontend/src/views/artisan/real-sync/js/edit.js b/frontend/src/views/artisan/real-sync/js/edit.js
index 8033fd97..7a86caf8 100644
--- a/frontend/src/views/artisan/real-sync/js/edit.js
+++ b/frontend/src/views/artisan/real-sync/js/edit.js
@@ -109,7 +109,7 @@ export default {
           this.current++;
         } else {
           this.circle.content = '同步失败';
-          this.circle.percent = this.steps[this.current - 1]['max'];
+          this.circle.percent = this.steps[this.current - 1] ? this.steps[this.current - 1]['max'] : 0;
           this.status = 'error';
         }
         this.disabled = false;
@@ -117,7 +117,7 @@ export default {
         clearInterval(interval);
       }).catch((err) => {
         this.circle.content = '同步失败';
-        this.circle.percent = this.steps[this.current - 1]['max'];
+        this.circle.percent = this.steps[this.current - 1] ? this.steps[this.current - 1]['max'] : 0;
         this.status = 'error';
         this.disabled = false;
         clearInterval(interval);
diff --git a/frontend/src/views/artisan/real-sync/js/refund.js b/frontend/src/views/artisan/real-sync/js/refund.js
index 57ef3b05..f45de451 100644
--- a/frontend/src/views/artisan/real-sync/js/refund.js
+++ b/frontend/src/views/artisan/real-sync/js/refund.js
@@ -92,7 +92,7 @@ export default {
         clearInterval(interval);
       }).catch((err) => {
         this.circle.content = '同步失败';
-        this.circle.percent = this.steps[this.current - 1]['max'];
+        this.circle.percent = this.steps[this.current - 1] ? this.steps[this.current - 1]['max'] : 0;
         this.status = 'error';
         this.disabled = false;
         clearInterval(interval);