cec claim

src/components/assets/assetsHeader.vue

@@ -558,11 +558,9 @@ const cecInfo = ref({
   ]
 })
 const getCecInfo = async () => {
-  // let address = localWalletStore.address
-  let address = '0x6f3e6e1d02a66a31c159aef2d9e8691863786c20'
+  let address = localWalletStore.address
   if(address) {
     const {data, errcode} = await apiCecInfo(address,localWalletStore.token)
-  // console.log(errcode,data)
     if(errcode == 0) {
       cecInfo.value = data
     }

src/components/chain/ClaimSelectModel.vue

@@ -121,7 +121,6 @@ async function cardClicked(id) {
 
 const walletTake = import.meta.env.VUE_APP_WALLET_TAKE
 const googleLogin = async () => {
-  // return
   let res = await callMethod("walletLogin", "0", walletTake);
   res = JSON.parse(res);
   marketplaceStore.fireAddress = res.data.address
@@ -138,7 +137,10 @@ const googleLogin = async () => {
 }
 const appleLogin = async () => {
   let res = await callMethod("walletLogin", "1", walletTake);
-    res = JSON.parse(res);
+  res = JSON.parse(res);
+  marketplaceStore.fireAddress = res.data.address
+  marketplaceStore.fireToken = res.data.token + '.cf'
+  hideModal({errcode: 0})
 }
 
 function cancelSelect() {

src/components/layout/NavBar.vue

@@ -45,7 +45,7 @@
             <span v-else>0</span>
           </div>
         </div>
-        <div class="metaMask-login" v-if="!localWalletStore.address" @click="immuTableLogin">Login1</div>
+        <div class="metaMask-login" v-if="!localWalletStore.address" @click="immuTableLogin">Login</div>
         <div class="metaMask-login-active" v-else @click="showMenu = !showMenu">
           <div class="metamask">
             <div class="title">{{ localWalletStore.showAddress }}</div>
@@ -271,7 +271,7 @@ function openThirdPartyLink(url) {
 }
 const handleCopy = (e) => {
   e.stopPropagation();
-  const accountId = localWalletStore.address;
+  const accountId = localWalletStore.address || marketplaceStore.fireAddress
   reset();
   copyToClipboard(accountId).then(() => {
     if (copied.value) {

src/views/ClaimView.vue

@@ -96,7 +96,7 @@
         <div class="content-body">
           <div class="content-body-header">
             <div class="content-body-header-left">
-              Grab a share of $100,000 $CEC
+              <span v-if="cecUserStatus == 0">Grab a share of $100,000 $CEC</span>
             </div>
             <div class="content-body-header-right">
               Aug 30, 18:00 - Sep 3, 18:00
@@ -185,8 +185,8 @@
             <!-- 1 绑定交易所 -->
             <div v-if="cecUserStatus == 1">
               <div class="body-box-title">
-                <p>Submit you $CEC Bitget exchange deposit address and Bitget exchange UID</p>
-                <p>to receive the #CEC airdrop</p>
+                <p>Submit you $CEC Bitget exchange deposit address and Bitget exchange UIDto receive the #CEC airdrop</p>
+                <!-- <p>to receive the #CEC airdrop</p> -->
               </div>
               <div class="body-box-con">
                 <div class="uid">
@@ -295,9 +295,8 @@ const bindAccount = async (type) => {
     }
     let res = await apiBindAccount(data, token)
     if(res.errcode == 15) {
-      message.error(res.errmsg)
     } else if(res.errcode == 0) {
-      message.success('Bind successful')
+      cecUserStatus.value = 2
     }
   } else if(type == 'cancel') {
     const data = {
@@ -306,8 +305,7 @@ const bindAccount = async (type) => {
       }
       let res = await apiBindAccount(data, token)
       if(res.errcode == 0) {
-        message.success('Cancellation successful')
-      cecUserStatus.value = 5
+        cecUserStatus.value = 5
       }
   }
 }
@@ -377,8 +375,9 @@ onMounted(() => {
       .claim-content-data-right {
         .unavailable {
           position: relative;
-          width: 180px;
+          min-width: 180px;
           height: 39px;
+          padding: 0 10px;
           display: flex;
           justify-content: center;
           align-items: center;
@@ -453,7 +452,7 @@ onMounted(() => {
       }
       .amount {
         position: absolute;
-        bottom: 0px;
+        bottom: 20px;
         left: 50%;
         transform: translateX(-50%);
         width: 182px;
@@ -652,6 +651,8 @@ onMounted(() => {
               font-size: 16px;
               color: #B29DD1;
               line-height: 1.2;
+              text-align: left;
+              margin: 0 40px;
             }
           }
           .body-box-con {
@@ -663,6 +664,7 @@ onMounted(() => {
               margin: 30px 0;
               text-align: center;
               a {
+                font-size: 24px;
                 color: #8C7BA5;
                 text-decoration-line: underline;
               }
@@ -685,18 +687,30 @@ onMounted(() => {
                 border-radius: 19px;
                 color: #9488AC;
               }
-              input::input-placeholder {
-                color: #9488AC;
-              }
               input[type=number] {
                 -moz-appearance:textfield;
               }
               input[type=number]::-webkit-inner-spin-button,
               input[type=number]::-webkit-outer-spin-button {
-                  -webkit-appearance: none;
-                  margin: 0;
+                -webkit-appearance: none;
+                margin: 0;
               }
             }
+            input::input-placeholder{
+              color: #9488AC;
+            }
+            input::-webkit-input-placeholder{	//兼容WebKit browsers（Chrome的内核）
+              color: #9488AC;
+            }
+            input::-moz-placeholder{			//Mozilla Firefox 4 to 18
+              color: #9488AC;
+            }
+            input::-moz-placeholder{			//Mozilla Firefox 19+
+              color: #9488AC;
+            }
+            input::-ms-input-placeholder{		//Internet Explorer 10+
+              color: #9488AC;
+            }
             .uid {
               margin-top: 30px;
             }