From 27eb4631c02a7a83c4da23433de607bfbae9092d Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Wed, 29 Aug 2018 14:10:01 +0800
Subject: [PATCH 1/2] BI-31511

---
 dist/fix/fix.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index 0fd0684ad..dcf031770 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -1332,9 +1332,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
             this._init();
             initState(this, state);
+            initComputed(this, computed);
             initMixins(this, mixins);
             initMethods(this, actions);
-            initComputed(this, computed);
             initWatch(this, watch$$1);
             this.created && this.created();
             if (this.$$model) {

From b5b1569f0262b4d413aa9ef280f9b84044b3daec Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Wed, 29 Aug 2018 14:35:14 +0800
Subject: [PATCH 2/2] update

---
 dist/fix/fix.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index dcf031770..10d5455db 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -1330,12 +1330,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             defineProps(this, keys);
             childContext && defineContext(this, childContext);
             this.$$model && (this.model.__ob__ = this.$$model.__ob__);
+            initMixins(this, mixins);
             this._init();
             initState(this, state);
             initComputed(this, computed);
-            initMixins(this, mixins);
-            initMethods(this, actions);
             initWatch(this, watch$$1);
+            initMethods(this, actions);
             this.created && this.created();
             if (this.$$model) {
                 return this.model;