Merge remote-tracking branch 'origin/master'

doum

昨天 08300102d46271dd34073465763debd8507e8552

 mini-program/main.js

@@ -17,7 +17,8 @@
Vue.use(uView);

store.dispatch('getHeight')

import shareMixin from '@/utils/shareMixin'
Vue.mixin(shareMixin)
const app = new Vue({
   store,
   ...App