Merge branch 'master' of http://gitlab.oytour.com/huaguohao/newyearparty

package.json

@@ -14,11 +14,14 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "@aspnet/signalr": "^1.1.4",
     "element-ui": "^2.13.0",
+    "socket.io-client": "^2.2.0",
+    "three": "^0.111.0",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
     "vue-socket.io": "^3.0.4",
-    "socket.io-client": "^2.2.0"
+    "signalr": "^2.4.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
@@ -30,6 +33,7 @@
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
+    "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.3.2",

src/components/index.vue

@@ -78,7 +78,6 @@ export default {
 }
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 @import "../assets/css/index.css";
 </style>

src/components/pageNav.vue

@@ -103,6 +103,10 @@ export default {
     },
     goPage: function (obj) {
       this.MsgBus.$emit('inceptMessage', '666')
+      if (obj.Name === '签到') {
+        window.open('http://activity.oytour.com/html/SignIn/signin.html')
+        return
+      }
       if (!obj.children.length && this.$route.name !== obj.Url) {
         this.$router.push({
           name: obj.Url