fix(taro-weapp): state 与 props 优先级

NervJS · Jul 31, 2018 · de7db67 · de7db67
1 parent 8239556
commit de7db67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/taro-weapp/src/lifecycle.js b/packages/taro-weapp/src/lifecycle.js
@@ -43,14 +43,14 @@ export function updateComponent (component) {
 }
 
 function doUpdate (component) {
-  const {state, props = {}} = component
+  const { state, props = {} } = component
   let data = state || {}
   if (component._createData) {
     data = component._createData(state, props)
   }
   let privatePropKeyVal = component.$scope.data[privatePropKeyName] || false
 
-  data = Object.assign(data, props)
+  data = Object.assign({}, props, data)
   if (component.$usedState && component.$usedState.length) {
     const _data = {}
     component.$usedState.forEach(key => {