From ff901ef6ea7628e0a3bcfabc0753d8b6d569eaeb Mon Sep 17 00:00:00 2001
From: tntest <tntest@gmail.com>
Date: Wed, 8 Jun 2022 10:07:34 +0800
Subject: [PATCH 1/2] test branch modify

---
 vuex_demo1/test.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt
index 908bb81..5ba6579 100644
--- a/vuex_demo1/test.txt
+++ b/vuex_demo1/test.txt
@@ -1 +1,2 @@
 测试远程dev分支
+测试合并

From 1b5f17423d3172d3ebdf3fc540b441b722f5a425 Mon Sep 17 00:00:00 2001
From: Miku-he <1319265705@qq.com>
Date: Wed, 8 Jun 2022 10:44:18 +0800
Subject: [PATCH 2/2] update dev's content

---
 vuex_demo1/src/components/box.vue | 12 ++++++++----
 vuex_demo1/src/store/index.js     |  3 +++
 vuex_demo1/test.txt               |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/vuex_demo1/src/components/box.vue b/vuex_demo1/src/components/box.vue
index dac1239..e43455d 100644
--- a/vuex_demo1/src/components/box.vue
+++ b/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>
\ No newline at end of file
diff --git a/vuex_demo1/src/store/index.js b/vuex_demo1/src/store/index.js
index cec66d8..972f067 100644
--- a/vuex_demo1/src/store/index.js
+++ b/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: {
diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt
index 5ba6579..b719f1e 100644
--- a/vuex_demo1/test.txt
+++ b/vuex_demo1/test.txt
@@ -1,2 +1,3 @@
 测试远程dev分支
 测试合并
+update dev