Skip to content

Commit

Permalink
Update homepage and demo page domains
Browse files Browse the repository at this point in the history
  • Loading branch information
hifocus committed Apr 27, 2024
1 parent eb237f7 commit b9a7b0c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 31 deletions.
22 changes: 11 additions & 11 deletions README-CN.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<p align="center">
<a href="https://merger.qrcdn.com">
<a href="https://merger.huangxin.org">
<img alt="merger" src="https://ae01.alicdn.com/kf/HTB1M9ondUKF3KVjSZFE760ExFXae.png" height="75">
</a>
</p>

<p align="center">
<a href="https://demo.qrcdn.com">demo.qrcdn.com</a>
<a href="https://qr.huangxin.org">demo.qrcdn.com</a>
<br>
轻量,集成的二维码支付界面
</p>
Expand All @@ -22,7 +22,7 @@
<a href="https://www.jsdelivr.com/package/gh/qr-merger/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/qr-merger/merger/badge"/></a>
</p>

[这里](https://github.com/qr-merger/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.qrcdn.com/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9)
[这里](https://github.com/qr-merger/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.huangxin.org/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9)

## 特性

Expand All @@ -35,16 +35,16 @@

## 相关链接

- [说明文档](https://merger.qrcdn.com/cn/categories/docs/)
- [概述](https://merger.qrcdn.com/docs/introduction)
- [安装](https://merger.qrcdn.com/docs/install)
- [配置](https://merger.qrcdn.com/docs/configure)
- [部署](https://merger.qrcdn.com/docs/deploy)
- [演示站点](https://demo.qrcdn.com)
- [其他演示站点](https://merger.qrcdn.com/cn/docs/introduction#%E5%85%B6%E4%BB%96%E6%BC%94%E7%A4%BA%E7%AB%99%E7%82%B9)
- [说明文档](https://merger.huangxin.org/cn/categories/docs/)
- [概述](https://merger.huangxin.org/docs/introduction)
- [安装](https://merger.huangxin.org/docs/install)
- [配置](https://merger.huangxin.org/docs/configure)
- [部署](https://merger.huangxin.org/docs/deploy)
- [演示站点](https://qr.huangxin.org)
- [其他演示站点](https://merger.huangxin.org/cn/docs/introduction#%E5%85%B6%E4%BB%96%E6%BC%94%E7%A4%BA%E7%AB%99%E7%82%B9)
- [提交问题](https://github.com/qr-merger/merger/issues)
- [合并请求](https://github.com/qr-merger/merger/pulls)
- [感谢](https://merger.qrcdn.com/cn/docs/introduction#%E6%84%9F%E8%B0%A2)
- [感谢](https://merger.huangxin.org/cn/docs/introduction#%E6%84%9F%E8%B0%A2)

## 开源许可证

Expand Down
21 changes: 4 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<p align="center">
<a href="https://merger.qrcdn.com">
<img alt="merger" src="https://ae01.alicdn.com/kf/HTB1M9ondUKF3KVjSZFE760ExFXae.png" height="75">
<a href="https://merger.huangxin.org">
<img alt="merger" src="https://edge.huangxin.org/images/2024/04/404313540.png" height="75">
</a>
</p>

<p align="center">
<a href="https://demo.qrcdn.com">demo.qrcdn.com</a>
<a href="https://qr.huangxin.org">demo.qrcdn.com</a>
<br>
Lightweight, Integrated QR Code Payment Interface<br>轻量,集成的二维码支付界面
</p>
Expand All @@ -22,7 +22,7 @@ Language: <strong>English</strong> / <a href="./README-CN.md">Chinese 中文</a>
<a href="https://www.jsdelivr.com/package/gh/qr-merger/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/qr-merger/merger/badge"/></a>
</p>

Submit your merger site [here](https://github.com/qr-merger/merger/issues/4) for [presentation](https://merger.qrcdn.com/#/en-gb/?id=other-demo-sites)
Submit your merger site [here](https://github.com/qr-merger/merger/issues/4) for [presentation](https://merger.huangxin.org/#/en-gb/?id=other-demo-sites)

This project is sponsored by <a target="_blank" href="https://www.cloudflare.com"><img src="https://vip2.loli.io/2023/06/15/leUw2vnXKZRTcLE.png" height="30px"></a>

Expand All @@ -35,19 +35,6 @@ This project is sponsored by <a target="_blank" href="https://www.cloudflare.com
- In-depth user experience considerations; by thinking thoughtfully and having the passion to always keep UX as the first priority, you and your users' experiences when configuring / using merger could only be described as 'shift'.
- The use of public CDN on static files (where applicable) will speed-up the loading.

## Relevant Links

- [Docs](https://merger.qrcdn.com/categories/docs/)
- [Instroduction](https://merger.qrcdn.com/docs/introduction)
- [Installation](https://merger.qrcdn.com/docs/install)
- [Configuration](https://merger.qrcdn.com/docs/configure)
- [Deployment](https://merger.qrcdn.com/docs/deploy)
- [Live Demo](https://demo.qrcdn.com)
- [Demo From Users](https://merger.qrcdn.com/docs/introduction#Demo-From-Users)
- [Issues](https://github.com/qr-merger/merger/issues)
- [Pull Requests](https://github.com/qr-merger/merger/pulls)
- [Credit](https://merger.qrcdn.com/docs/introduction#Credit)

## License

[GNU General Public License v3.0](https://github.com/qr-merger/merger/blob/master/LICENSE)
2 changes: 1 addition & 1 deletion assets/js/function.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Merger - Merge Your Qrcode Together. Even Quicker.
// User docs: https://merger.qrcdn.com
// User docs: https://merger.huangxin.org
// Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
// Copyright reservation is required.
Expand Down
2 changes: 1 addition & 1 deletion assets/styles/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Merger - Merge Your Qrcode Together. Even Quicker.
User docs: https://merger.qrcdn.com
User docs: https://merger.huangxin.org
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Copyright reservation is required.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"bugs": {
"url": "https://github.com/qr-merger/merger/issues"
},
"homepage": "https://qrcdn.com",
"homepage": "https://merger.huangxin.org",
"dependencies": {
"jquery": "^3.7.0"
},
Expand Down

0 comments on commit b9a7b0c

Please sign in to comment.