Ver Fonte

筛除50元以下的

panhui há 3 anos atrás
pai
commit
a3608d75d0

+ 2 - 0
src/views/Discover.vue

@@ -312,6 +312,8 @@ export default {
                     publish: true
                 };
                 sort = 'heats,desc';
+            } else {
+                query.minPrice = 50;
             }
 
             return this.$http

+ 30 - 7
src/views/Store.vue

@@ -82,10 +82,6 @@
         <van-list
             class="box-list"
             :style="{
-                backgroundImage:
-                    active !== 'coupon' && active !== 'showRoom' && showList.length > 0
-                        ? `url(${require('../assets/png-zhantai.png')})`
-                        : '',
                 paddingBottom: showList.length % 3 === 0 ? '35.73vw' : '20px'
             }"
             :class="{ couponList: active === 'coupon', roomList: active === 'showRoom' }"
@@ -97,7 +93,18 @@
             <template v-for="(item, index) in showList" :key="index">
                 <coupon-info :info="item" v-if="active == 'coupon'"></coupon-info>
                 <show-info v-model:info="list[index]" v-else-if="active == 'showRoom'"></show-info>
-                <asset-info :info="item" v-else></asset-info>
+                <div
+                    class="asset-list"
+                    v-else
+                    :style="{
+                        backgroundImage:
+                            active !== 'coupon' && active !== 'showRoom' && showList.length > 0
+                                ? `url(${require('../assets/png-zhantai.png')})`
+                                : ''
+                    }"
+                >
+                    <asset-info :info="asset" v-for="asset in item" :key="asset.id"></asset-info>
+                </div>
             </template>
 
             <van-empty
@@ -253,8 +260,17 @@ export default {
                         return !this.checkTime(item);
                     }
                 });
-            } else {
+            } else if (this.active == 'showRoom') {
                 return this.list;
+            } else {
+                let list = [...this.list];
+                let _list = [];
+                for (let i = 0; i <= Math.floor(list.length / 3); i++) {
+                    _list.push(list.slice(i * 3, (i + 1) * 3));
+                }
+                return _list.filter(item => {
+                    return item.length > 0;
+                });
             }
         },
         sort() {
@@ -552,7 +568,7 @@ export default {
     // display: flex;
     // flex-wrap: wrap;
     // padding: 8px 8px 100px;
-    padding: 0 0 0 4.2vw;
+    // padding: 0 0 0 4.2vw;
     background-size: 100vw 42vw;
     background-position: 0 -10vw;
     box-sizing: border-box;
@@ -563,6 +579,13 @@ export default {
     &.roomList {
         padding: 10px 0 100px;
     }
+
+    .asset-list {
+        background-size: 100vw auto;
+        background-position: 0 -10vw;
+        box-sizing: border-box;
+        padding: 0 0 0 4.2vw;
+    }
 }
 
 .tab {

+ 2 - 1
src/views/product/HopeMarket.vue

@@ -367,7 +367,8 @@ export default {
                     onShelf: true,
                     del: false,
                     minterId: this.minterId,
-                    salable: this.salable
+                    salable: this.salable,
+                    minPrice: 50
                 },
                 sort: this.sort === 'id,desc' ? this.sortOptions[this.title] || sort : sort
             };

+ 18 - 34
src/views/user/Wallet.vue

@@ -39,26 +39,18 @@
         </div>
 
         <div class="tips">
-            <div class="tips-title">规则说明</div>
-            <div class="tips-content">
-                <p>
-                    <span>1、每位藏家仅限开通一张绿魔卡,单张绿魔卡单次最低充值额度为</span
-                    ><span>人民币100元,单次最高充值额度为人民币5,000元,单个账户充值金额不得超过人民币</span
-                    ><span>10,000元。充值期间绿魔卡不产生利息或任何性质的其他收益。</span>
-                </p>
-                <p>
-                    <span>2、绿魔卡仅可用来购买绿洲宇宙平台的数字艺术品(不含实物衍生品)。</span>
-                </p>
-                <p>
-                    <span>
-                        3、各位藏家可根据个人需求随时提现,但每日仅可提现一次,提现最低提现金额为人民币100元整。由于监管需要,绿洲宇宙将在每个月的15日、30日(遇非工作日自动顺延)强制藏家全部提现。
-                    </span>
-                </p>
-                <p>
-                    <span>
-                        4、提现到账时间为提现成功后的次日(遇非工作日自动顺延),提现手续费为提现金额的0.8%,单笔手续费不足人民币2元的按人民币2元收取;&nbsp;
-                    </span>
-                </p>
+            <div
+                class="tips-title"
+                @click="
+                    $router.push({
+                        name: 'walletAgreement',
+                        query: {
+                            isRead: true
+                        }
+                    })
+                "
+            >
+                《钱包规则说明》
             </div>
         </div>
         <van-action-sheet v-model:show="showRechargeDialog" :closeable="false" class="recharge-dialog">
@@ -768,9 +760,6 @@ export default {
             ::v-deep(.van-button__content) {
                 font-weight: bold;
             }
-            // &:active {
-            //     background: shade(#373a60, 20%);
-            // }
         }
     }
 }
@@ -780,21 +769,16 @@ export default {
 
 .tips {
     padding: 16px;
+    position: absolute;
+    left: 50%;
+    bottom: 0px;
+    .bottom(16px);
+    transform: translateX(-50%);
     .tips-title {
         font-size: 14px;
         font-weight: bold;
-        color: #000000;
+        color: rgba(58, 178, 0, 0.6);
         line-height: 24px;
     }
-
-    .tips-content {
-        font-size: 12px;
-        color: #939599;
-        line-height: 20px;
-        margin-top: 12px;
-        p {
-            margin: 0 0;
-        }
-    }
 }
 </style>

+ 20 - 2
src/views/user/WalletAgreement.vue

@@ -90,7 +90,18 @@
         <p style="text-align: right"><span>绿魔收藏家俱乐部</span></p>
         <p style="text-align: right"><span>2022年5月27日</span></p>
         <div class="btn-wrapper">
-            <van-button class="btn-agree" type="primary" round block :color="$colors.prim" @click="enableWallet">
+            <van-button
+                class="btn-agree"
+                v-if="isRead"
+                type="primary"
+                round
+                block
+                :color="$colors.prim"
+                @click="$router.go(-1)"
+            >
+                返回
+            </van-button>
+            <van-button class="btn-agree" v-else type="primary" round block :color="$colors.prim" @click="enableWallet">
                 同意并开通
             </van-button>
         </div>
@@ -99,7 +110,14 @@
 <script>
 export default {
     data() {
-        return {};
+        return {
+            isRead: false
+        };
+    },
+    mounted() {
+        if (this.$route.query.isRead) {
+            this.isRead = true;
+        }
     },
     methods: {
         enableWallet() {