bug修复

src/components/common/Cell.vue

@@ -8,7 +8,7 @@
     "
   >
     <div class="left flex items-center flex-row-reverse">
-      <div class="px-2 pr-5 text-left w-24 text-xs text-font-dark-blue">
+      <div class=" pl-1 text-left text-xs text-font-dark-blue">
         {{ text }}
       </div>
       <app-icon
@@ -103,7 +103,7 @@
         <div class="flex flex-row items-center overflow-ellipsis">
           <div
             v-if="name"
-            class=" overflow-hidden overflow-ellipsis whitespace-nowrap text-sm w-56"
+            class=" overflow-hidden overflow-ellipsis whitespace-nowrap text-sm w-48"
             id="copyNodeId"
           >
             {{ name }}

src/layout/Child.vue

@@ -63,7 +63,7 @@ export default Vue.extend({
           this.$router.push({name:'Home'})
           this.$toast.success('NFT已经成功转出')
         }else{
-          this.$toast.fail(req.message || '发送失败')
+          this.$toast.fail(req.data || '发送失败')
         }
       }else if(newV.length>4){
         this.codeValue = oldV

src/service/Service.ts

@@ -36,11 +36,12 @@ export class Service {
                     await logoutUser().then(()=>{
                         router.push({name:'Login'})
                     })
+                }else{
+                    Toast.fail(typeof ret.data === "string" ? ret.data : ret.message)
                 }
-                console.log(ret,'err ret');
                 
-                Toast.fail(typeof ret.data === "string" ? ret.data : ret.message)
-                return ret;
+                // console.log(ret,'err ret');
+                // return ret;
                 // throw new Error(ret.message)
                 
             }

src/service/userService.ts

@@ -97,7 +97,7 @@ export class UserService extends Service {
     * 编辑用户的相关信息
      * @returns 
      */
-    async editUserInfo(userInfo:UserInfo){
+    async editUserInfo(userInfo:UserInfo):Promise<any>{
         return await this.service.post(this.router.editUser.path,userInfo,{
             headers:{
                 Authorization: this.getAuth()

src/view/Mine/index.vue

 <template>
-    <Layout-Main class='page-scroll'> 
+    <Layout-Main class='page-scroll pb-20'> 
         <div class='user-info w-11/12 mx-auto flex text-font-white  items-center py-8 overflow-y-scroll'>
             <div class='w-3/12 pr-5'>
                 <van-image

src/view/NFT/Create/form.vue

@@ -206,18 +206,17 @@
         </div>
      
         <div v-else class="text-center">
-          <div v-if="success" >
-              <van-overlay :show="showOverlay"  class=" full-height flex items-center z-50" >
-                <div class="w-10/12 mx-auto">
+          <div v-if="success" class="">
+              <div v-if="showOverlay"  class=" fixed left-0 right-0 top-0 bottom-0 bg-gray-800 z-50 " >
+                <div class="w-10/12 mx-auto ">
                   <certificate :certificateData="certificateData" :categoryId="categoryId"/>
                   <img
-                    @click='showOverlay = !showOverlay;'
+                    @click='showOverlay = !showOverlay'
                     src="@/assets/icons/close_publish.png"
                     class="w-4 xs:w-6 mx-auto mt-3"
                   />
                 </div>
-    
-              </van-overlay>
+              </div>
               <div class="w-10/12 mx-auto mt-32">
                  <img src="@/assets/img/success.png" class="w-36 mx-auto ">
                  <div class="mt-20">

src/view/NFT/Create/pick.vue

 <template>
   <Layout-Child class='page-scroll'>
-    <div class="pt-6">
+    <div class="pt-6 pb-28">
       <div class="text-font-red text-sm text-center" v-if="selectType == '剧本题材'">*最多支持三个选项</div>
       <div class="text-font-red text-sm text-center" v-if="selectType == '视频题材'">*最多支持一个选项</div>
 
       <div class="grid grid-cols-3 w-11/12 mx-auto mt-6">
         <div
-          class="box px-5 py-3"
+          class="box px-2 py-3"
           v-for="(i, index) in serviceData"
           :key="index"
         >

src/view/NFT/Detail/index.vue

@@ -107,7 +107,7 @@
           boxType="border"
         ></app-cell>
       </div>
-      <div class="py-3">
+      <div class="py-3" v-if="nftData.isCommemorate == 0">
         <div class="text-font-dark-blue">版权信息</div>
         <!-- <app-cell
           text="版权登记号"
@@ -119,11 +119,11 @@
           :value="nftData.author ? nftData.author : '无'"
           boxType="border"
         ></app-cell>
-        <app-cell
+        <!-- <app-cell
           text="发行人地址"
           :value="nftData.wallet ? nftData.wallet : '无'"
           boxType="border"
-        ></app-cell>
+        ></app-cell> -->
         <!-- <app-cell
           text="著作权人"
           value="JOYING-20210615-HONGJUREN"
@@ -377,6 +377,7 @@ export default Vue.extend({
               from: this.nftData.wallet,
               avatar: this.nftData.avatar,
               nftName: this.nftData.name,
+              ownerName: this.nftData.publisher,
             },
           });
           break;

src/view/NFT/Mynft/index.vue

@@ -4,8 +4,8 @@
         <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 class=" p-2 ">
+                    <img :src="qrcode" class=' w-full'>
                 </div>
 
                 <div class='text-xs pt-8'>

src/view/NFT/Transfer/camera.vue

@@ -29,7 +29,7 @@
 import Vue from 'vue';
 import jsQR from "jsqr";
 import Quagga from "quagga";
-import testImg from "@/assets/img/testCode.jpg"
+// import testImg from "@/assets/img/testCode.jpg"
 export default Vue.extend({
   name: "",
   data() {

src/view/NFT/Transfer/form.vue

@@ -28,8 +28,8 @@
                     />
                </div>
                <div class="pl-3 pr-8">
-                   <div>张丽莉</div>
-                   <div class=" text-xs">cbdusbvudbvubdvu45656464646bduvbduvbud</div>
+                   <div>{{this.$route.query.ownerName}}</div>
+                   <div class=" text-xs">{{this.$route.query.from}}</div>
                </div>
            </div>
         </div> 
@@ -80,7 +80,7 @@
           ></app-btn>
     </div>
 </Layout-Child>
-<camera v-if="showCamera" @onData="getData" @onerror="getError"/>
+<camera v-if="showCamera" @ondata="getData" @onerror="getError"/>
 </div>
 </template>
 
@@ -132,9 +132,13 @@ export default Vue.extend({
           this.showCamera = true
       },
       getData(codeData:any){
-          this.receiver.addr = codeData
           this.showTransfer = true
           this.showCamera = false
+          const objCodeData = JSON.parse(codeData)
+          console.log('原始数据',codeData)
+          console.log('转化后数据',objCodeData )
+          this.receiver.addr = objCodeData.wallet?objCodeData.wallet:''
+          this.searchUser()
       },
       getError(errorMes:any){
           this.showTransfer = true
@@ -154,7 +158,7 @@ export default Vue.extend({
                 receiveName:this.receiver.name,
                 nftid:Number(this.$route.query.nftId),
                 nftname:this.$route.query.nftName, 
-                senderWallet:this.$route.query.from
+                senderWallet:this.$route.query.from,
             }
             this.$store.commit('transfer/SET_STATE',data)
             console.log(this.$store.state.transfer);

src/view/User/index.vue

@@ -7,10 +7,10 @@
         <app-cell text='头像' boxType='border' type='image'  :value='avatarImgUrl?avatarImgUrl:this.userInfo.avatar?this.userInfo.avatar : "/img/mokeImg/avatar.png"' icon='icon-xiayibu' @click.native='uploadImg'></app-cell>
         <app-cell text='昵称'  boxType='border' :value='userInfo.nickname?userInfo.nickname:"无昵称"' icon='icon-xiayibu' @click.native="goEdit({type:'nickname',title:'设置昵称'})"></app-cell>
         <app-cell text='手机号' boxType='border' type='click' :value='userInfo.telephone?userInfo.telephone:""' ></app-cell>
-        <app-cell text='邮箱绑定'  boxType='border' :value='userInfo.email?userInfo.email:""' icon='icon-xiayibu' @click.native="goEdit({type:'email',title:'邮箱绑定'})"></app-cell>
+        <!-- <app-cell text='邮箱绑定'  boxType='border' :value='userInfo.email?userInfo.email:""' icon='icon-xiayibu' @click.native="goEdit({type:'email',title:'邮箱绑定'})"></app-cell> -->
         <app-cell text='个性签名' boxType='border' icon='icon-xiayibu'  @click.native="goEdit({type:'signature',title:'个性签名'})"></app-cell>
-        <app-cell text='安全中心' boxType='border' icon='icon-xiayibu' ></app-cell>
-         <app-cell text='消息管理' boxType='border' icon='icon-xiayibu' ></app-cell>
+        <!-- <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-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>