Commit 648da4f0 by 陈英杰

合并分支 'dev' 到 'master'

Dev



查看合并请求 !78
parents f84d5134 be5335e2
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</div> </div>
<keep-alive> <keep-alive>
<transition-group :name="showAni ? 'fade' : 'left'"> <transition-group :name="showAni ? 'fade' : 'left'">
<emoji-box v-show="showEmoji" v-model="content" :key="1"></emoji-box> <emoji-box v-if="showEmoji" v-model="content" :key="1"></emoji-box>
<more-box v-show="showMore" :key="2"></more-box> <more-box v-if="showMore" :key="2"></more-box>
</transition-group> </transition-group>
</keep-alive> </keep-alive>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment