push to moguyn/master after merging

vuex_demo1/src/components/box.vue

@@ -1,20 +1,24 @@
 <template>
     <div>
-        这是box组件，测试,test
+        <div>这是box组件，测试,test</div>
+        <button @click="divide(2)">除2</button>
+        <div>count的值为：{{count}}</div>
     </div>
 </template>
 
 <script>
-
+import {mapState} from 'vuex'
 export default {
     data(){
         return{ }
     },
     methods:{
-
+        divide(num){
+            this.$store.commit('divide',num)
+        }
     },
     computed:{
-
+        ...mapState(['count'])
     }
 }
 </script>

vuex_demo1/src/store/index.js

@@ -35,6 +35,9 @@ export default new Vuex.Store({
     },
     xc(state,step){
       state.count=state.count * step
+    },
+    divide(state,num){
+      state.count = state.count / num
     }
   },
   actions: {

vuex_demo1/test.txt

@@ -1,2 +1,5 @@
 测试远程dev分支
 主分支修改
+测试合并
+update dev
+