Merge branch 'main' into feat-full

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 程序员小墨
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,13 +1,39 @@
-# 通信行程卡 适配 Chrome Android 顶栏颜色版
+# 通信行程卡纪念版 H5
+
+仓库地址：[GitHub](https://github.com/coder-xiaomo/travel-card) [Gitee](https://gitee.com/coder-xiaomo/travel-card)
+
+演示地址：https://coder-xiaomo.gitee.io/travel-card/
+
+<div align=center><img src="docs/Screenshot.jpg" width="300px" /></div>
+
+
+
+## 更多版本
+
+感谢大家提的Pr，由于功能差异无法合并到同一分支，所以合并到不同分支中了，大家可以前往以下分支查看：
+
+### [feat-color](https://gitee.com/coder-xiaomo/travel-card/tree/feat-color/): 黄、红卡及彩蛋卡版
+
+> [@小林囝](https://gitee.com/teochew)提交的[Pull Request](https://gitee.com/coder-xiaomo/travel-card/pulls/1)
+
+**演示地址：https://coder-xiaomo.gitee.io/travel-card/feat-color**
+
+<div align=center><img src="docs/Screenshot-feat-color.jpg" width="300px" /></div>
+
+
+
+### [feat-optimize](https://gitee.com/coder-xiaomo/travel-card/tree/feat-optimize/): 优化页面结构，更像原版，添加标题字体等
+
+> [@呱行次比猫](https://space.bilibili.com/38238808)提交的[Pull Request](https://gitee.com/coder-xiaomo/travel-card/pulls/3)
+
+**演示地址：https://coder-xiaomo.gitee.io/travel-card/feat-optimize**
+
+<div align=center><img src="docs/Screenshot-feat-optimize.jpg" width="300px" /></div>
+
+
+
+## 一些说明
 
 **注意：本项目仅作纪念，无实际意义，不得用于防疫等相关场景**
 
-本项目由 程序员小墨 制作并开源，当前分支由[Magicst_Magoo](https://github.com/MagicstMagoo)基于 feat-color 分支修改提交
-
-# 通信行程卡 之 优化版
-
-> 优化说明：优化页面结构，更像原版，添加标题字体等
-
-**注意：本项目仅作纪念，无实际意义，不得用于防疫等相关场景**
-
-本项目由 程序员小墨 制作并开源，当前分支由[@呱行次比猫](https://space.bilibili.com/38238808)基于 main 分支修改而来
+欢迎关注我的[B站](https://space.bilibili.com/457109942)和公众号（ID：程序员小墨）