样式

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://www.raex.vip
+VUE_APP_BASE_URL=https://test.raex.vip
 NODE_ENV=development
 PUBLIC_PATH=/
 ASSETS_PATH=raex

src/mixins/common.js

@@ -125,7 +125,7 @@ export default {
                 this.$dialog
                     .confirm({
                         title: '实名认证',
-                        message: '您的账户还通过实名认证，认证后可进行添加银行卡',
+                        message: '您的账户还未通过实名认证，认证后可进行添加银行卡',
                         confirmButtonText: '前往认证'
                     })
                     .then(() => {

src/mixins/product.js

@@ -40,7 +40,13 @@ export default {
                     value: 'video/mp4'
                 }
             ],
-            startTime: ''
+            startTime: '',
+            sortOptions: {
+                精选盲盒: 'soldOut;sort,desc',
+                本期推荐: 'soldOut;sale,desc;sort,desc',
+                最HOT收藏品: 'soldOut;likes,desc;sort,desc;createdAt,desc',
+                更多藏品: 'soldOut;source,asc;sale,desc;likes,desc'
+            }
         };
     },
     computed: {

src/views/Discover.vue

@@ -51,7 +51,10 @@
         </van-grid>
 
         <div class="box" v-if="box.length > 0">
-            <page-title title="精选盲盒" :to="{ path: '/productList', query: { type: 'BLIND_BOX' } }"></page-title>
+            <page-title
+                title="精选盲盒"
+                :to="{ path: '/productList', query: { type: 'BLIND_BOX', title: '精选盲盒' } }"
+            ></page-title>
             <!-- <div class="box-list"></div> -->
 
             <swiper
@@ -71,7 +74,7 @@
         <div class="box" v-if="products.length > 0">
             <page-title
                 title="本期推荐"
-                :to="{ path: '/productList', query: { type: 'DEFAULT', source: 'OFFICIAL' } }"
+                :to="{ path: '/productList', query: { type: 'DEFAULT', title: '本期推荐' } }"
             ></page-title>
             <div class="box-list">
                 <template v-for="(item, index) in products" :key="item.id">
@@ -82,7 +85,7 @@
         <div class="box" v-if="hots.length > 0">
             <page-title
                 title="最HOT收藏品"
-                :to="{ path: '/productList', query: { type: 'DEFAULT', source: 'OFFICIAL' } }"
+                :to="{ path: '/productList', query: { type: 'DEFAULT', source: 'TRANSFER', title: '最HOT收藏品' } }"
             ></page-title>
             <div class="box-list">
                 <template v-for="(item, index) in hots" :key="item.id">
@@ -128,6 +131,7 @@ import SwiperCore, { Pagination, Autoplay } from 'swiper';
 
 // install Swiper modules
 SwiperCore.use([Pagination, Autoplay]);
+import product from '../mixins/product';
 
 import ProductInfo from '../components/product/productInfo.vue';
 import banner from '../mixins/banner';
@@ -136,7 +140,7 @@ import CreatorInfo from '../components/creator/CreatorInfo.vue';
 export default {
     name: 'discover',
     inject: ['bar'],
-    mixins: [banner],
+    mixins: [banner, product],
     components: {
         Swiper,
         SwiperSlide,
@@ -168,29 +172,29 @@ export default {
                 forbidClick: true
             });
             this.getBanner();
-            this.getProduct('BLIND_BOX', 'stock,desc;sort,desc').then(res => {
+            this.getProduct('BLIND_BOX', this.sortOptions['精选盲盒']).then(res => {
                 this.box = res;
             });
-            this.getProduct('DEFAULT', 'likes,desc;sort,desc;createdAt,desc').then(res => {
+            this.getProduct('DEFAULT', this.sortOptions['最HOT收藏品'], 'TRANSFER', 4).then(res => {
                 this.hots = res;
             });
-            this.getProduct().then(res => {
+            this.getProduct('DEFAULT', this.sortOptions['本期推荐']).then(res => {
                 this.products = res;
             });
             this.getMiner();
         },
-        getProduct(type = '', sort = 'sort,desc') {
+        getProduct(type = '', sort = 'sort,desc', source = 'OFFICIAL', size = 4) {
             return this.$http
                 .post(
                     '/collection/all',
                     {
                         page: 0,
-                        size: 4,
+                        size: size,
                         query: {
                             type: type,
                             onShelf: true,
                             del: false,
-                            source: 'OFFICIAL'
+                            source: source
                         },
                         sort: sort
                     },
@@ -233,9 +237,9 @@ export default {
                         query: {
                             onShelf: true,
                             del: false,
-                            source: 'OFFICIAL'
+                            source: 'OFFICIAL,TRANSFER'
                         },
-                        sort: 'sort,desc'
+                        sort: this.sortOptions['更多藏品']
                     },
                     { body: 'json' }
                 )

src/views/Givesubmit.vue

@@ -264,7 +264,7 @@ export default {
                 border-right: 1px solid @text3;
             }
             i {
-                background-color: #fff;
+                color: @text0;
             }
         }
     }
@@ -320,7 +320,7 @@ export default {
                 border-right: 1px solid @text3;
             }
             i {
-                background-color: @text0;
+                color: @text0;
             }
         }
     }

src/views/Mine.vue

@@ -20,8 +20,8 @@
                         @click="$router.push('/setting')"
                     />
                     <div class="text">
-                        <div class="text1 van-ellipsis">
-                            <span>{{ userInfo.nickname }}</span>
+                        <div class="text1">
+                            <span class="van-ellipsis" style="max-width: 120px">{{ userInfo.nickname }}</span>
 
                             <img
                                 @click="$router.push('/verifiedSuc')"
@@ -66,7 +66,7 @@
                         <div class="text1">{{ userInfo.followers }}</div>
                     </div>
 
-                    <van-button plain @click="$router.push('/setting')" color="#939599" size="mini" round
+                    <van-button class="edit" @click="$router.push('/setting')" color="#F5F7FA" size="mini" round
                         >编辑资料</van-button
                     >
                 </div>
@@ -443,7 +443,7 @@ export default {
                 width: 18px;
                 height: 18px;
             }
-            color: @text0 !important;
+            color: @text3 !important;
         }
         .van-button + .van-button {
             margin-left: 10px;
@@ -477,7 +477,7 @@ export default {
     }
 
     .text {
-        margin: 0 40px 0 12px;
+        margin: 0 10px 0 12px;
         overflow: hidden;
         .text1 {
             font-size: @font3;
@@ -522,6 +522,12 @@ export default {
         .van-icon__image {
             display: block;
         }
+        font-weight: normal;
     }
+    height: 24px;
+}
+
+.edit {
+    color: @text3;
 }
 </style>

src/views/account/ChangeText.vue

@@ -7,7 +7,7 @@
             type="textarea"
             :maxlength="type === 'nickname' ? 10 : 50"
             :placeholder="type === 'nickname' ? '请输入昵称' : '请添加介绍，让大家了解你'"
-            :show-word-limit="type !== 'nickname'"
+            show-word-limit
             clearable
         />
         <div class="btn">

src/views/account/TradingPassword.vue

@@ -260,6 +260,7 @@ export default {
                 border-right: 1px solid @text3;
             }
             i {
+                background-color: @text0;
                 //background-color: #fff;
             }
         }

src/views/account/Waiting.vue

@@ -23,7 +23,7 @@ export default {
             if (this.userInfo.authStatus) {
                 return { ...this.info }[this.userInfo.authStatus];
             } else {
-                return {};
+                return this.info.PENDING;
             }
             // return this.info.PENDING;
         }

src/views/asset/Detail.vue

@@ -207,7 +207,7 @@
         </div> -->
         <div class="btn van-safe-area-bottom" ref="btn" v-if="info.status === 'NORMAL'">
             <div class="btns1">
-                <div @click="Add">
+                <div class="add" @click="Add">
                     <img class="img" src="@assets/icon-dianzan.png" alt="" />
                     <div class="text2">赠送</div>
                 </div>
@@ -1158,7 +1158,7 @@ export default {
         display: flex;
         padding: 6px 16px 6px 26px;
         .btn1 {
-            margin: 0 16px 0 25px;
+            margin-right: 16px;
         }
         .img {
             width: 24px;
@@ -1176,6 +1176,10 @@ export default {
             -webkit-background-clip: text;
             -webkit-text-fill-color: transparent;
         }
+
+        .add {
+            margin-right: 25px;
+        }
     }
     .van-button {
         background: linear-gradient(135deg, @prim 0%, @warn 100%);

src/views/asset/GiveSearch.vue

@@ -77,9 +77,14 @@ export default {
                     phone: this.phone
                 })
                 .then(res => {
-                    this.info = res;
-                    if (this.info.length === 0) {
-                        this.empty = true;
+                    if (res.id === this.$store.state.userInfo.id) {
+                        this.$toast('不能赠送给自己');
+                        this.phone = '';
+                    } else {
+                        this.info = res;
+                        if (this.info.length === 0) {
+                            this.empty = true;
+                        }
                     }
                 })
                 .catch(e => {

src/views/creator/Detail.vue

@@ -204,7 +204,7 @@ export default {
                         source: this.sourceType,
                         onShelf: true
                     },
-                    sort: this.sort
+                    sort: 'soldOut;' + (this.sort || 'id,desc')
                 };
             } else {
                 return {
@@ -215,7 +215,7 @@ export default {
                         del: false,
                         source: this.sourceType
                     },
-                    sort: this.sort
+                    sort: 'soldOut;' + (this.sort || 'id,desc')
                 };
             }
         },

src/views/product/List.vue

@@ -2,10 +2,17 @@
     <div class="follow">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
             <div class="top" v-if="!minterId">
-                <div class="name">{{ pageName }}</div>
+                <div class="name">{{ title || pageName }}</div>
                 <img src="@assets/icon-sosuo.png" alt="" @click="goSearch" class="search" />
             </div>
-            <van-tabs v-model:active="sort" :ellipsis="false" line-width="16" line-height="2" @change="getData(true)">
+            <van-tabs
+                v-if="!title"
+                v-model:active="sort"
+                :ellipsis="false"
+                line-width="16"
+                line-height="2"
+                @change="getData(true)"
+            >
                 <van-tab
                     :title="item.label"
                     :name="
@@ -75,7 +82,8 @@ export default {
                     type: 'select'
                 }
             ],
-            url: '/collection/all'
+            url: '/collection/all',
+            title: ''
         };
     },
     computed: {
@@ -95,6 +103,9 @@ export default {
         if (this.$route.query.minterId) {
             this.minterId = this.$route.query.minterId;
         }
+        if (this.$route.query.title) {
+            this.title = this.$route.query.title;
+        }
     },
     methods: {
         beforeData() {
@@ -106,7 +117,7 @@ export default {
                     del: false,
                     minterId: this.minterId
                 },
-                sort: this.sort
+                sort: this.sortOptions[this.title] || this.sort
             };
         },
         goSearch() {
@@ -154,7 +165,7 @@ export default {
     }
 }
 
-/deep/.van-tabs__nav--line.van-tabs__nav--complete{
+/deep/.van-tabs__nav--line.van-tabs__nav--complete {
     border-color: @tabBorder;
 }
 // /deep/.van-tab {

src/views/user/Banks.vue

@@ -67,6 +67,7 @@ export default {
 }
 @colorList: #37b074, #ea4f56, #36a0b9, #f79439;
 .bank-info {
+    color: #fff;
     each(@colorList,{
         &:nth-child( 4n + @{index} ){
             background:  linear-gradient(90deg, @value, lighten(@value , 20%) 100%);

src/views/user/BanksAdd.vue

@@ -219,8 +219,8 @@ export default {
     }
 
     /deep/.van-key--blue {
-        background: linear-gradient(135deg, #fdfb60 0%, #ff8f3e 100%);
-        color: #333230;
+        background: linear-gradient(135deg, @prim 0%, @warn 100%);
+        color: @btnText;
     }
 }
 </style>

vue.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 module.exports = {
     publicPath: process.env.PUBLIC_PATH || '/',
     devServer: {
-        port: 8081,
+        port: 8082,
         disableHostCheck: true
     },
     pluginOptions: {