Merge c5517784a50ccc23f2f602fb94d4bf3b9993f17e into 6858a9ad67483025f6a9432a926beb9327037be3

c

@@ -0,0 +1,17 @@
+  origin/CodeSandbox
+  origin/HEAD -> origin/master
+  origin/aisen60
+  origin/check-engine
+  origin/chore/update
+  origin/deploy
+  origin/gh-pages
+  origin/i18n
+  origin/master
+  origin/perf/getInfo
+  origin/perf/keep-alive
+  origin/pwa
+  origin/refactor/copy
+  origin/refactor/tinymce4.7.6
+  origin/tag/3.11.0
+  origin/tinymce-action
+  origin/webpack3

src/store/index.js

@@ -21,5 +21,5 @@ const store = new Vuex.Store({
   modules,
   getters
 })
-
+// 测试
 export default store

src/views/login/index.vue

@@ -10,6 +10,8 @@
         <span class="svg-container">
           <svg-icon icon-class="user" />
         </span>
+        <!--ref获取本页面dom元素-->
+        <!--v-model双向数据绑定-->
         <el-input
           ref="username"
           v-model="loginForm.username"