修改登录弹窗位置、分享文案、金币卡详情也显示

index.html

@@ -8,11 +8,11 @@
     <meta property="og:title" content="Counter Fire" />
     <meta
       property="og:description"
-      content="P2E Season 1 is set to launch with a bang! Gear up, warriors,CounterFire is heating up."
+      content="Public Beta is set to launch with a bang! Gear up, warriors,CounterFire is heating up."
     />
     <meta
       name="description"
-      content="P2E Season 1 is set to launch with a bang! Gear up, warriors,CounterFire is heating up."
+      content="Public Beta is set to launch with a bang! Gear up, warriors,CounterFire is heating up."
     />
     <meta
       name="keywords"

src/components/about/AboutFooter.vue

@@ -9,7 +9,7 @@
       <div class="whitepaper">
         <div class="title">Whitepaper</div>
         <div class="slogan">
-          <a href="https://contact-63.gitbook.io/CEBG-whitepaper/"
+          <a href="https://counterfire-whitepaper.gitbook.io/counterfire-whitepaper" target="_blank"
             >Learn more about our studio mission >></a
           >
         </div>

src/components/chain/BlockChain.js

@@ -338,6 +338,30 @@ export class BlockChain {
     }
     return { provider, address: accounts[0] };
   }
+  
+  async claimAddress({title, subTitle, targetChainId}) {
+    const initData = {}
+    initData[this.store.walletType] = this.store.address
+    const rewardModal = createModal(WalletSelectModel, {
+      title: title || 'Select Address',
+      message: subTitle || 'Please select the address you want to use',
+      subTitle: subTitle,
+      initData: { 1: 'MetaMask', 2: 'OKX Wallet', 3: 'Passport' },
+      disabled: [5,3]
+    });
+    const { errcode, errmsg, walletInstance, provider, accounts } = await rewardModal.show();
+    if (errcode) {
+      console.log(`select address result : ${errmsg}`);
+      throw new Error(errmsg);
+    }
+    targetChainId = targetChainId || cfgChainId;
+    let chainId = await walletInstance.getChainId();
+    if (chainId !== targetChainId) {
+      console.log(`current chain: ${chainId}, want: ${targetChainId}`)
+      chainId = await switchEthereumChain(provider.provider, targetChainId);
+    }
+    return { provider, address: accounts[0] };
+  }
 
   /**
    * CEC Claim登录

src/components/chain/ClaimSelectModel.vue

@@ -66,7 +66,6 @@ const props = defineProps({
 });
 
 const currentDatas = computed(() => {
-  // debugger
   let list = ALL_PROVIDERS.map((item) => {
     const Provider = allProviders[item.id];
     // console.log(Provider)
@@ -175,10 +174,13 @@ function hideModal(result = null) {
     background-color: #2d2738;
     border-radius: 40px;
     color: white;
-    margin: auto;
+    // margin: auto;
     display: flex;
     position: relative;
-    margin-top: 15vh;
+    right: -100%;
+    transform: translateX(-481px);
+    // margin-top: 15vh;
+    margin-top: 84px;
     flex-direction: column;
     .mobile {
       width: 100vw;
@@ -263,7 +265,7 @@ function hideModal(result = null) {
         .fire-wallet {
           position: absolute;
           top: 0;
-          right: -260px;
+          left: -260px;
           width: 256px;
           // height: 100%;
           // border-radius: .41667vw;

src/components/chain/WalletSelectModel.vue

@@ -152,10 +152,13 @@ function hideModal(result = null) {
     background-color: #2d2738;
     border-radius: 40px;
     color: white;
-    margin: auto;
+    // margin: auto;
     display: flex;
     position: relative;
-    margin-top: 15vh;
+    right: -100%;
+    transform: translateX(-481px);
+    // margin-top: 15vh;
+    margin-top: 84px;
     flex-direction: column;
     .mobile {
       width: 100vw;

src/utils/marketplace.js

@@ -117,8 +117,6 @@ export const nftDetail = async(address, tokenId) => {
 export const apiCecInfoAll = async(address,token) => {
   let url = `${API_UAW}/api/cec/info_all/${address}`
   return httpGet(url)
-  // let url = await axios.get(`${API_UAW}/api/cec/claim`)
-  // return httpPost(url,{address},token)
 }
 
 // CEC  Claim 查询
@@ -127,6 +125,12 @@ export const apiCecInfo = async(address,token) => {
   return httpGet(url)
 }
 
+// CEC Claim 领取
+export const apiCecClaim = async(address,token) => {
+  let url = `${API_UAW}/api/cec/claim`
+  return httpPost(url,address,token)
+}
+
 // 绑定交易所账号
 export const apiBindAccount = async(data, token) => {
   let url = `${API_UAW}/api/cec/bind_account`

src/views/ClaimView.vue

@@ -173,6 +173,7 @@
                 <span>Claim to your wallet</span>
               </div>
               <div class="right">
+                <!-- <div class="right claim-btn" @click="cecClaim"> -->
                 <span>Coming soon</span>
               </div>
             </li>
@@ -209,11 +210,21 @@
           <div class="content-body-box">
             <!-- 3 -->
             <div v-if="cecUserStatus == 3">
-              <div class="body-box-title">
+              <div class="body-box-title padding-top">
                 <h3><span>{{Number(cecInfo.available) == 0 ? 0 : priceCalculated(cecInfo.available,18).toString().match(/^\d+(?:\.\d{0,2})?/)[0]}}</span> $CEC deposit to Bitget in progress</h3>
               </div>
-              <div class="body-box-con">
+              <div class="body-box-con margin-top-20">
-                <p>You'll receive your $CEC airdrop in Bitget spot account before the listing time</p>
+                <p>Well done! You're all set!</p>
+              </div>
+              <div class="body-box-con margin-20">
+                <p>You'll receive your $CEC airdrop in Bitget spot account before the listing time.</p>
+              </div>
+              
+              <!-- <div class="body-box-btn margin-top-20">
+                <p class="center"></p>
+              </div> -->
+              <div class="body-box-btn margin-top">
+                <p class="center">Jump to<a href="https://www.bitget.com/support/articles/12560603814979?utmSource=Twitter_CEC" target="_blank"> Bitget Launchpool</a> and grab your share of 11M $CEC now!</p>
               </div>
               <div class="body-box-btn">
                 <p><a @click="cecUserStatus = 4">Cancel the Pre-Deposit to Bitget</a></p>
@@ -262,7 +273,7 @@
                   <span>{{ cecInfo.bindAddress }}</span>
                 </li>
                 <li>
-                  <div>You may lose your tokens if this UID Wallet Address are incorrect blocked or doesn't exist </div>
+                  <div class="font-size-14">You may not receive your airdrop in Bitget if your UID, deposit address is not correct or doesn't exist</div>
                 </li>
                 <li>
                   <h6>KYC passed only</h6>
@@ -340,7 +351,7 @@ import { priceCalculated } from "@/configs/priceCalculate"
 import {walletStore} from "@/store/wallet";
 import { useMarketplaceStore } from "@/store/marketplace"
 import { BlockChain } from "@/components/chain/BlockChain"
-import { apiCecInfoAll, apiBindAccount } from "@/utils/marketplace"
+import { apiCecInfoAll, apiBindAccount, apiCecClaim } from "@/utils/marketplace"
 
 
 const localWalletStore = walletStore()
@@ -460,6 +471,16 @@ const reqGetInfo = async () => {
   getCecTotal()
 }
 
+// 领取
+const cecClaim = async () => {
+  let res = await new BlockChain().claimAddress({})
+  console.log(res.address)
+  // let walletToken = await new BlockChain().token()
+  // let token = marketplaceStore.fireToken || walletToken
+  // let res1 = await apiCecClaim(res.address, token)
+  // console.log(res1)
+}
+
 onMounted(() => {
   address.value = marketplaceStore.fireAddress || localWalletStore.address
   getCecTotal()
@@ -933,6 +954,15 @@ onMounted(() => {
               width: 283px;
               text-align: left;
             }
+            .claim-btn {
+              span {
+                color: #fff;
+                padding: 10px;
+                border: 1px solid #31FFF3;
+                border-radius: 20px;
+                cursor: pointer;
+              }
+            }
           }
         }
       }
@@ -1070,6 +1100,11 @@ onMounted(() => {
               margin: 0 40px;
             }
           }
+          .padding-top {
+            h3 {
+              padding-top: 10px;
+            }
+          }
           .body-box-con {
             p {
               width: 747px;
@@ -1170,6 +1205,9 @@ onMounted(() => {
                   margin-left: 40px;
                 }
               }
+              .font-size-14 {
+                font-size: 15px;
+              }
               &:nth-child(3) {
                 // margin-top: 10px;
               }
@@ -1244,6 +1282,31 @@ onMounted(() => {
                 cursor: pointer;
               }
             }
+            
+            .center {
+              text-align: center;
+              color: #fff;
+              a {
+                margin-top: 20px !important;
+                color: #00f0ff;
+              }
+            }
+          }
+          .margin-top-20 {
+            margin-top: 20px;
+            p {
+              margin: -0px auto !important;
+            }
+          }
+          .margin-20 {
+            margin-top: 10px;
+            margin-bottom: 30px;
+            p {
+              margin: -0px auto !important;
+            }
+          }
+          .margin-top {
+            margin-top: 10px !important;
           }
           .body-box-find {
             p {

src/views/DetailView.vue

@@ -1248,7 +1248,8 @@ onMounted(() => {
           }
         }
         .gold-content {
-          width: 455px;
+          // width: 455px;
+          width: 321px;
           height: 84px;
           background: #2d2738;
           border-radius: 20px;