Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/product/productLarge.vue

@@ -74,7 +74,7 @@ export default {
         time() {
             if (this.info.purchaseTime) {
                 if (this.dayjs().isSameOrBefore(this.info.purchaseTime, 'YYYY-MM-DD HH:mm:ss')) {
-                    return this.dayjs(this.info.purchaseTime).format('MM月DD日');
+                    return this.dayjs(this.info.purchaseTime).format('MM月DD日HH:mm');
                 }
             }
 
@@ -153,7 +153,7 @@ export default {
         position: absolute;
         top: 16px;
         left: 16px;
-        z-index: 99;
+        z-index: 12;
         .not_sold_out_img {
             width: 16px;
             height: 17px;

src/mixins/product.js

@@ -54,6 +54,9 @@ export default {
             saleTime: ''
         };
     },
+    // mounted(){
+    //     this.startTime = this.info.purchaseTime
+    // },
     computed: {
         ...mapState(['usedBuy']),
         bannerList() {

src/views/Home.vue

@@ -236,6 +236,9 @@ export default {
         offeringNotice() {
             this.active = 1;
             // this.finished = false;
+            if (!this.isLogin) {
+                return;
+            }
             this.loading = true;
             this.finished = false;
             return this.$http.get('collection/subscribeList').then(res => {

src/views/account/Verified.vue

@@ -18,7 +18,7 @@
                     input-align="right"
                     maxlength="6"
                     clearable
-                    :rules="[{ required: true, message: '请输入您真实姓名' }]"
+                    :rules="[{ required: true, message: '' }]"
                 >
                 </van-field>
                 <van-field
@@ -30,10 +30,10 @@
                     clearable
                     :border="false"
                     :rules="[
-                        { required: true, message: '请输入身份证号' },
+                        { required: true, message: '' },
                         {
                             pattern: IDPattern,
-                            message: '身份证号格式错误'
+                            message: ''
                         }
                     ]"
                 >

src/views/product/Detail.vue

@@ -2005,6 +2005,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        align-items: center;
         position: fixed;
         bottom: 0;
         padding-bottom: calc(@bottom+ constant(safe-area-inset-bottom));
@@ -2096,7 +2097,7 @@ export default {
                     font-family: PingFangSC-Medium, PingFang SC;
                     font-weight: 500;
                     color: #725837;
-                    margin-bottom: 2px;
+                    // margin-bottom: 2px;
                     margin-top: -3px;
                 }
                 .buy_now_time {