Merge branch 'master' into local-deploy

src/main.js

@@ -1,4 +1,4 @@
-console.log('v1.1')
+console.log('v1.2')
 
 import Vue from 'vue'
 import App from './App.vue'
@@ -31,6 +31,13 @@ window.addEventListener('resize', () => {
   document.documentElement.style.fontSize = window.innerHeight * 0.025276 + 'px'
 })
 
+document.documentElement.addEventListener('touchmove', function(event) {
+  if (event.touches.length > 1) {
+    event.preventDefault()
+    event.stopPropagation()
+  }
+}, true)
+
 new Vue({
   router,
   store,

src/views/TreeAnimation.vue

@@ -66,7 +66,6 @@ export default {
   },
   methods: {
     animate() {
-      console.log('animate!')
       TWEEN.update()
       // 这个动画如果用css实现，在ios里会有图片显示不全的问题。
       this.treeImageNode.style.bottom = this.animationBottom.value + 'px'