Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

.gitignore

@@ -19,3 +19,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+.history

src/store/index.js

@@ -9,7 +9,7 @@ export default new Vuex.Store({
     leave,
     attendance,
   },
-  state: {},
-  mutations: {},
-  actions: {},
+  state: {}, //变量
+  mutations: {}, //同步方法
+  actions: {}, //异步操作
 });

src/views/question/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div id="index">
-    <p>index</p>
+    <van-tabbar v-model="active">
+      <van-tabbar-item info="3">
+        <span>自定义</span>
+        <img slot="icon" slot-scope="props" :src="props.active ? icon.active : icon.inactive" />
+      </van-tabbar-item>
+      <van-tabbar-item icon="search">标签</van-tabbar-item>
+      <van-tabbar-item icon="setting-o">标签</van-tabbar-item>
+    </van-tabbar>
   </div>
 </template>