Merge branch 'm321ain' of gitlab.33.cn:HF_web/NFT

src/view/NFT/Create/form.vue

@@ -59,7 +59,7 @@
             @input="textareaChange"
           ></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"
@@ -115,7 +115,7 @@
           class="text-font-white my-3"
           @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"
@@ -167,7 +167,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"
@@ -334,7 +334,8 @@ export default Vue.extend({
       fileHash: "",
       fileName: "",
       file: undefined,
-      coverName: ''
+      coverName: '',
+      coverFile: undefined
     });
   },
   computed: {

src/view/NFT/Create/upload.vue

@@ -66,7 +66,7 @@
 
     </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 @click='openAction'> 
             <img :src="qrcode" class='w-14'>
           </div>
         </div>
@@ -30,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>
@@ -42,7 +60,9 @@
 
 <script lang="ts">
 import Vue from "vue";
+import { ActionSheet } from 'vant';
 
+Vue.use(ActionSheet);
 export default Vue.extend({
   data() {
     return {
@@ -51,7 +71,8 @@ export default Vue.extend({
       currentCategory: 1,
       balance: 0,
       qrcode:'',
-      srcData:'' as any
+      srcData:'' as any,
+      showAction:false,
     };
   },
   async created() {
@@ -59,7 +80,6 @@ export default Vue.extend({
   },
   async mounted() {
     let data = await this.$service.nftService.getMyList();
-
     this.qrcode = data.qrCode;
     console.log(this.qrcode);
 
@@ -85,6 +105,16 @@ export default Vue.extend({
         });
     },
 
+    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 } });
     },
@@ -93,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>