Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/Post.vue

@@ -141,15 +141,12 @@ export default {
         url() {
             let pageUrl = this.pageUrl;
             let id = this.info.id;
-            console.log('111ss', pageUrl, id, this.info);
             if (pageUrl === 'assetDetail') {
                 id = this.info.collectionId;
                 pageUrl = 'productDetail';
             }
             if (pageUrl === 'productDetail' && !this.assignment) {
                 pageUrl = 'productDetail';
-
-                console.log('111ss', pageUrl, this.info);
             }
             if (this.isLogin && this.assignment && pageUrl === 'productDetail') {
                 return resolveUrl(

src/views/account/Login.vue

@@ -168,7 +168,8 @@ export default {
                 return this.$http
                     .post('/auth/phoneLogin', {
                         phone: this.form.phone,
-                        code: this.form.code
+                        code: this.form.code,
+                        inviteCode: this.$store.state.inviteCode
                     })
                     .catch(e => {
                         if (e) {

src/views/creator/Detail.vue

@@ -254,7 +254,8 @@ export default {
             });
         },
         follow() {
-            if (!this.info.follow) {
+            this.checkLogin().then(() => {
+                if (!this.info.follow) {
                 this.$http.get(`/user/${this.info.id}/follow`).then(res => {
                     this.getInfo();
                     this.$toast.success('关注成功');
@@ -265,6 +266,7 @@ export default {
                     this.$toast.success('取消关注');
                 });
             }
+            })  
         },
         changeMenu(menu) {
             this.type = menu;

src/views/product/Detail.vue

@@ -399,11 +399,11 @@
                     </div>
                 </div>
             </div>
-            <div class="hold_privileges">
+            <!-- <div class="hold_privileges">
                 <div class="hold_privileges_con">
                     <hash-code :info="info"></hash-code>
                 </div>
-            </div>
+            </div> -->
             <div class="purchase_instructions">
                 <div class="purchase_instructions_con">
                     <div class="purchase_instructions_title">购买须知</div>
@@ -691,7 +691,7 @@ export default {
         // HashCode,
         // ProductTitle,
         ProductBanner,
-        HashCode
+        // HashCode
         // HashCode
         // Swiper,
         // SwiperSlide,