From 1d5d2bcb3f2c5bea7a54ecec42f8e529859b7247 Mon Sep 17 00:00:00 2001 From: cebgcontract <99630598+cebgcontract@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/comp/desktopNav.html | 33 ++++- src/desktop/ambassadorinfo.html | 81 +++++++++-- src/desktop/ambassadors.html | 131 ++++++------------ src/desktop/css/main.css | 36 ++++- .../{commander_form.html => join.html} | 102 +++++++++++++- src/desktop/js/main.js | 31 ++++- src/desktop/recruit.html | 3 +- 7 files changed, 304 insertions(+), 113 deletions(-) rename src/desktop/{commander_form.html => join.html} (55%) diff --git a/src/comp/desktopNav.html b/src/comp/desktopNav.html index 1a22431..43f9d7c 100644 --- a/src/comp/desktopNav.html +++ b/src/comp/desktopNav.html @@ -3,12 +3,33 @@ diff --git a/src/desktop/ambassadorinfo.html b/src/desktop/ambassadorinfo.html index 864c780..dfc92bd 100644 --- a/src/desktop/ambassadorinfo.html +++ b/src/desktop/ambassadorinfo.html @@ -17,31 +17,31 @@
- +
-

0x123456........445855

+

0x123456........445855

-

Kawabonga123@gmail.com

+

Kawabonga123@gmail.com

-

Kawabonga

+

Kawabonga

-

Japan

+

Japan

-

9，999，999

+

9，999，999

-
+
He didn't write anything
@@ -58,9 +58,27 @@ <%- include('../comp/walletModal.html') %> <%- include('../comp/jslib.html') %> diff --git a/src/desktop/ambassadors.html b/src/desktop/ambassadors.html index 1922272..cc83066 100644 --- a/src/desktop/ambassadors.html +++ b/src/desktop/ambassadors.html @@ -15,87 +15,18 @@
-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
-
- -

- Kawabonga - Japan - 1023 -

-
+
+ + + +

+ Kawabonga + Japan + 1023 +

+
+
+
@@ -103,14 +34,40 @@ <%- include('../comp/walletModal.html') %> <%- include('../comp/jslib.html') %> - diff --git a/src/desktop/css/main.css b/src/desktop/css/main.css index f7068ab..9b90c42 100755 --- a/src/desktop/css/main.css +++ b/src/desktop/css/main.css @@ -77,6 +77,38 @@ body { .nav a:hover::after { height: 118px; } +.nav .main{ + flex-wrap: nowrap; + display: flex; +} +.dropdown{ + position: relative; +} +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + padding: 5px 0; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #0000005d; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgb(0 0 0 / 18%); + box-shadow: 0 6px 12px rgb(0 0 0 / 18%); + flex-wrap: wrap!important; +} +.open .dropdown-menu { + display: flex; +} + .market { margin-top: 44px; @@ -1127,7 +1159,7 @@ span.swiper-pagination-bullet { padding-top: 60px; } -.apply-from input[type='submit'] { +.apply-from .submit{ background: #fed235; color: #000; width: 274px; @@ -1140,6 +1172,7 @@ span.swiper-pagination-bullet { border-radius: 37px; font-weight: bold; cursor: pointer; + padding: 25px 50px; } .apply-from label.error { @@ -1167,7 +1200,6 @@ span.swiper-pagination-bullet { } .amb-scroll{ position: relative; - height: 800px; overflow: hidden; width: 1290px; margin: 0 auto; diff --git a/src/desktop/commander_form.html b/src/desktop/join.html similarity index 55% rename from src/desktop/commander_form.html rename to src/desktop/join.html index 9c75a38..66c8da9 100644 --- a/src/desktop/commander_form.html +++ b/src/desktop/join.html @@ -47,7 +47,7 @@

- + Send

@@ -64,8 +64,14 @@ %> diff --git a/src/desktop/js/main.js b/src/desktop/js/main.js index bc5bf23..3bfc8b0 100644 --- a/src/desktop/js/main.js +++ b/src/desktop/js/main.js @@ -10,6 +10,7 @@ var jcchain = require("./jcchain.js"); })(jQuery); var chain = new jcchain.JCChain(); +window.chain = chain; var toggleLoginBtn = function () { if (chain.logined) { $("#header_loginbtn").hide(); @@ -23,15 +24,23 @@ toggleLoginBtn(); var logSuccess = function () { console.log("login success"); console.log(chain); + window.logincb && window.logincb(); + window.logincb = undefined; toggleLoginBtn(); + window.onChainLogined && window.onChainLogined(); +}; +window.chainLogin = function (cb) { + window.logincb = cb; + chain.login().then(logSuccess.bind(window)); }; $("#header_loginbtn").click(function () { - chain.login().then(logSuccess.bind(this)); + window.chainLogin(); }); $("#header_logoutbtn").click(function () { chain.logout().then(() => { toggleLoginBtn(); + window.onChainLoginOut && window.onChainLoginOut(); }); }); jcchain.EventBus.$on(jcchain.SHOW_CHAIN_MODAL, function () { @@ -39,13 +48,26 @@ jcchain.EventBus.$on(jcchain.SHOW_CHAIN_MODAL, function () { $("#wallet_modal").show(); }); $("#metamask_card").click(function () { - chain.selectWalletAndLogin(1).then(logSuccess.bind(this)); + chain.selectWalletAndLogin(1).then(logSuccess.bind(window)); $("#wallet_modal").hide(); }); $("#wc_card").click(function () { - chain.selectWalletAndLogin(2).then(logSuccess.bind(this)); + chain.selectWalletAndLogin(2).then(logSuccess.bind(window)); $("#wallet_modal").hide(); }); +$(window).click(function () { + if ($(".dropdown").hasClass("open")) { + $(".dropdown").removeClass("open"); + } +}); +$(".dropdown-toggle").click(function (event) { + event.stopPropagation(); + if (!$(this).parent().hasClass("open")) { + $(this).parent().addClass("open"); + } else { + $(this).parent().removeClass("open"); + } +}); $(".comingSoon").click(function () { $.message({ type: "default", content: "Coming Soon." }); @@ -53,3 +75,6 @@ $(".comingSoon").click(function () { if (window.cur) { $(`#nav_${cur}`).addClass("cur"); } +if (window.sub) { + $(`#sub_${sub}`).addClass("cur"); +} diff --git a/src/desktop/recruit.html b/src/desktop/recruit.html index ede628e..ef517c8 100644 --- a/src/desktop/recruit.html +++ b/src/desktop/recruit.html @@ -11,6 +11,7 @@
+ <%- include('../comp/desktopNav.html') %>
@@ -18,7 +19,7 @@
- +