代码合并

src/components/CardList.vue

@@ -14,7 +14,7 @@
                   <img src="@/assets/img/holder.png" class="w-full ">
                 </div>
             </div>
-  
+            <div class="scroll-padding"></div>
           </div>
 </template>
 

src/components/CollectionCard.vue

@@ -11,9 +11,8 @@
       bg-font-light-black
     "
   >
-    <div class="flex items-center text-center left w-4/12 object-cover rounded-md">
-      <img :src="colletionData.cover?colletionData.cover :'/img/cover.png'" class="rounded-md max-h-36 mx-auto" />
-      <!-- <img src="/img/cover.png" class="rounded-md" /> -->
+    <div class="imgbox left w-4/12 object-cover rounded-md">
+      <img :src="colletionData.cover?colletionData.cover:'/img/cover.png'" class="rounded-md" />
     </div>
     <div class="right w-8/12">
       <div class="w-full px-4">
@@ -25,7 +24,6 @@
             {{colletionData.nftId}}
             </p>
         </div>
-
         <div class="flex flex-wrap w-full text-sm mt-3">
           <div class="text-font-dark-blue">题材</div>
           <div class="flex-1 pl-3 flex gap-x-2" v-for='(i,index) in getThemeList' :key="index">
@@ -56,4 +54,15 @@ export default Vue.extend({
   }
 });
 </script>
-
+<style scoped lang="less">
+.imgbox {
+  display: flex;
+  align-items: center;
+  max-height: 14git 0px;
+  img {
+    max-height: 100%;
+    max-width: 100%;
+    margin: 0 auto;
+  }
+}
+</style>

src/components/common/Cell.vue

 <template>
   <div
-    class="cell flex justify-between py-3 px-2 overflow-hidden"
+    class="cell flex justify-between py-3 px-2 text-sm overflow-hidden"
     :class="
       boxType === 'border'
         ? '  border-b border-font-gray border-opacity-25'
@@ -8,7 +8,7 @@
     "
   >
     <div class="left flex items-center flex-row-reverse">
-      <div class="px-2 text-sm text-font-dark-blue">
+      <div class="px-2 pr-5 text-left w-24 text-xs text-font-dark-blue">
         {{ text }}
       </div>
       <app-icon
@@ -34,7 +34,8 @@
         <input
           v-model="inputValue"
           type="text"
-          class="bg-transparent text-sm w-60"
+          maxlength="16"
+          class="bg-transparent"
           :placeholder="placeholder"
           @input="cellOnChange"
         />

src/layout/NavFooter.vue

 <template>
-        <div class='flex items-center justify-around pb-3 pt-3  rounded-t-2xl bg-font-black shadow-nav text-font-white text-2xs' >
+        <div class='flex items-center justify-around pb-6 pt-3  rounded-t-2xl bg-font-black shadow-nav text-font-white text-2xs' >
             <div class='flex flex-col items-center' @click="setNav('Home')">
                 <app-icon name='icon-BOSS-yingyeting-chushi' size='24px' :color='actived==="Home"?"#0078FF":"#FFF"'></app-icon>
                 <div class='mt-2' :class='actived==="Home"?" text-font-blue":" text-white"'>大厅</div>

src/service/Service.ts

@@ -21,7 +21,7 @@ export class Service {
     constructor() {
         this.service = axios.create({
             baseURL:'/proxyApi',
-            timeout: 15000,
+            timeout: 25000,
         })
         const get = this.service.get
         const post = this.service.post

src/service/nftService/nftService.ts

@@ -54,7 +54,12 @@ export class NFTService extends Service {
     officialNFTDetail:{
       path:'/commemorate/nft/get/',
       dataType: 'application/x-www-form-urlencoded'
-    }
+    },
+    applyOfficialNft:{
+      path:'/commemorate/nft/receive',
+      dataType: 'application/x-www-form-urlencoded'
+    },
+
   }
   constructor() {
     super()
@@ -320,7 +325,16 @@ export class NFTService extends Service {
     })
   }
 
-  async applyOfficialNft(){
-    
+  /**
+   * 申请领取官方活动NFT
+   */
+  async applyOfficialNft(id:number){
+    return await this.service.post(this.router.applyOfficialNft.path,{},{
+      headers: {
+        Authorization: this.getAuth(),
+        'Content-Type': this.router.officialNFTDetail.dataType,
+      },
+      params:{id}
+    })
   }
 }

src/style.less

@@ -3,7 +3,13 @@
   margin: 0;
   padding: 0;
   word-break:break-all;
+
+  -ms-overflow-style: none;
+  overflow: -moz-scrollbars-none
 }
+::-webkit-overflow-scrolling：touch；
+::-webkit-scrollbar { width: 0 !important }
+::webkit-scrollbar {background-color:transparent;display:none}
 body {
   background-color: #1d2649;
 }
@@ -135,4 +141,15 @@ body {
 .scroll-padding{
   height:120px;
   width: 100%;
+}
+
+.van-action-sheet{
+  background-color: #2B3661;
+  color: #EEF1F6;
+  .van-action-sheet__header{
+    color: #EEF1F6;
+  }
+  .van-action-sheet__content{
+    color: #EEF1F6;
+  }
 }
\ No newline at end of file

src/view/Home/index.vue

@@ -32,7 +32,7 @@
                     :size="60"
                     :color="'#0078FF'"
               />
-              <div class=" mt-6  text-font-white">loading...</div>
+              <div class=" mt-6  text-font-dark-blue">正在加载...</div>
           </div>
         </div>
     </Layout-Main>

src/view/NFT/Create/form.vue

@@ -58,7 +58,7 @@
             "
           ></textarea>
         </div>
-        <div class="fixed bottom-0 w-full left-0 z-30">
+        <div class="fixed bottom-3 w-full left-0 z-30">
           <app-btn
             text="下一步"
             class="w-11/12 mx-auto text-font-white rounded-2xl bg-font-blue"
@@ -114,7 +114,7 @@
           class="text-font-white my-3 text-sm"
           @cellOnChange="(v) => (createNFT.grant = v)"
         ></app-cell>
-        <div class="fixed bottom-0 w-full left-0 flex flex-row z-30">
+        <div class="fixed bottom-3 w-full left-0 flex flex-row z-30">
           <app-btn
             text="上一步"
             class="w-5/12 mx-auto text-font-white rounded-2xl bg-font-blue"
@@ -166,7 +166,7 @@
             }
           "
         ></app-cell>
-        <div class="fixed bottom-0 w-full left-0 flex flex-row z-30">
+        <div class="fixed bottom-3 w-full left-0 flex flex-row z-30">
           <app-btn
             text="上一步"
             class="w-5/12 mx-auto text-font-white rounded-2xl bg-font-blue"
@@ -494,7 +494,8 @@ export default Vue.extend({
           synopsis: this.createNFT.value_des,
           theme: this.pickedList.map((i: any) => i.text as string).toString(),
         } as iSaveData;
-
+        console.log(this.createNFT.archives);
+        
         if (this.createNFT.archives === 0) {
           data = {
             ...data,
@@ -504,6 +505,7 @@ export default Vue.extend({
         } else if (this.createNFT.archives === 1) {
           //需要加密存档
           const fileUrl = await this.uploadFileToOss(this.file);
+          console.log(fileUrl,'fileUrl');
           data = {
             ...data,
             isArchives: this.createNFT.archives,
@@ -521,6 +523,8 @@ export default Vue.extend({
           }
         }
         
+        console.log(data);
+        
         const { id, nftId, wallet, fileHash } =
         await this.$service.nftService.save(data);
         this.publish.fileHash = fileHash;

src/view/NFT/Create/pick.vue

@@ -17,7 +17,7 @@
           ></app-tag>
         </div>
       </div>
-      <div class="fixed bottom-0 w-full left-0 flex flex-row z-30">
+      <div class="fixed bottom-3 w-full left-0 flex flex-row z-30">
         <app-btn
           text="取消"
           @btnClicked="clickCancel"

src/view/NFT/Create/upload.vue

@@ -59,7 +59,7 @@
     </div>
     <div class="mt-2 mx-auto w-56 text-center text-font-white text-xs">{{uploadAccept.acceptText}}</div>
 
-    <div class="flex justify-between fixed bottom-0 left-0 right-0">
+    <div class="flex justify-between fixed bottom-3 left-0 right-0">
       <app-btn
         text="取消"
         class="w-5/12 mx-auto text-font-white rounded-2xl bg-font-blue"

src/view/NFT/Mynft/index.vue

 <template>
   <Layout-Child>
+      <van-action-sheet v-model="showAction" title=" " :closeable='false'>
+        <div class="content bg-font-light-black py-10 mt-8">
+            <div class=" w-11/12 mx-auto flex flex-col justify-center items-center">
+                <div>NFT接受地址</div>
+                <div class=" p-8 ">
+                    <img :src="qrcode" class=' w-48'>
+                </div>
+
+                <div class='text-xs pt-8'>
+                    {{getUserInfo.wallet}}
+                </div>
+                <div>
+                    <app-btn text='复制地址' class=" bg-font-blue" @click.native="copyAddr(getUserInfo.wallet)"></app-btn>
+                </div>
+            </div>
+        </div>
+    </van-action-sheet>
+  
     <div class="nft-cardBox w-11/12 mx-auto mt-6">
       <div
         class="nft-card w-full bg-cardBG2 bg-cover bg-no-repeat text-font-white px-5 py-3 rounded-md"
       >
         <div class="w-full flex items-start justify-between mb-12">
           <div>我的NFT(个）</div>
-          <div></div>
+          <div @click='openAction'> 
+            <img :src="qrcode" class='w-14'>
+          </div>
         </div>
         <div class="flex items-end justify-between flex-wrap">
           <div class="text-3xl">{{ balance }}</div>
@@ -28,8 +48,8 @@
             :colletionData="i"
             @click.native="goDetail(i.id)"
           ></app-collectionCard>
+          <div class='scroll-padding'></div>
         </div>
-
         <div v-else class="mt-12">
           <van-empty image="/img/empty.png" description="没有找到更多内容" />
         </div>
@@ -40,7 +60,9 @@
 
 <script lang="ts">
 import Vue from "vue";
+import { ActionSheet } from 'vant';
 
+Vue.use(ActionSheet);
 export default Vue.extend({
   data() {
     return {
@@ -48,6 +70,9 @@ export default Vue.extend({
       listData: {},
       currentCategory: 1,
       balance: 0,
+      qrcode:'',
+      srcData:'' as any,
+      showAction:false,
     };
   },
   async created() {
@@ -55,6 +80,9 @@ export default Vue.extend({
   },
   async mounted() {
     let data = await this.$service.nftService.getMyList();
+    this.qrcode = data.qrCode;
+    console.log(this.qrcode);
+
     this.balance = data.size;
     await this.$service.nftService
       .getMyList(this.currentCategory)
@@ -76,6 +104,17 @@ export default Vue.extend({
           this.listData = res.list;
         });
     },
+
+    openAction(){
+      console.log(11);
+      
+      this.showAction = true;
+    },
+       copyAddr(addr:any){
+         console.log(addr,222);
+            this.$util.cliboard(addr);
+            this.$toast("复制成功");
+        },
     goDetail(id: any) {
       this.$router.push({ name: "Nftdetail", params: { id: id } });
     },
@@ -84,6 +123,7 @@ export default Vue.extend({
     "Layout-Child": () => import("@/layout/Child.vue"),
     "app-scrollbar": () => import("@/components/common/ScrollBar.vue"),
     "app-collectionCard": () => import("@/components/CollectionCard.vue"),
+      'app-btn':()=>import('@/components/common/Btn.vue'),
   },
 });
 </script>

src/view/NFT/Transfer/index.vue

@@ -13,7 +13,7 @@
            <div class="label">
                转出地址
            </div>
-           <div class="value-container h-20  flex flex-row items-center  bg-font-light-black px-3 mt-2 rounded">
+           <div class="value-container h-24  flex flex-row items-center  bg-font-light-black px-3 mt-2 rounded">
                <div>
                     <van-image
                         width="45"
@@ -26,12 +26,46 @@
                         :src='this.$route.query.avatar?this.$route.query.avatar:"/img/mokeImg/avatar.png"'
                     />
                </div>
-               <div class=" px-3">
+               <div class="pl-3 pr-8">
                    <div>张丽莉</div>
                    <div class=" text-xs">cbdusbvudbvubdvu45656464646bduvbduvbud</div>
                </div>
            </div>
-        </div>  
+        </div> 
+
+        <div class="flex flex-col  text-font-dark-blue mt-6">
+           <div class="label">
+               收款地址
+           </div>
+           <div class="value-container h-24  flex flex-row items-center relative  bg-font-light-black px-3  mt-2 rounded">
+               <div>
+                    <div class=" absolute right-3 top-10">
+                           <app-icon name="icon-a-saoma1" size='20px'></app-icon>
+                    </div>
+                    <van-image
+                        width="45"
+                        height="45"
+                        lazy-load
+                        show-loading
+                        show-error
+                        round
+                        fit="cover"
+                        :src='this.$route.query.avatar?this.$route.query.avatar:"/img/mokeImg/avatar.png"'
+                    />
+               </div>
+               <div class=" pl-3 pr-8">
+                    <div>张三丰</div>
+                   <div class=" text-xs">cbdusbvudbvubdvu45656464646bduvbduvbudsdfsdfsadfsdfsadfsdfsadfsdfsdf</div>
+               </div>
+           </div>
+        </div> 
+    </div>
+            <div class="fixed bottom-3 w-full left-0 z-30">
+          <app-btn
+            text="下一步"
+            class="w-11/12 mx-auto text-font-white rounded-2xl bg-font-blue"
+            border="none"
+          ></app-btn>
     </div>
 </Layout-Child>
 </template>
@@ -47,7 +81,9 @@ export default Vue.extend({
     },
  
   components:{
-       'Layout-Child':()=>import('@/layout/Child.vue')
+       'Layout-Child':()=>import('@/layout/Child.vue'),
+       'app-icon':()=>import('@/components/common/Icon.vue'),
+       'app-btn':()=>import('@/components/common/Btn.vue')
   },
   computed:{
       getUserInfo(){

src/view/Other/PhotoEdit.vue

@@ -5,7 +5,7 @@
                <img :src="srcData" class="  w-40 object-cover rounded-full shadow-lg">
             </div>
         </div>
-        <div class="fixed bottom-0 w-full left-0 z-30">
+        <div class="fixed bottom-3 w-full left-0 z-30">
             <app-btn text="确认上传" class="w-11/12 mx-auto text-font-white rounded-2xl bg-font-blue" border='none'></app-btn>
         </div>
     </Layout-Child>

src/view/User/Edit.vue

@@ -21,7 +21,7 @@
             <div class=" tips py-3 px-2 text-font-red text-xs">{{inputSet.value.length}}/20</div>
         </div>
     </div>
-        <div class="fixed bottom-0 w-full left-0 z-30">
+        <div class="fixed bottom-3 w-full left-0 z-30">
         <app-btn text="确认" class="w-11/12 mx-auto text-font-white rounded-2xl bg-font-blue" :disabled='btnDisabled'  border='none' @click.native='submitUserInfo'></app-btn>
     </div>
 </Layout-Child>

src/view/User/index.vue

@@ -12,7 +12,7 @@
         <app-cell text='安全中心' boxType='border' icon='icon-xiayibu' ></app-cell>
          <app-cell text='消息管理' boxType='border' icon='icon-xiayibu' ></app-cell>
     </div>
-    <div class="fixed bottom-0 w-full left-0 z-30">
+    <div class="fixed bottom-3 w-full left-0 z-30">
         <app-btn text="退出登录" class="w-11/12 mx-auto text-font-white rounded-2xl bg-font-red" border='none'  @btnClicked='toggleDialog' ></app-btn>
     </div>
 </Layout-Child>