panhui %!s(int64=3) %!d(string=hai) anos
pai
achega
ea5cc0333a
Modificáronse 2 ficheiros con 23 adicións e 12 borrados
  1. 5 3
      src/views/Discover.vue
  2. 18 9
      src/views/product/List.vue

+ 5 - 3
src/views/Discover.vue

@@ -153,7 +153,7 @@ export default {
                 // this.$router.push( "/productList")
                 this.$router.push({ path: '/productList', query: { title: '精选推荐' } });
             } else {
-                this.$router.push({ path: '/hopeMarket', query: { title: '藏品展览' } });
+                this.$router.push({ path: '/productList', query: { category: '中展' } });
                 // this.wait();
             }
         },
@@ -464,7 +464,7 @@ export default {
         margin-bottom: 16px;
         .banner_con {
             width: calc(50vw - 24px);
-            height: 74px;
+            // height: 74px;
             border-radius: 8px;
             padding: 10px 12px;
             display: flex;
@@ -478,8 +478,10 @@ export default {
                 z-index: 2;
             }
             .banner_con_title {
-                padding-top: 14px;
+                // padding-top: 14px;
                 z-index: 2;
+                .flex-col();
+                justify-content: center;
                 .banner_con_titleone {
                     font-size: 16px;
                     font-weight: bold;

+ 18 - 9
src/views/product/List.vue

@@ -217,12 +217,17 @@ export default {
             title: '',
             salable: '',
             scrollTop: 0,
-            showAction: false
+            showAction: false,
+            category: ''
         };
     },
     computed: {
         pageName() {
-            return this.getLabelName(this.source, this.sourceOptions) || this.getLabelName(this.type, this.typeOptions);
+            return (
+                this.getLabelName(this.source, this.sourceOptions) ||
+                this.getLabelName(this.type, this.typeOptions) ||
+                (this.category ? this.category + '专区' : '')
+            );
         },
         showList() {
             let list = [];
@@ -240,13 +245,13 @@ export default {
         actions() {
             let list = [{ name: '综合排序' }, { name: '在售中' }, { name: '仅展示' }];
             if (this.salable === '') {
-                list[0].color = "#28B6FF"
+                list[0].color = '#28B6FF';
             }
             if (this.salable === true) {
-                list[1].color = "#28B6FF"
+                list[1].color = '#28B6FF';
             }
             if (this.salable === false) {
-                list[2].color = "#28B6FF"
+                list[2].color = '#28B6FF';
             }
             return list;
         }
@@ -256,6 +261,9 @@ export default {
         if (this.$route.query.type) {
             this.type = this.$route.query.type;
         }
+        if (this.$route.query.category) {
+            this.category = this.$route.query.category;
+        }
         if (this.$route.query.source) {
             this.source = this.$route.query.source;
             if (this.source === 'TRANSFER') {
@@ -325,7 +333,8 @@ export default {
                     onShelf: true,
                     del: false,
                     minterId: this.minterId,
-                    salable: this.salable
+                    salable: this.salable,
+                    category: this.category
                 },
                 sort: sort
             };
@@ -594,13 +603,13 @@ export default {
     width: 100%;
     height: 44px;
 }
-/deep/ .van-button{
+/deep/ .van-button {
     width: 100%;
     height: 38px;
     font-weight: 500;
     font-size: 16px;
 }
-.go_stroll{
+.go_stroll {
     width: 100%;
     padding: 0px 48px;
     box-sizing: border-box;
@@ -822,7 +831,7 @@ export default {
         }
     }
 }
-.van-tab.van-tab--active{
+.van-tab.van-tab--active {
     color: #28b6ff;
     font-weight: 500;
 }