Merge branch 'master' into release

2018-09-21 00:53:25 +08:00 · 2018-09-21 00:53:25 +08:00 · b1023f376d
commit b1023f376d
parent 65f4c8f95e eeb338a352
2 changed files with 2115 additions and 2100 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/components/ControlPanel/channel/opay/components/opay-setting.vue
+++ b/src/components/ControlPanel/channel/opay/components/opay-setting.vue
@ -66,8 +66,8 @@ export default {
      } catch (err) {}
      let data = {
        title: this.title,
-        amount: this.amount,
+        amount: toInt(this.amount, 0, 0),
-        start_amount: this.startAmount,
+        start_amount: toInt(this.startAmount, 0, 0),
        end: ets
      }
      this.changeOpaySetting({