eric/gitlab-instance-0a899031_nomadcna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/1.0.0' of http://gitlab.yidooplanet.com/gitlab-instance-0a899031/nomadcna into dev/1.0.0

Browse Source 
# Conflicts:
#	src/index.html
This commit is contained in:
WLT\Eric.hu
2025-03-31 16:51:56 +08:00
parent da4363b701 6c38c98d6c
commit be460ff157
3 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/index.html
View File

@@ -62,4 +62,53 @@
<div id="app"></div> <div id="app"></div>
</body> </body>
</html> </html>
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);
(function () {
var u = "//matomo.digitalnomadchina.com/";
_paq.push(["setTrackerUrl", u + "matomo.php"]);
_paq.push(["setSiteId", "1"]);
var d = document,
g = d.createElement("script"),
s = d.getElementsByTagName("script")[0];
g.async = true;
g.src = u + "matomo.js";
s.parentNode.insertBefore(g, s);
})();
</script>
<!-- End Matomo Code -->
<!-- Google Tag Manager -->
<script>
(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({ "gtm.start": new Date().getTime(), event: "gtm.js" });
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s),
dl = l != "dataLayer" ? "&l=" + l : "";
j.async = true;
j.src = "https://www.googletagmanager.com/gtm.js?id=" + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, "script", "dataLayer", "GTM-M9PR3MVC");
</script>
<!-- 谷歌adsense -->
<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-8461145959530971"
crossorigin="anonymous"></script>
<!-- End Google Tag Manager -->
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript
><iframe
src="https://www.googletagmanager.com/ns.html?id=GTM-M9PR3MVC"
height="0"
width="0"
style="display: none; visibility: hidden"
></iframe
></noscript>
<!-- End Google Tag Manager (noscript) -->
<div id="app"></div>
</body>
</html>

4
src/pages/index/index.jsx
View File

@@ -289,7 +289,7 @@ const Index = () => {
<br /> <br />
🌎追踪你的旅行，记录你去过的地方 🌎追踪你的旅行，记录你去过的地方
<br /> <br />
💬加入微信群，在旅途中找到你的社区 💬加入社群，在旅途中找到你的社区
{!!mobile ? ( {!!mobile ? (
<View className="upjonNomad"> <View className="upjonNomad">
<AtButton <AtButton
@@ -326,7 +326,7 @@ const Index = () => {
onClick={() => { onClick={() => {
setqrOpen(true); setqrOpen(true);
}} }}
>{`加入微信群💬`}</AtButton> >{`加入社群💬`}</AtButton>
</View> </View>
</View> </View>
</View> </View>

7
src/pages/index/index.scss
View File

@@ -123,6 +123,8 @@
} }
} }
} }
.items { .items {
height: 100%; height: 100%;
padding: 20px; padding: 20px;
@@ -135,7 +137,7 @@
gap: 30px; /* 设置元素之间的间隔 */ gap: 30px; /* 设置元素之间的间隔 */
// padding-left: 10px; /* 确保两侧固定边距 */ // padding-left: 10px; /* 确保两侧固定边距 */
// padding-right: 10px; // padding-right: 10px;
// background-color: aqua; background-color: aqua;
.item:hover { .item:hover {
animation: pulse 0.6s ease; animation: pulse 0.6s ease;
@@ -144,7 +146,9 @@
.item { .item {
flex-grow: 1; /* 自动增长填充空间 */ flex-grow: 1; /* 自动增长填充空间 */
flex-basis: 260px; /* 基本宽度为 300px，元素数量随可用空间调整 */ flex-basis: 260px; /* 基本宽度为 300px，元素数量随可用空间调整 */
// flex: 1 1 260px; /* 自动增长并设置基础宽度为 260px，确保元素均匀分布 */
max-width: 330px; /* 设置最大宽度 */ max-width: 330px; /* 设置最大宽度 */
// max-width: 280px; /* 设置最大宽度 */
// width: 100%; /* 确保可以响应式变化 */ // width: 100%; /* 确保可以响应式变化 */
height: 280px; height: 280px;
// background-color: yellow; // background-color: yellow;
@@ -169,7 +173,6 @@
z-index: 1; z-index: 1;
width: 100%; width: 100%;
height: 20px; height: 20px;
// background-color: burlywood;
position: absolute; position: absolute;
top: 0px; top: 0px;
.itemUpleft { .itemUpleft {