Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

src/platforms/mp-baidu/runtime/wrapper/page-parser.js

@@ -25,12 +25,10 @@ export default function parsePage (vuePageOptions) {
     initRelation
   })
 
-  const newLifecycle = swan.canIUse('lifecycle-2-0')
-
   // 纠正百度小程序新生命周期(2.0)methods:onShow在methods:onLoad之前触发的问题
   pageOptions.methods.onShow = function onShow () {
     if (this.$vm && this.$vm.$mp.query) {
-      this.$vm.__call_hook('onShow');
+      this.$vm.__call_hook('onShow')
     }
   }