Merge branch '拍卖' of http://git.izouma.com/xiongzhu/raex_front into dev

package-lock.json

@@ -1742,6 +1742,11 @@
                 "@popperjs/core": "^2.9.2"
             }
         },
+        "@vant/touch-emulator": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/@vant/touch-emulator/-/touch-emulator-1.4.0.tgz",
+            "integrity": "sha512-Zt+zISV0+wpOew2S1siOJ3G22y+hapHAKmXM+FhpvWzsRc4qahaYXatCAITuuXt0EcDp7WvEeTO4F7p9AtX/pw=="
+        },
         "@vant/use": {
             "version": "1.3.5",
             "resolved": "https://registry.npmjs.org/@vant/use/-/use-1.3.5.tgz",
@@ -2049,17 +2054,6 @@
                     "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
                     "dev": true
                 },
-                "chalk": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
                 "debug": {
                     "version": "4.3.3",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
@@ -2080,25 +2074,6 @@
                         "universalify": "^0.1.0"
                     }
                 },
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-                    "dev": true,
-                    "optional": true
-                },
-                "loader-utils": {
-                    "version": "2.0.2",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-                    "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^2.1.2"
-                    }
-                },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2113,28 +2088,6 @@
                     "requires": {
                         "minipass": "^3.1.1"
                     }
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "vue-loader-v16": {
-                    "version": "npm:vue-loader@16.8.3",
-                    "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-                    "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "chalk": "^4.1.0",
-                        "hash-sum": "^2.0.0",
-                        "loader-utils": "^2.0.0"
-                    }
                 }
             }
         },
@@ -4442,8 +4395,7 @@
         "cropperjs": {
             "version": "1.5.12",
             "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz",
-            "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==",
-            "dev": true
+            "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw=="
         },
         "croppie": {
             "version": "2.6.5",
@@ -13337,6 +13289,60 @@
                 }
             }
         },
+        "vue-loader-v16": {
+            "version": "npm:vue-loader@16.8.3",
+            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+            "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+            "dev": true,
+            "optional": true,
+            "requires": {
+                "chalk": "^4.1.0",
+                "hash-sum": "^2.0.0",
+                "loader-utils": "^2.0.0"
+            },
+            "dependencies": {
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "optional": true
+                },
+                "loader-utils": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+                    "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
         "vue-lottie": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz",
@@ -13349,7 +13355,6 @@
             "version": "0.5.1",
             "resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.5.1.tgz",
             "integrity": "sha512-hHwTRsmpHazd1ZVDZA7hMm2FSAUSfnagi60orxX5qsEhx3dxwb8jOv8weC6pz9YMitQs8US7KTbusi01UeRTkg==",
-            "dev": true,
             "requires": {
                 "cropperjs": "^1.5.12"
             }

package.json

@@ -12,6 +12,7 @@
     "@better-scroll/core": "^2.4.2",
     "@chenfengyuan/vue-qrcode": "^2.0.0-rc.1",
     "@vant/area-data": "^1.1.3",
+    "@vant/touch-emulator": "^1.4.0",
     "@vueuse/core": "^8.7.5",
     "ali-oss": "^6.16.0",
     "axios": "^0.21.4",

public/index.html

@@ -16,9 +16,9 @@
         <meta name="full-screen" content="yes" />
         <meta name="x5-fullscreen" content="true" />
         <meta name="theme-color" content="#000000" />
-        <meta http-equiv="Pragma" content="no-cache">
-        <meta http-equiv="Cache-Control" content="no-cache">
-        <meta http-equiv="Expires" content="0">
+        <meta http-equiv="Pragma" content="no-cache" />
+        <meta http-equiv="Cache-Control" content="no-cache" />
+        <meta http-equiv="Expires" content="0" />
         <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
         <% if (htmlWebpackPlugin.options.app) { %>
         <script src="cordova.js"></script>
@@ -31,6 +31,17 @@
                     url('<%= BASE_URL %>font/iconfont.woff?t=1658717109985') format('woff'),
                     url('<%= BASE_URL %>font/iconfont.ttf?t=1658717109985') format('truetype');
             }
+
+            .filter-gray {
+                /* filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);
+                -webkit-filter: grayscale(100%);
+                -moz-filter: grayscale(100%);
+                -ms-filter: grayscale(100%);
+                -o-filter: grayscale(100%);
+                filter: grayscale(100%);
+                -webkit-filter: gray;
+                filter: gray; */
+            }
         </style>
     </head>
     <body>

src/App.vue

@@ -138,7 +138,7 @@ export default {
             checkEvent: null,
             keeps: [],
             bodyScroll: 0,
-            showSplash: true,
+            showSplash: false,
             setting: false
         };
     },
@@ -154,6 +154,16 @@ export default {
             }
         }
     },
+    mounted() {
+        if ('1' !== window.localStorage.getItem('AppSplash')) {
+            this.showSplash = true;
+            window.localStorage.setItem('AppSplash', '1');
+        } else {
+            if (window.cordova && StatusBar) {
+                StatusBar.styleDefault();
+            }
+        }
+    },
     methods: {
         goApp() {
             this.showSplash = false;

src/components/AppBar.vue

@@ -100,11 +100,11 @@ export default {
         }
     },
     mounted() {
-        if (this.$route.meta.menuPage) {
-            this.show = false;
-        } else {
-            this.show = true;
-        }
+        // if (this.$route.meta.menuPage) {
+        //     this.show = false;
+        // } else {
+        //     this.show = true;
+        // }
         this.getColor();
         this.setTitle();
     },

src/components/auction/records.vue

@@ -51,7 +51,7 @@ export default {
                 query: {
                     tradeAuctionId: this.auctionId,
                     del: false,
-                    status: 'FINISH',
+                    status: 'FINISH,PASS',
                     paymentType: 'DEPOSIT,PURCHASE_PRICE'
                 },
                 sort: 'id,desc'

src/main.js

@@ -4,6 +4,7 @@ import router from './router';
 import store from './store';
 import Vant from 'vant';
 import { ConfigProvider } from 'vant';
+import '@vant/touch-emulator';
 import 'vant/lib/index.css';
 import './styles/app.less';
 import './styles/font.less';

src/views/Discover.vue

@@ -250,19 +250,19 @@ export default {
             sort: 'collection',
             selectOptions: [
                 {
-                    label: '最新发布',
+                    label: '最新',
                     value: 'collection'
                 },
                 {
-                    label: '艺术机构',
+                    label: '机构',
                     value: 'creator'
                 },
                 {
-                    label: '个人发布',
+                    label: '个人',
                     value: 'collection_MY'
                 },
                 {
-                    label: '艺术展览',
+                    label: '展览',
                     value: 'art_Exhibition'
                 }
             ],
@@ -618,7 +618,7 @@ export default {
 }
 
 .menu {
-    padding: 16px 16px 26px;
+    padding: 16px 16px 16px;
     .menu-con {
         display: flex;
         justify-content: space-between;
@@ -740,12 +740,14 @@ export default {
 
 /deep/.van-tab {
     color: #fff;
-    flex: 0;
+    // flex: 0;
     // padding: 20px;
     flex-shrink: 0;
     // min-width: 74px;
     font-size: 16px;
-    margin-right: 30px !important;
+    flex-grow: 1 !important;
+    margin-right: 0 !important;
+    // margin-right: 30px !important;
     &.van-tab--active {
         color: @prim;
     }

src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
     <van-pull-refresh
-        class="home"
+        class="home filter-gray"
         success-text="加载成功"
         success-duration="500"
         v-model="isLoading"
@@ -126,7 +126,10 @@
         <div class="card-list">
             <div
                 class="card card-hot"
-                :style="{ order: index < 1 ? index + 1 : index + 2 }"
+                :style="{
+                    order: index < 1 ? index + 1 : index + 2,
+                    display: item.name === '新手引导' ? 'none' : 'block'
+                }"
                 v-for="(item, index) in hots"
                 :key="index"
                 @click="goNext(item)"
@@ -149,7 +152,15 @@
                     </div>
                 </div>
                 <div class="rank-list">
-                    <swiper
+                    <div class="rankSwiper">
+                        <hot-collect
+                            v-for="(item, index) in HotCollects"
+                            :key="index"
+                            :index="index"
+                            :info="item"
+                        ></hot-collect>
+                    </div>
+                    <!-- <swiper
                         class="rankSwiper"
                         @reachEnd="reachEnd"
                         @slidePrevTransitionStart="slidePrevTransitionStart"
@@ -158,15 +169,9 @@
                         free-mode
                     >
                         <swiper-slide v-for="(item, index) in HotCollects" :key="index">
-                            <!-- <rank-info :index="index" v-model:info="hotUsers[index]"></rank-info> -->
-                            <hot-collect :index="index" :info="item"></hot-collect>
+                           <rank-info :index="index" v-model:info="hotUsers[index]"></rank-info> 
                         </swiper-slide>
-                    </swiper>
-
-                    <div class="rank-more" :style="{ visibility: hideMore ? 'hidden' : 'visible' }">
-                        <van-icon name="icon-a-iconarrowdown1" class-prefix="font_family" />
-                        <div>上滑显示更多</div>
-                    </div>
+                    </swiper> -->
                 </div>
             </div>
 
@@ -209,6 +214,21 @@
                 :type="item.type"
             >
             </product-large>
+
+            <div class="tips-content">
+                <div class="tips">【华储艺术品中心（深圳）有限公司】</div>
+                <a target="_blank" href="https://beian.miit.gov.cn" class="tips1">
+                    <span>粤ICP备2021166549号-1</span>
+                </a>
+                <a
+                    class="tips2"
+                    target="_blank"
+                    href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=44030302002216"
+                >
+                    <img src="@assets/icon.png" alt="" />
+                    <p>粤公网安备 44030302002216号</p></a
+                >
+            </div>
         </div>
         <img src="../assets/png-zhiding.png" @click="goTop" class="goTop" v-if="bodyScroll > 200" alt="" />
     </van-pull-refresh>
@@ -406,14 +426,13 @@ export default {
             }
         },
         showRisk() {
-            let show = window.sessionStorage.getItem('riskShow')
-                ? JSON.parse(window.sessionStorage.getItem('riskShow'))
-                : false;
-
-            if (!show) {
-                this.riskShow = true;
-                window.sessionStorage.setItem('riskShow', JSON.stringify(true));
-            }
+            // let show = window.sessionStorage.getItem('riskShow')
+            //     ? JSON.parse(window.sessionStorage.getItem('riskShow'))
+            //     : false;
+            // if (!show) {
+            //     this.riskShow = true;
+            //     window.sessionStorage.setItem('riskShow', JSON.stringify(true));
+            // }
         },
         getInit() {
             // this.$toast.loading({
@@ -461,7 +480,7 @@ export default {
             return this.$http
                 .get('/asset/topTen')
                 .then(res => {
-                    this.HotCollects = res;
+                    this.HotCollects = res.slice(0, 5);
                     return Promise.resolve();
                 })
                 .catch(() => {
@@ -1130,4 +1149,32 @@ export default {
         }
     }
 }
+.tips-content {
+    .flex-col();
+    align-items: center;
+    .tips {
+        padding: 15px 0 0;
+        font-size: 12px;
+        text-align: center;
+        color: #939599;
+    }
+    .tips1 {
+        padding: 5px 0 0;
+        font-size: 12px;
+        text-align: center;
+        color: #939599;
+    }
+
+    .tips2 {
+        font-size: 12px;
+        text-align: center;
+        color: #939599;
+        padding: 20px 0;
+        .flex();
+        justify-content: center;
+        img {
+            margin-right: 3px;
+        }
+    }
+}
 </style>

src/views/Index.vue

@@ -12,6 +12,7 @@
             safe-area-inset-bottom
             route
             ref="tabbar"
+            class="filter-gray"
             :class="tabClass"
         >
             <van-tabbar-item replace v-for="item in menus" :name="item.name" :to="`/${item.name}`" :key="item.name">

src/views/account/About.vue

@@ -3,6 +3,7 @@
         <div class="title">关于我们</div>
         <van-cell-group :border="false">
             <van-cell title="平台简介" is-link :to="{ path: '/introduction' }" />
+            <van-cell title="图文介绍" is-link @click="showSplash = true" />
             <van-cell title="了解更多" is-link :to="{ path: '/question' }" />
             <van-cell
                 title="用户协议"
@@ -16,6 +17,7 @@
             />
             <van-cell title="隐私政策" is-link :to="{ path: '/agreement' }" />
             <van-cell title="商务合作" @click="show = true" is-link />
+            <van-cell title="风险提示" is-link @click="riskShow = true" />
         </van-cell-group>
 
         <div class="tips">【华储艺术品中心（深圳）有限公司】</div>
@@ -39,15 +41,73 @@
                 >
             </div>
         </van-overlay>
+
+        <van-dialog v-model:show="riskShow" theme="round-button" className="risk">
+            <div class="risk-box">
+                <img src="@assets/png-bg.png" class="risk-bg" alt="" />
+                <div class="risk-content">
+                    <div class="text1">官方公告</div>
+                    <div class="text2">ANNOUNCEMENT</div>
+                    <div class="text3">
+                        RAEX绿洲宇宙的探索者：法律许可范围内，最终解释权归RAEX绿洲宇宙平台所有，RAEX绿洲宇宙平台有权对宣传内容进行修改、调整，敬请留意最新宣传资料或公告通知。华储艺术品中心（深圳）有限公司进行拍卖的数字艺术品及RAEX绿洲宇宙平台发售的数字艺术品仅具备收藏欣赏、版权价值。RAEX绿洲宇宙发售的数字艺术品首发价格为官方指导价，版权市场拍卖价格均为数字艺术品持有者自行决定，平台不干涉拍卖价格，对发行的艺术品二手市场价格不构成任何指导建议。平台严禁未满22周岁以及超过55周岁的用户注册平台账号及使用相关功能，请各位探索者理性消费，仔细阅读相关权益，切勿盲从、轻信他人谣言，杜绝恶意炒作，远离一切非法行为，切实维护自身财产安全，共同营造健康数字艺术品生态。
+                    </div>
+                </div>
+            </div>
+            <template #footer>
+                <div class="risk-footer">
+                    <van-button block color="#E85C58" @click="riskShow = false">我已知晓</van-button>
+                </div>
+            </template>
+        </van-dialog>
+
+        <swiper
+            v-if="showSplash"
+            pagination
+            @reachEnd="reachEnd"
+            class="appSwiper"
+            :autoplay="{ delay: 3000, disableOnInteraction: false }"
+        >
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash1.jpg" alt="" />
+            </swiper-slide>
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash2.jpg" alt="" />
+            </swiper-slide>
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash3.jpg" alt="" />
+            </swiper-slide>
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash4.jpg" alt="" />
+            </swiper-slide>
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash5.jpg" alt="" />
+            </swiper-slide>
+            <swiper-slide>
+                <img src="https://cdn.raex.vip/image/splash6.jpg" alt="" />
+            </swiper-slide>
+            <div class="tiaozhuan" @click="goApp">知道了</div>
+        </swiper>
     </div>
 </template>
 
 <script>
+import { Swiper, SwiperSlide } from 'swiper/vue';
+
+import 'swiper/swiper.min.css';
+import 'swiper/swiper-bundle.min.css';
+
+import SwiperCore, { Pagination, Autoplay } from 'swiper';
+
+// install Swiper modules
+SwiperCore.use([Pagination, Autoplay]);
 export default {
+    components: { Swiper, SwiperSlide },
     data() {
         return {
             codeImg: '',
-            show: false
+            show: false,
+            riskShow: false,
+            showSplash: false
         };
     },
     mounted() {
@@ -56,6 +116,14 @@ export default {
         });
     },
     methods: {
+        reachEnd() {
+            setTimeout(() => {
+                this.goApp();
+            }, 3000);
+        },
+        goApp() {
+            this.showSplash = false;
+        },
         getImgBase64(img2, key) {
             let img = new Image();
             img.crossOrigin = 'anonymous';
@@ -158,4 +226,118 @@ export default {
         margin-right: 3px;
     }
 }
+
+.risk-box {
+    position: relative;
+    img {
+        width: 288px;
+        height: 400px;
+        display: block;
+    }
+
+    .risk-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        .flex-col();
+        align-items: center;
+        .text1 {
+            font-size: 20px;
+            font-family: ZhenyanGB-Regular, ZhenyanGB;
+            color: #3e4293;
+            line-height: 20px;
+            padding: 22px 0 5px;
+            position: relative;
+            &::before {
+                content: '';
+                width: 38px;
+                height: 1px;
+                background: linear-gradient(-90deg, rgba(62, 66, 147, 0.3) 0%, rgba(62, 66, 147, 0.06) 100%);
+                position: absolute;
+                left: -50px;
+                top: 32px;
+            }
+            &::after {
+                content: '';
+                width: 38px;
+                height: 1px;
+                background: linear-gradient(90deg, rgba(62, 66, 147, 0.3) 0%, rgba(62, 66, 147, 0.06) 100%);
+                position: absolute;
+                right: -50px;
+                top: 32px;
+            }
+        }
+        .text2 {
+            font-size: 10px;
+            color: rgba(62, 66, 147, 0.5);
+            line-height: 14px;
+        }
+        .text3 {
+            align-self: stretch;
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #1c1c1c;
+            line-height: 24px;
+            margin: 10px 24px;
+            height: 254px;
+            overflow: auto;
+        }
+    }
+}
+
+.risk-footer {
+    padding: 16px 24px 12px;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 12px;
+    .van-button {
+        border-radius: 8px;
+    }
+}
+
+.appSwiper {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    // height: var(--app-height);
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 9999;
+    object-fit: cover;
+    opacity: 1;
+    transition: opacity 0.8s ease-in-out;
+    background-color: #000;
+    --swiper-theme-color: #fff;
+    .swiper-slide {
+        img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+        }
+    }
+
+    /deep/.swiper-pagination {
+        .fixedBottom(40px);
+    }
+
+    .tiaozhuan {
+        height: 26px;
+        background: rgba(0, 0, 0, 0.3);
+        border-radius: 14px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 26px;
+        padding: 0 16px;
+        position: fixed;
+        z-index: 30;
+        top: calc(var(--safe-top) + 36px);
+        right: 30px;
+    }
+}
 </style>

src/views/account/Question.vue

@@ -2,27 +2,131 @@
     <div class="page">
         <div class="content">
             <div>
-                <div class="align-center">常见问题</div>
-                <h6>1.什么是数字艺术品？</h6>
+                <div class="align-center">了解更多</div>
+                <h6>Q1：什么是NFT？</h6>
                 <p>
-                    您好~数字艺术品是使用区块链技术进行唯一标识的经数字化的特定作品、艺术品和商品，包括但不限于数字画作、图片、音乐、视频、3D模型等各种形式。数字艺术品作为虚拟数字视频，而非实物，一经售出，不支持退换。每个数字艺术品都映射着特定区块链上的唯一序列号，不可篡改、不可分割，也不能互相替代。每一个数字艺术品都映射着特定作品、艺术品和商品或其限量发售的单个数字复制品，记录着其不可篡改的链上权利。因此数字艺术品与虚拟货币等同质化代币存在本质的不同，有特定作品、艺术品和商品的实际价值做支撑。
+                    A1：NFT简称非同质化通证，是一个独特的数字资产。所谓的非同质化通证，就是不可替代的一种可流通的加密数字权益证明，即在智能合约中记录着唯一信息。在区块链上认证后，每个NFT都是独一无二的。
                 </p>
-                <h6>2.购买的数字艺术品有什么作用？</h6>
-                <p>您好~已购买的数字艺术品是经过蚂蚁链确权，权属清晰、数量透明，永不增发的藏品，极具收藏价值。</p>
-                <h6>3.如何购买数字艺术品？</h6>
-                <p>您好~购买步骤如下：</p>
-                <p>1）下载RAEX宇宙；</p>
-                <p>2）注册账号；</p>
-                <p>3）浏览首页/发现页中的商品；</p>
-                <p>4）点击“立即购买“，付款；</p>
-                <p>5）付款完成，在藏品室中“我拥有的”栏目下即可看到购买的数字艺术品</p>
-                <h6>4.数字艺术品是否可以退换？</h6>
-                <p>您好~数字艺术品一经售出不支持退换。</p>
+                <h6>Q2：什么是数字商品？</h6>
+                <p>
+                    A2：数字商品是数字经济与元宇宙发展的产物，是基于区块链技术进行唯一标识的数字化文创产品，涵盖绘画、图片、音频、视频、三维模型等多种内容形式。数字商品具有不可篡改、不可分割、不可复制、可追溯等特性，极具收藏价值且是现实资产属性的数字资产。
+                </p>
+                <h6>Q3：数字商品的作用是什么？</h6>
+                <p>A3：</p>
+                <p>1）数字商品是经过区块链确权的，权属清晰、数量透明，永不增发，极具收藏价值</p>
+                <p>
+                    2）数字商品是元宇宙内价值和自我个性化表达的重要媒介，同时，数字商品有助于依虚转实，实现产业赋能和创新。
+                </p>
+                <h6>Q4：数字商品的玩法及逻辑是什么？</h6>
+                <p>A4：</p>
+                <p>1）盲盒玩法</p>
+                <p>盲盒内的每一个数字商品都极具个性化且具有唯一性。</p>
+                <p>2）赋能玩法</p>
+                <p>针对某些IP进行赋能，赋予特殊权益，让藏品具有更大价值。</p>
+                <p>3）合成玩法</p>
+                <p>将一个或多个藏品合成一个全新藏品，合成后原藏品会被销毁，通常新藏品价格会更高。</p>
                 <!-- <h6>5.数字艺术品是否可以售卖与转赠？</h6>
                 <p>您好~售卖与转赠功能将在后续开放，敬请期待。</p> -->
-                <h6>5.当我购买数字艺术品，是否能获得实物？</h6>
+                <h6>Q5：什么是首发市场？</h6>
+                <p>A5：指发行方首次公开发售某一系列藏品。</p>
+
+                <h6>Q6：什么是拍卖市场？</h6>
+                <p>A6：指数字商品日常拍卖流转的市场。</p>
+
+                <h6>Q7：什么是优先购/白名单？</h6>
+                <p>A7：指在公开发售前的指定时间内拥有优先抢购相应藏品数量的资格。</p>
+
+                <h6>Q8：什么是空投？</h6>
+                <p>A8：指平台将官方发行的指定数字商品直接转入至用户的藏品室中。</p>
+
+                <h6>Q9：什么是快照？</h6>
+                <p>A9：指记录某一时刻某一区块高度的区块链状态，即对用户持仓藏品进行一个统计。</p>
+
+                <h6>Q10:PFP头像？</h6>
+                <p>A10:即版权品头像，一种以数字商品形式存在的带有版权性质的头像。</p>
+
+                <h6>Q11：购买数字商品，能否获得实物?</h6>
+                <p>
+                    A11：数字商品是使用区块链技术进行唯一标识的数字化的特定作品、艺术品和商品，在平台后期开放铸造功能时，可以铸造实物商品，RAEX绿洲追求“以虚赋能实体”，为更多的传统商家带来优质的元宇宙体验与服务。
+                </p>
+
+                <h6>Q12：数字商品是否可以退换?</h6>
+                <p>A12：数字商品作为虚拟商品，而非实物，一经售出，不支持退换，请谨慎购买。</p>
+
+                <h6>●平台指南</h6>
+
+                <h6>Q1：怎么购买数字商品？</h6>
+                <p>A1：1）进入绿洲宇宙APP；</p>
+                <p>2）个人主页—我的，点击登录按钮，在暂无RAEX宇宙登陆许可处，点击立即申领完成账号注册；</p>
+                <p>3）浏览首页/发现页中的商品；</p>
+                <p>4）选择心仪的数字商品，点击“立即购买“前往付款；</p>
+                <p>5）付款完成，在藏品室中“我拥有的”栏目下即可看到已购买的数字商品。</p>
+
+                <h6>Q2：持有的数字商品有哪几种操作方式？</h6>
+                <p>A2：1）一口价拍卖</p>
+                <p>2）竞价拍卖</p>
+                <p>3）赠送</p>
+                <p>4）封存</p>
+                <p>5）铸造星图</p>
+                <p>6）销毁数字商品</p>
+
+                <h6>Q3：购入数字商品后多久可以寄售?</h6>
+                <p>A3：购入数字商品后，右下角有个寄售倒计时，会显示寄售时间。</p>
+
+                <h6>Q4：售出的数字商品多久到账?</h6>
+                <p>A4：请先行开通绿魔卡，卖出即刻到账个人帐户余额，自行提现后T+1工作日到账银行卡。</p>
+
+                <h6>Q5：售出的数字商品如何提现？</h6>
+                <p>A5：1）进入APP登录个人账号一我的钱包—申请开通绿魔卡；</p>
+                <p>2）绑定个人银行卡自助提现，每日可提1次；</p>
+
+                <h6>Q6：提现的手续费标准？</h6>
+                <p>A6：从钱包余额提现至银行卡，手续费收取千分之八，单笔手续费不满2元按2元计算。</p>
+
+                <h6>Q7：什么是绿洲石？</h6>
+                <p>
+                    A7：在RAEX绿洲平台内消费1元即可获得对应的1个绿洲石。绿洲石会产生原力，原力是绿洲藏家晋升之路的基础。原力越高，境界与头衔越高。
+                </p>
+
+                <h6>Q8：绿洲版税和手续费是多少？</h6>
+                <p>A8：每个数字商品寄售时都会显示相关费率，请在寄售时查看。</p>
+
+                <h6>Q9：为什么要账号实名认证？</h6>
+                <p>A9：NFT或数字商品是您的私人财产，为保障您的个人权益不受侵犯，需要进行账号实名认证。</p>
+
+                <h6>Q10：账号实名认证要求有哪些？</h6>
+                <p>A10：22-55周岁，证件有效期内，证件照片清晰无遮挡无反光。</p>
+
+                <h6>Q11：一个身份证可以绑定多少个账号?</h6>
+                <p>A11：一个身份证最多可绑定3个账号，申请超额审核不予通过，请勿频繁使用同一证件认证。</p>
+
+                <h6>Q12：没有实名认证，绑定银行卡可以进行正常数字商品购买和出售吗?</h6>
+                <p>A12：没有实名认证可以正常购买数字商品，转赠以及出售数字商品需要实名认证绑定银行卡。</p>
+
+                <h6>Q13：什么是“绿洲链上星图”？</h6>
+                <p>
+                    A13：“绿洲链上星图”是属于每一个人的元宇宙物资铸造中心!
+                    在这里，每一个人都可以铸造自己的元宇宙物资，在 OASISMETA绿洲元宇宙里进行展示与流通!
+                    “绿洲链上星图”也是使用“IPFS全球分布式存储技术”与“区块链确权技术”的永恒纪念之地!在这里，可以自由上传对您拥有重大意义的照片，比如全家福、孩子的满月照、宠物的Q萌形象、团队聚会的瞬间...让这些具有历史意义的照片，在链上永存!
+                </p>
+
+                <h6>Q14：如何生成自己的NFT作品？</h6>
+                <p>A14： 1）进入RAEX绿洲宇宙APP；</p>
+                <p>2）选择下方菜单栏星图按钮；</p>
+                <p>3）点击立即铸造星图；</p>
+                <p>4）通过审核后即可生成自己的NFT作品。</p>
+
+                <h6>Q15：什么是“绿洲易拍”？</h6>
+                <p>A15：RAEX绿洲宇宙拍卖中心将全面升级并更名为“绿洲易拍”！</p>
+                <p>
+                    “绿洲易拍”采用全新的拍卖模式，带来更多有趣的玩法，催生新的产品、新的业态，促进藏家与数字资产进行互动，利用数字技术带动实体经济发展，赋能传统产业升级。
+                </p>
+                <h6>●风险提示</h6>
+                <p>
+                    RAEX绿洲宇宙的探索者：法律许可范围内，最终解释权归RAEX绿洲宇宙平台所有，RAEX绿洲宇宙平台有权对宣传内容进行修改、调整，敬请留意最新宣传资料或公告通知。华储艺术品中心（深圳）有限公司进行拍卖的数字商品及RAEX绿洲宇宙平台发售的数字商品仅具备收藏欣赏、版权价值。
+                </p>
                 <p>
-                    您好~数字艺术品是使用蚂蚁区块链技术进行唯一标识的数字化的特定作品、艺术品和商品，在平台后期开放铸造功能时，可以铸造实物商品。
+                    RAEX绿洲宇宙发售的数字商品首发价格为官方指导价，版权市场拍卖价格均为数字商品持有者自行决定，平台不干涉拍卖价格，对发行的数字商品二手市场价格不构成任何指导建议。平台严禁未满22周岁以及超过55周岁的用户注册平台账号及使用相关功能，请各位探索者理性消费，仔细阅读相关权益，切勿盲从、轻信他人谣言，杜绝恶意炒作，远离一切非法行为，切实维护自身财产安全，共同营造健康数字商品生态。
                 </p>
             </div>
         </div>

src/views/account/Security.vue

@@ -166,7 +166,7 @@ export default {
     padding: 23px 16px;
 }
 .logout {
-    padding-top: 99px;
+    padding-top: 40px;
     font-size: 14px;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: bold;
@@ -174,6 +174,7 @@ export default {
     line-height: 24px;
     text-align: center;
     background-color: #ffffff;
+    padding-bottom: 150px;
 }
 .van-button {
     border-width: 1px;

src/views/auction/Detail.vue

@@ -306,7 +306,7 @@ export default {
                                 tradeAuctionId: this.auctionId,
                                 del: false,
                                 userId: this.userInfo.id,
-                                status: 'FINISH',
+                                status: 'FINISH,PASS',
                                 paymentType: 'DEPOSIT,PURCHASE_PRICE'
                             },
                             size: 1,
@@ -329,7 +329,7 @@ export default {
                         query: {
                             tradeAuctionId: this.auctionId,
                             del: false,
-                            status: 'FINISH',
+                            status: 'FINISH,PASS',
                             paymentType: 'DEPOSIT,PURCHASE_PRICE'
                         },
                         size: 2,

src/views/auction/Home.vue

@@ -262,4 +262,4 @@ export default {
     padding: 8px;
     min-height: calc(100vh - 156px);
 }
-</style>
+</style>

src/views/auction/Submit.vue

@@ -28,7 +28,7 @@
 
         <div class="text-list">
             <div class="text-info" v-if="paymentType === 'FIXED_PRICE'">
-                <span class="text1">一口价（当前价的{{ fixedPre }}%）</span>
+                <span class="text1">一口价</span>
                 <span class="text2">¥{{ preMoney }}</span>
             </div>
             <div class="text-info" v-else>
@@ -39,6 +39,10 @@
                 <span class="text1">GAS费用</span>
                 <span class="text2">¥{{ gas }}</span>
             </div>
+            <div class="text-info" v-if="paymentType === 'PURCHASE_PRICE'">
+                <span class="text1">手续费</span>
+                <span class="text2">-¥{{ info.lastCommission || 0 }}</span>
+            </div>
 
             <!-- <div class="text-info">
                 <span class="text1">GAS费用</span>
@@ -163,9 +167,9 @@ export default {
     computed: {
         preMoney() {
             if (this.paymentType === 'PURCHASE_PRICE') {
-                return this.info.currentPrice;
+                return this.info.purchasedPrice || 0;
             }
-            return this.accMul(this.info.currentPrice || 0, this.fixedPre / 100);
+            return this.info.recommendPrice || 0;
         },
         money() {
             let money = 0;
@@ -175,6 +179,9 @@ export default {
             if (this.gas) {
                 money = this.accAdd(money, this.gas);
             }
+            if (this.paymentType === 'PURCHASE_PRICE') {
+                money = this.accAdd(money, 0 - (this.info.lastCommission || 0));
+            }
 
             return money;
         },

src/views/order/AuctionDetail.vue

@@ -51,7 +51,12 @@
 
             <div
                 class="text-cell"
-                v-if="status !== '竞价成功，去支付' && status !== '已流局' && info.paymentType !== 'PURCHASE_PRICE'"
+                v-if="
+                    status !== '竞价成功，去支付' &&
+                    status !== '已流局' &&
+                    info.paymentType !== 'PURCHASE_PRICE' &&
+                    info.paymentType !== 'FIXED_PRICE'
+                "
             >
                 <div class="text-top">
                     <span class="text1">出局补偿</span>

src/views/product/Detail.vue

@@ -329,7 +329,7 @@
                 </van-collapse-item>
             </van-collapse>
         </div>
-        <div class="copyright_market" @click="$router.push(`/productSearch?search=${info.prefixName}`)">
+        <div class="copyright_market" @click="goSearch()">
             <img src="@assets/icon-jiantou@3x.png" alt="" class="copyright_market_img" />
             <div class="copyright_market_title">前往版权市场看看</div>
             <img src="@assets/icon-jiantou@3x.png" alt="" class="copyright_market_img" />
@@ -626,6 +626,10 @@ export default {
         // }
     },
     methods: {
+        goSearch() {
+            this.setKeeps(['productSearch'], false);
+            this.$router.push(`/productSearch?search=${this.info.prefixName}`);
+        },
         showSale() {
             this.$refs.sale.init();
         },

src/views/user/BalanceRecord.vue

@@ -52,7 +52,8 @@ export default {
                 AUCTION: '藏品拍卖',
                 AUCTION_RETURN: '保证金退款',
                 REFUND: '退款',
-                BONUS: '活动奖励'
+                BONUS: '活动奖励',
+                COMMISSION: '分销奖励'
             }
         };
     },

yarn.lock

@@ -1318,6 +1318,11 @@
   dependencies:
     "@popperjs/core" "^2.9.2"
 
+"@vant/touch-emulator@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@vant/touch-emulator/-/touch-emulator-1.4.0.tgz#02420ca5f312a7eb6c36c349cbb8e80e6f29ff2f"
+  integrity sha512-Zt+zISV0+wpOew2S1siOJ3G22y+hapHAKmXM+FhpvWzsRc4qahaYXatCAITuuXt0EcDp7WvEeTO4F7p9AtX/pw==
+
 "@vant/use@^1.3.5":
   version "1.3.5"
   resolved "https://registry.npmjs.org/@vant/use/-/use-1.3.5.tgz"