Merge branch 'master' of http://192.168.0.115:3000/renyicun/NanjingMuseumWuJinZang

src/components/BtnClickMe.vue

@@ -73,7 +73,7 @@ const isShow = computed(() => {
   align-items: center;
   >.text{
     color: v-bind('color');
-    margin-right: calc(10 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    margin-right: calc(5 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     font-family: KaiTi, KaiTi;
     font-weight: 400;
     font-size: calc(20 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
@@ -83,10 +83,10 @@ const isShow = computed(() => {
     height: calc(30 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
   }
   .animation-show-hide-half {
-    animation: show-hide 1.5s infinite;
+    animation: show-hide-half 1.5s infinite;
   }
 }
-@keyframes show-hide {
+@keyframes show-hide-half {
     0% {
       opacity: 0.4;
     }