From 7e7bcb9973fe8822c79b5ee9717af976c9dca172 Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Tue, 16 Apr 2024 14:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9nft=E5=90=88=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                  |   6 ++-
 src/assets/common/Enter.png       | Bin 0 -> 1393 bytes
 src/assets/common/check-input.png | Bin 0 -> 2680 bytes
 src/views/home/index.vue          |  66 ++++++++++++++++++++++--------
 src/views/home/ranking.vue        |  12 ++++--
 5 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 src/assets/common/Enter.png
 create mode 100644 src/assets/common/check-input.png

diff --git a/.env.development b/.env.development
index ab9d2e2..b8abc9c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,6 @@
 # API
-VUE_APP_API_URL = 'http://192.168.100.22:3006'
+VUE_APP_API_URL = 'https://oauth-svr.cebggame.com/task'
+# VUE_APP_API_URL = 'http://192.168.100.22:3006'
 # VUE_APP_API_URL = 'http://127.0.0.1:3006/api'
 VUE_APP_WL_URL = 'https://nftwl.counterfire.games/wl_test'
 VUE_APP_CONFIG_URL = 'https://sepolia.infura.io/v3/b6bf7d3508c941499b10025c0776eaf8'
@@ -17,5 +18,6 @@ VUE_APP_CHAIN_ID = '5611'
 VUE_APP_APP_NAME = 'CF UAW'
 
 # 铭文的验证地址
-VUE_APP_SCRIPTION_ADDRESS='0x50A8e60041A206AcaA5F844a1104896224be6F39'
+VUE_APP_SCRIPTION_ADDRESS='0xcd4bb3402f1a444a1af10f31946ed37dac0eac4d'
+# VUE_APP_SCRIPTION_ADDRESS='0x50A8e60041A206AcaA5F844a1104896224be6F39'
 VUE_APP_CONTRACT='0x0Fd13D2CD0B6c679B6f92590E0b91C18DDe7BD3A'
diff --git a/src/assets/common/Enter.png b/src/assets/common/Enter.png
new file mode 100644
index 0000000000000000000000000000000000000000..8954167fec74afa0139def5d20f1e494a0022263
GIT binary patch
literal 1393
zcmV-%1&;cOP)<h;3K|Lk000e1NJLTq001HY0015c1^@s6N&n0g00001b5ch_0Itp)
z=>Px)D@jB_R9Hv7mv3y{RT;-W-}Ae7cmHYk2j@scfo&iXd4VC;jixS8hnNt_9NpUL
zLc$9ZW0<}(F^h@sWW@MNB4}t`HyZ;aKr_auUF!%25)%{5mTiW?u+q6f>F93n{hhD=
zes|qkx4C=E!nv>RFXwrl&w0-GJm)!L#_&!8tsQG)lKe#IeqaG6p!_%YVZay>fl1?+
zLYn@Zp}r&9nSYz@-h&S|#bohM1&@H1)*^cXYXVWN{cQkAWC)o}0eLZK@p+%)hNnV0
z@iVnO_rawg!(E@VJplS5kOIdHdqVUGI5!|9_2(w0H4xMkgVqZk25trt@LQ5LX+zJ6
zOF@RZzF=_xaU<qv#5<C-JVaanS!L^*<8YSw!Oe@(q|_SFF2pUEw`De}wdWsK27wih
z{34WjT<tw)=NSJIGw<tK6ifU_fgb~>>Hu*`jvZ><eehaAO#AWB)_bhb2P$73L<GgD
zO={iy_grg#*qm^~{N+p~3khih8cEE&^kYt*`?tQ+pJ@&cZMn^1-T)@n2ZHX?hG&lC
z#)BOzVp7;8{54ShAlOEK4rz6V+WJoAzJ|Nk8oyjWh}^FAy@#(k$VlfpTl?k)axJ&!
zlYm@H!TL%d+5WR+$%ne@$%+Rb{=Adot7KxGxi#JyICN~qoW<I5^C@X(Udk_mIF-~!
z^_}-fo3B$k)Y%&XnRxb7WvL4qxCA5@Yx0DkrE#%xD5U9Q7sa||tzCQ>%aR{LVRdx;
zw&GCN1b7nZ4dX+yz7L#J(f6vQ_h`O~gWFd|D!&xmJqM821H~Wep5KnuPR%q3%MpJ8
ztpPVH9_*R~moO>P1h5bo6?8Mn8(C$|>&UXg3X;--hU-XLp5%1(6mRvL){bRqNZLct
zF3igOI>gG0TMdK?@H%h{@Y(EY1CH4A1;u9xrFXRc>5t|j+N_XppnDnfbZ2zBU1%es
z89WL)27Co5Dh_v*F{4W377~&uZI^W)a6K>uyleA(ko!p|j!$3PSA)s{UfbMEW&WKJ
zcT3usXCe3l%&-)GO*Nfx680iiWf{qWom9d1^3~pBxp8&=9f)l<-#8Cc1^>(F#bEED
z5)L!+%$ez?W+qgA(++QKB63G0>6U1(`S3XCO`+c~RT*aEx-nimdXuZ#58O}#5%0}D
zuIE=XRk}TjZCT%tJIfjY@xJf@B7KD7Um2Y^ec>J%{9Y5JUy22H%6W(P8Q?7VZ_$1_
zDX04>j=rz9Kjlr<jGD6gvLF|3$}GJj+3Lb=QK3`#ymJSnvHTu!bvLQrB=PF#@Lfp{
z)Bt=AblCWJLFE@&(EQJ=R?W)Z#p3q=L1q~ZZ*3;^t%TxM<8OjjWg-KOVctc)9+YJu
z3wB(h2hwL*b>^hj43saYsk$?AS>r7Ig>>D2SKDF7Z-KH?wxG5JoN#1MD0nZSd_pb#
z*@?X3_(UKVwr%jiCbVb`NwUrM2E!}Cv6rTBTwkuQtGhhNjQ-<lM|0Me<pQlNW|DE;
z|NHTVY%lgEGc+<skVXRk@7x(p(&}14i;OAdA$`3ktFE8g@Nn1Nj{K3p%Ix@NiZ0uJ
zJQPd6Qp;1PKMfMU(!D$u;}0b507@Ci8N^cTQJW`2^gfC@LnRfV&_I7$2Y#%YVqz+8
zjzR4bk0PzYj4M6Zxm)B#XbJF9_K`rfp{HdX3>T(k&(N4XLCK!9c}(LM<dLqsqIpba
z6J}xl<jyMU^t-i@Aoa|h_8s#mA6pCr@x*@s)nXWUI5y`F00000NkvXXu0mjf()Ou*

literal 0
HcmV?d00001

diff --git a/src/assets/common/check-input.png b/src/assets/common/check-input.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cdea23672febc3ddc8062f7846541a2caf8aa46
GIT binary patch
literal 2680
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

literal 0
HcmV?d00001

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 138934c..0bfb37d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -411,15 +411,24 @@
         </div>
         <div class="content-right" v-if="navIndex == 2">
           <div class="title">
-            <!-- <div class="title-left">
+            <div class="title-left">
               <div>Partner</div>
-            </div> -->
+            </div>
+          </div>
+          <div class="check-code">
+            <div class="check-code-icon">
+              <img src="@/assets/common/Enter.png" alt="">
+            </div>
+            <div class="check-code-input"></div>
+            <div class="check-code-btn">
+              <div>Confirm</div>
+            </div>
           </div>
           <div class="quest">
             <div class="partner-list">
-              <div>
+              <!-- <div>
                 coming soon
-              </div>
+              </div> -->
               <!-- <div class="partner">
                 <div>Partner</div>
                 <div>Rewards</div>
@@ -1690,6 +1699,27 @@ export default {
             margin-bottom: 10px;
           }
         }
+        .check-code {
+          width: 100%;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          background: url('@/assets/common/check-input.png') no-repeat;
+          background-size: 100% 100%;
+          margin-bottom: 10px;
+          .check-code-icon {
+            img {
+              width: 100%;
+              height: 100%;
+            }
+            .check-code-input {}
+            .check-code-btn {
+              width: 120px;
+              height: 30px;
+            }
+          }
+        }
         .quest {
           background: #1e1b26;
           padding: 10px;
@@ -1906,20 +1936,20 @@ export default {
             font-weight: 700;
           }
           ::v-deep .quest-list::-webkit-scrollbar {
-          width: 5px;
-        }
-      ::v-deep .quest-list::-webkit-scrollbar-track{
-          background: #171220;
-          border-radius:2px;
-        }
-      ::v-deep .quest-list::-webkit-scrollbar-corner{
-          display: block;
-        }
-      ::v-deep .quest-list::-webkit-scrollbar-thumb{
-        height: 15px;
-          background: #9950fd;
-          border-radius:10px;
-        }
+            width: 5px;
+          }
+          ::v-deep .quest-list::-webkit-scrollbar-track{
+            background: #171220;
+            border-radius:2px;
+          }
+          ::v-deep .quest-list::-webkit-scrollbar-corner{
+            display: block;
+          }
+          ::v-deep .quest-list::-webkit-scrollbar-thumb{
+            height: 15px;
+            background: #9950fd;
+            border-radius:10px;
+          }
         }
         .tips {
           margin-top: 10px;
diff --git a/src/views/home/ranking.vue b/src/views/home/ranking.vue
index d0fa9d5..67b93f6 100644
--- a/src/views/home/ranking.vue
+++ b/src/views/home/ranking.vue
@@ -39,7 +39,7 @@
             </div>
           </div>
         </div>
-        <div v-if="rankingTableData.length == 0" class="ranking-content-left-forward-no">
+        <div v-if="rankingTableData == undefined || rankingTableData.length <= 0" class="ranking-content-left-forward-no">
           <div>
             <p>None</p>
           </div>
@@ -87,7 +87,8 @@
               </div>
               <div class="forward-list-item-top">
                 <div class="user-img">
-                  <img v-if="rankingTableData[2].avatar == ''"  src="@/assets/common/head_default.jpg" alt="">
+                  <img v-if="rankingTableData[2] == ''"  src="@/assets/common/head_default.jpg" alt="">
+                  <img v-else-if="rankingTableData[2].avatar == ''"  src="@/assets/common/head_default.jpg" alt="">
                   <img v-else :src="rankingTableData[2].avatar" alt="">
                 </div>
               </div>
@@ -103,7 +104,7 @@
           </div>
         </div>
       </div>
-      <div class="ranking-content-right">
+      <div class="ranking-content-right">{{ rankingTableData }}
         <div v-if="rankingTableData.length == 0" class="ranking-content-right-list-no">
           <div>
             <p>None</p>
@@ -226,13 +227,15 @@ export default  {
       return this.$store.state.user.userData?.rankTotal || 0
     }
   },
+  created() {
+    this.getLeaderBoard()
+  },
   mounted() {
     if(this.token) {
       this.userData = JSON.parse(localStorage.getItem("userData"));
       this.getMyIntegralList()
       this.initData()
     }
-    this.getLeaderBoard()
   },
   methods: {
     async initData() {
@@ -257,6 +260,7 @@ export default  {
     async getLeaderBoard () {
       let res = await this.$axios.get(process.env.VUE_APP_API_URL+`/api/activity/leaderboard/uaw_activity/0`)
       this.rankingTableData = res.data.data
+      console.log('rankingTableData' ,this.rankingTableData)
     },
     // 获取用户状态
     getUserState() {