xuqiang 4 лет назад
Родитель
Сommit
727edfa0eb

+ 1 - 0
src/main/pc-space/package.json

@@ -21,6 +21,7 @@
         "vue-avatar-cropper": "^5.0.2",
         "vue-awesome-swiper": "^4.1.1",
         "vue-clipboard2": "^0.3.3",
+        "vue-qrcode": "^1.0.0",
         "vue-router": "^3.2.0",
         "vue-social-share": "0.0.3",
         "vuex": "^3.4.0"

+ 5 - 1
src/main/pc-space/src/components/CollectionInfo.vue

@@ -8,7 +8,7 @@
         }"
         class="collect"
     >
-        <el-image class="imgBox" :src="getImg(changeImgs(info.pics))" fit="cover"></el-image>
+        <el-image class="imgBox" :src="getImg(changeImgs(info.pic))" fit="cover"></el-image>
 
         <div class="introduce">{{ info.name }}</div>
         <div class="price">
@@ -63,6 +63,7 @@ export default {
     methods: {
         likeProduct() {
             if (!this.info.liked) {
+                console.log(111);
                 this.$http.get(`/collection/${this.info.id}/like`).then(() => {
                     this.$emit('update:info', {
                         ...this.info,
@@ -72,6 +73,9 @@ export default {
                     this.$message.success('收藏成功');
                 });
             } else {
+                // this.info.liked = true;
+                console.log(222);
+                console.log(this.info);
                 this.$http.get(`/collection/${this.info.id}/unlike`).then(() => {
                     this.$emit('update:info', {
                         ...this.info,

+ 8 - 2
src/main/pc-space/src/components/FansInfo.vue

@@ -21,12 +21,18 @@
                                         已售 <span>{{ list.sales }}</span>
                                     </div>
                                 </div>
-                                <el-button plain round :class="{ prim: !list.follow }" size="mini" @click="fans(list)">
+                                <el-button
+                                    plain
+                                    round
+                                    :class="{ prim: !list.follow }"
+                                    size="mini"
+                                    @click.prevent="fans(list)"
+                                >
                                     {{ list.follow ? '已关注' : '关注' }}
                                 </el-button>
                             </div>
                         </div>
-                        <div class="imgBox">
+                        <div class="imgBox" v-if="list.bg">
                             <img class="imgBox1" :src="list.bg" alt="" />
                         </div>
                     </div>

+ 1 - 1
src/main/pc-space/src/views/AssetDetail.vue

@@ -212,7 +212,7 @@ export default {
         boxs() {
             let list = [...this.blindBoxItems];
             return list.map(item => {
-                return this.getImg(this.changeImgs(item.pics));
+                return this.getImg(this.changeImgs(item.pic));
             });
         }
     },

+ 2 - 2
src/main/pc-space/src/views/CollectionDetail.vue

@@ -193,7 +193,7 @@ export default {
     },
     computed: {
         banners() {
-            return this.info.pics || [];
+            return this.info.pic || [];
         },
         properties() {
             return this.info.properties || [];
@@ -204,7 +204,7 @@ export default {
         boxs() {
             let list = [...this.blindBoxItems];
             return list.map(item => {
-                return this.getImg(this.changeImgs(item.pics));
+                return this.getImg(this.changeImgs(item.pic));
             });
         }
     },

+ 18 - 0
src/main/pc-space/yarn.lock

@@ -8215,6 +8215,11 @@ tslib@^1.10.0, tslib@^1.9.0:
   resolved "https://registry.nlark.com/tslib/download/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=
 
+tslib@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE=
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.nlark.com/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -8536,6 +8541,11 @@ vue-clipboard2@^0.3.3:
   dependencies:
     clipboard "^2.0.0"
 
+vue-demi@^0.11.3:
+  version "0.11.4"
+  resolved "https://registry.npmmirror.com/vue-demi/download/vue-demi-0.11.4.tgz#6101992fe4724cf5634018a16e953f3052e94e2a"
+  integrity sha1-YQGZL+RyTPVjQBihbpU/MFLpTio=
+
 vue-eslint-parser@^7.0.0:
   version "7.11.0"
   resolved "https://registry.npmmirror.com/vue-eslint-parser/download/vue-eslint-parser-7.11.0.tgz?cache=0&sync_timestamp=1634602895439&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"
@@ -8579,6 +8589,14 @@ vue-loader@^15.9.2:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
+vue-qrcode@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/vue-qrcode/download/vue-qrcode-1.0.0.tgz#330666cfffcaff4c6978d4dd696dbb77cd0e3f0a"
+  integrity sha1-MwZmz//K/0xpeNTdaW27d80OPwo=
+  dependencies:
+    tslib "^2.2.0"
+    vue-demi "^0.11.3"
+
 vue-router@^3.2.0:
   version "3.5.2"
   resolved "https://registry.npmmirror.com/vue-router/download/vue-router-3.5.2.tgz?cache=0&sync_timestamp=1634663514839&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-router%2Fdownload%2Fvue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c"