Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+package-lock.json
 
 # local env files
 .env.local
@@ -18,4 +19,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
-.history
+.history

src/views/newlogin.vue

@@ -29,7 +29,6 @@ export default {
   },
   created() {},
   methods: {
-    // ...mapSite(['showInfo', 'toGetUser']),
     ...mapMarket({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
     ...login({ toLogin: 'login' }),
     ...expertsuser({ expertsuserCreate: 'create' }),