Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/App.vue

@@ -13,7 +13,7 @@
 import AppBar from './components/AppBar.vue';
 import { computed } from 'vue';
 export default {
-    // components: { AppBar },
+    components: { AppBar },
     name: 'App',
     provide() {
         return {

src/components/asset/assetInfo.vue

@@ -144,7 +144,8 @@ export default {
     .data_display_con_tip {
         width: 50px;
         height: 18px;
-        background: #ffffff;
+        // background-color: #fff;
+        background: rgba(255, 255, 255, 0.5);
         border-radius: 4px;
         font-size: 10px;
         font-family: PingFangSC-Regular, PingFang SC;

src/router/index.js

@@ -101,7 +101,6 @@ const routes = [
                 name: 'store',
                 component: () => import('../views/Store.vue'),
                 meta: {
-                    pageType: Page.Every,
                     menuPage: true,
                     title: '拉索宇宙'
                 }

src/views/Home.vue

@@ -14,7 +14,7 @@
                         <!-- <img :src="item.pic" alt="" class="swipe_banner_img" /> -->
                         <van-image
                             width="100%"
-                            height="140px"
+                            height="calc(100vw/2 - 55px)"
                             :src="getImg(item.pic)"
                             fit="cover"
                             @click="goNext(item)"
@@ -526,7 +526,7 @@ export default {
         box-sizing: border-box;
         .swipe_banner {
             width: 100%;
-            height: 140px;
+            // height: 140px;
             margin-bottom: 24px;
             border-radius: 18px;
             .swipe_banner_img {

src/views/account/About.vue

@@ -91,6 +91,7 @@ export default {
 .page {
     background-color: @bg;
     padding: 16px;
+    padding-top: 24px;
 }
 
 .van-cell {

src/views/account/Connect.vue

@@ -6,12 +6,12 @@
             </div>
         </van-cell>
 
-        <!-- <van-cell :border="false" center title="微信二维码">
+        <van-cell :border="false" center title="微信二维码">
             <template #label>
                 <van-image class="code" width="179" height="179" :src="codeImg" />
                 <div class="text">扫一扫添加微信</div>
             </template>
-        </van-cell> -->
+        </van-cell>
     </div>
 </template>
 
@@ -19,14 +19,14 @@
 export default {
     data() {
         return {
-            codeImg: '',
+            codeImg: 'https://lasuo.oss-cn-hangzhou.aliyuncs.com/nft/2022-06-27-11-28-08tQEbaWcx.jpg',
             email: '724392536@qq.com'
         };
     },
     mounted() {
-        this.$http.get('/sysConfig/get/customer_group').then(res => {
-            this.codeImg = res.value;
-        });
+        // this.$http.get('/sysConfig/get/customer_group').then(res => {
+        //     this.codeImg = res.value;
+        // });
     },
     methods: {
         copy() {

src/views/account/TradingPassword.vue

@@ -17,7 +17,7 @@
                     :maxlength="4"
                     type="tel"
                     placeholder="请输入验证码"
-                    :rules="[{ required: true, message: '请输入验证码' }]"
+                    :rules="[{ required: true, message: '' }]"
                     class="login_information_con"
                 >
                     <template #button>

src/views/account/Verified.vue

@@ -16,6 +16,7 @@
                     placeholder="请填写真实姓名"
                     v-model="form.realName"
                     input-align="right"
+                    maxlength="6"
                     clearable
                     :rules="[{ required: true, message: '请输入您真实姓名' }]"
                 >

src/views/asset/Detail.vue

@@ -347,14 +347,14 @@
                         {{ info.publicShow ? '公开展示' : '私密展示' }}
                     </div>
                 </div>
-                <div class="purchase_transaction_button_two_con_certificate" @click="wait">
+                <!-- <div class="purchase_transaction_button_two_con_certificate" @click="wait">
                     <img
                         :src="require('@assets/zhengshu@3x.png')"
                         alt=""
                         class="purchase_transaction_button_two_con_img"
                     />
                     <div class="purchase_transaction_button_two_con_text">证书</div>
-                </div>
+                </div> -->
                 <van-icon name="ellipsis" size="20" @click="moreDisplay" />
                 <div class="purchase_transaction_button_two_con_more_display" v-if="moreDisplayOne === true">
                     <img
@@ -362,14 +362,14 @@
                         alt=""
                         class="purchase_transaction_button_two_con_more_display_img"
                     />
-                    <div class="purchase_transaction_button_two_con_more_display_con" @click="Consignment">
+                    <!-- <div class="purchase_transaction_button_two_con_more_display_con" @click="Consignment">
                         <img
                             :src="require('@assets/guashou@3x.png')"
                             alt=""
                             class="purchase_transaction_button_two_con_more_display_con_img"
                         />
                         <div class="purchase_transaction_button_two_con_more_display_con_title">挂售</div>
-                    </div>
+                    </div> -->
                     <div class="purchase_transaction_button_two_con_more_display_con" @click="share">
                         <img
                             :src="require('@assets/fengxiang@3x.png')"
@@ -2068,8 +2068,9 @@ export default {
             border-radius: 8px;
             background: #313641;
             margin-right: 16px;
+            padding-top: 5px;
             // border: 1px solid #28b6ff;
-            // box-sizing: border-box;
+            box-sizing: border-box;
             // color: #28b6ff;
             // line-height: 38px;
             text-align: center;
@@ -2123,6 +2124,8 @@ export default {
             height: 44px;
             background: #313641;
             border-radius: 8px;
+            padding-top: 5px;
+            box-sizing: border-box;
             // line-height: 40px;
             text-align: center;
             .purchase_transaction_button_deposit_one {
@@ -2234,7 +2237,8 @@ export default {
                     padding-left: 13px;
                     box-sizing: border-box;
                     display: flex;
-                    transform: translateY(-92px);
+                    // transform: translateY(-92px);
+                    transform: translateY(-72px);
                     .purchase_transaction_button_two_con_more_display_con_img {
                         width: 28px;
                         height: 28px;

src/views/creator/Detail.vue

@@ -555,7 +555,7 @@ export default {
     }
 }
 .empty {
-    margin-top: 80px;
+    margin-top: -60px;
     background: #191d27;
 }
 </style>

src/views/product/Detail.vue

@@ -335,10 +335,11 @@
                             radius="40"
                             :src="info.minterAvatar || require('@assets/svgs/img_default_photo.svg')"
                             fit="cover"
+                            @click="$router.push({ path: '/creatorDetail', query: { id: info.minterId } })"
                         />
                         <div class="author_details">
                             <div class="author_details_one">{{ info.minter }}</div>
-                            <div class="author_details_two">{{ info.collectionWorks }}</div>
+                            <div class="author_details_two">{{ info.collectionWorks || '暂无信息'}}</div>
                         </div>
                     </div>
                     <div :class="info.follow ? 'followedtwo' : 'collection_author_right'" @click="follow">
@@ -1999,7 +2000,7 @@ export default {
                 height: 46px;
                 background: #313641;
                 border-radius: 8px;
-                font-size: 16px;
+                font-size: 18px;
                 font-family: PingFangSC-Medium, PingFang SC;
                 font-weight: 500;
                 color: #939599;
@@ -2037,14 +2038,14 @@ export default {
                 box-sizing: border-box;
                 text-align: center;
                 .buy_now_con_two {
-                    font-size: 14px;
+                    font-size: 16px;
                     font-family: PingFangSC-Medium, PingFang SC;
                     font-weight: 500;
                     color: #725837;
                     line-height: 35px;
                 }
                 .buy_now_con {
-                    font-size: 14px;
+                    font-size: 16px;
                     font-family: PingFangSC-Medium, PingFang SC;
                     font-weight: 500;
                     color: #725837;