panhui 4 yıl önce
ebeveyn
işleme
2ee23a03a9

+ 1 - 1
src/main/comos/.env.app

@@ -2,6 +2,6 @@ VUE_APP_BASE_URL=https://nft.9space.vip/
 NODE_ENV=production
 PUBLIC_PATH=./
 ASSETS_PATH=raex
-TITLE=绿洲宇宙
+TITLE=Comos
 VUE_APP_CORDOVA=true
 VUE_APP_PAGE_TYPE=raex

+ 1 - 1
src/main/comos/.env.app_test

@@ -2,6 +2,6 @@ VUE_APP_BASE_URL=https://test.raex.vip
 NODE_ENV=production
 PUBLIC_PATH=./
 ASSETS_PATH=raex
-TITLE=绿洲宇宙
+TITLE=Comos
 VUE_APP_CORDOVA=true
 VUE_APP_PAGE_TYPE=raex

+ 1 - 1
src/main/comos/.env.development

@@ -2,5 +2,5 @@ VUE_APP_BASE_URL=https://nfttest.9space.vip/
 NODE_ENV=development
 PUBLIC_PATH=/
 ASSETS_PATH=raex
-TITLE=绿洲宇宙
+TITLE=Comos
 VUE_APP_PAGE_TYPE=raex

+ 1 - 1
src/main/comos/.env.production

@@ -2,5 +2,5 @@ VUE_APP_BASE_URL=/
 NODE_ENV=production
 PUBLIC_PATH=/9th/
 ASSETS_PATH=raex
-TITLE=绿洲宇宙
+TITLE=Comos
 VUE_APP_PAGE_TYPE=raex

+ 4 - 4
src/main/comos/src/components/asset/assetInfo.vue

@@ -99,7 +99,7 @@ export default {
 .product {
     width: calc(50vw - 24px);
     margin: 8px;
-    background-color: #1c1e25;
+    background-color: @bg2;
     display: inline-block;
     border-radius: 8px;
     overflow: hidden;
@@ -114,14 +114,14 @@ export default {
 
         .name {
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
         }
 
         .price {
             font-size: @font4;
             font-family: OSP;
-            color: @prim;
+            color: @priceColor;
             line-height: 18px;
             padding: 12px 0;
 
@@ -148,7 +148,7 @@ export default {
             line-height: 24px;
             span {
                 &:last-child {
-                    color: #fff;
+                    color: @text0;
                     font-size: @font1;
                 }
             }

+ 2 - 2
src/main/comos/src/components/product/HashCode.vue

@@ -78,7 +78,7 @@ export default {
     // padding: 0 16px;
     font-size: @font2;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 28px;
     span {
         color: @text3;
@@ -89,7 +89,7 @@ export default {
 .page-title {
     font-size: @font2;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 24px;
     display: flex;
     align-items: center;

+ 1 - 1
src/main/comos/src/components/product/ProductBanner.vue

@@ -144,7 +144,7 @@ export default {
     }
     .mySwiper {
         border-radius: @radius;
-        border: 2px solid #ffffff;
+        border: 2px solid @swiper-border;
         padding: 5px;
         .detail-animate();
         .swiper-slide {

+ 1 - 1
src/main/comos/src/components/product/ProductTitle.vue

@@ -20,7 +20,7 @@ export default {
 <style lang="less" scoped>
 .product-title {
     font-size: @font4;
-    color: #ffffff;
+    color: @text0;
     line-height: 44px;
     padding: 0 20px;
     position: relative;

+ 1 - 1
src/main/comos/src/components/product/productInfo.vue

@@ -132,7 +132,7 @@ export default {
         .price {
             font-size: @font4;
             font-family: OSP;
-            color: @prim;
+            color: @priceColor;
             line-height: 18px;
             padding: 12px 0;
 

+ 8 - 8
src/main/comos/src/components/product/productLarge.vue

@@ -9,7 +9,7 @@
         class="product"
     >
         <van-image
-            :radius="30"
+            :radius="4"
             width="100%"
             height="calc(100vw - 32px)"
             :src="getImg(changeImgs(info.pic))"
@@ -117,11 +117,11 @@ export default {
 <style lang="less" scoped>
 .product {
     width: calc(100vw - 32px);
-    margin: 8px 16px;
+    margin: 15px 12px;
     position: relative;
     background-color: @bg2;
     display: inline-block;
-    border-radius: 30px;
+    border-radius: 4px;
     overflow: hidden;
 
     .bg {
@@ -182,11 +182,11 @@ export default {
                 height: 20px;
                 display: inline-block;
                 &.sales-fir {
-                    background: @prim;
-                    color: @bg;
+                    background: @salesBgPrim;
+                    color: @salesBgFont;
                 }
-                background-color: @bg3;
-                color: @prim;
+                background-color: @salesBg;
+                color: @salesBgFont;
             }
         }
         .sales + .sales {
@@ -211,7 +211,7 @@ export default {
 
             .price {
                 font-size: @font4;
-                color: @text0;
+                color: @priceColor;
                 line-height: 20px;
                 font-family: OSP;
                 img {

+ 3 - 3
src/main/comos/src/components/product/productSmall.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="product" @click="goNext(info)">
-        <van-image width="100%" height="140px" :radius="30" :src="getImg(info.pic)" fit="cover" />
+        <van-image width="100%" height="170px" :radius="4" :src="getImg(info.pic)" fit="cover" />
 
         <!-- <div class="content">
             <div class="name van-ellipsis">
@@ -30,11 +30,11 @@ export default {
 
 <style lang="less" scoped>
 .product {
-    width: 255px;
+    width: 350px;
     // margin: 8px;
     background-color: @bg2;
     display: inline-block;
-    border-radius: 30px;
+    border-radius: 4px;
     overflow: hidden;
 
     .van-image {

+ 7 - 17
src/main/comos/src/plugins/colors.js

@@ -1,21 +1,11 @@
 export default {
     install(app, options) {
-        if (process.env.VUE_APP_PAGE_TYPE == 'raex') {
-            app.config.globalProperties.$colors = {
-                prim: '#3AB200',
-                warn: '#3AB200',
-                font0: '#000000',
-                bg: '#ffffff',
-                bg3: '#f5f7fa'
-            };
-        } else {
-            app.config.globalProperties.$colors = {
-                prim: '#FDFB60',
-                warn: '#FF8F3E',
-                font0: '#ffffff',
-                bg: '#181818',
-                bg3: '#0f0f0f'
-            };
-        }
+        app.config.globalProperties.$colors = {
+            prim: '#6C6AEB',
+            warn: '#6C6AEB',
+            font0: '#000000',
+            bg: '#ffffff',
+            bg3: '#f5f7fa'
+        };
     }
 };

+ 4 - 4
src/main/comos/src/router/index.js

@@ -242,8 +242,8 @@ const routes = [
         component: () => import('../views/product/Detail.vue'),
         meta: {
             pageType: Page.Every,
-            title: '第九空间',
-            tabColor: '#181818'
+            title: '第九空间'
+            // tabColor: '#181818'
         }
     },
     {
@@ -306,8 +306,8 @@ const routes = [
         component: () => import('../views/asset/Detail.vue'),
         meta: {
             pageType: Page.Every,
-            title: '第九空间',
-            tabColor: '#181818'
+            title: '第九空间'
+            // tabColor: '#181818'
         }
     },
     {

+ 1 - 1
src/main/comos/src/styles/app.less

@@ -150,7 +150,7 @@ input:-webkit-autofill {
 .van-tabs__nav--line.van-tabs__nav--complete {
     padding-left: 16px !important;
     padding-right: 16px !important;
-    border-top: 1px solid #202122;
+    border-top: 1px solid @tabBorder;
     background-color: transparent;
 }
 .van-tabs__line {

+ 12 - 5
src/main/comos/src/styles/common/theme.less

@@ -1,10 +1,10 @@
 @divider: #f2f4f5;
-@prim: #3ab200;
+@prim: #6c6aeb;
 @success: #67c23a;
 @danger: #f56c6c;
-@warn: #3ab200;
+@warn: #6c6aeb;
 @textP: #3ab200;
-@text0: #000000;
+@text0: #26273c;
 @text1: #323233;
 @text2: #606266;
 @text3: #939599;
@@ -15,8 +15,9 @@
 @border4: #f2f6fc;
 @bg: #ffffff;
 @bg2: #ffffff;
-@bg3: #f5f7fa;
-@bgProductDetail: #0f0f0f;
+@bg3: #f3f4f5;
+@bgProductDetail: #f3f4f5;
+@bgProductDetail2: #f7f7fa;
 @menu-text-color: #bfcbd9;
 @menu-text-color-active: #409eff;
 @menu-bg: #324157;
@@ -30,3 +31,9 @@
 @hotBg: #f5f7fa;
 @btnText: #fff;
 @tabBorder: #f5f7fa;
+@swiper-border: #26273c50;
+@priceColor: #ff6464;
+@salesBg: #ffe4c350;
+@salesBgFont: #26273c;
+@salesBgPrim: #ffe4c3;
+@priveBg: #e0e2ff;

+ 9 - 9
src/main/comos/src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="home">
-        <div class="welcom">
+        <!-- <div class="welcom">
             <div class="left">
                 <div class="text1">欢迎您!</div>
                 <div class="text2">探索者!</div>
@@ -11,13 +11,12 @@
                 :radius="32"
                 :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
             ></van-image>
-        </div>
+        </div> -->
 
         <swiper
-            pagination
             class="mySwiper"
             :slidesPerView="'auto'"
-            :spaceBetween="20"
+            :spaceBetween="6"
             :autoplay="{ delay: 3500 }"
             v-if="banners.length > 0"
         >
@@ -26,6 +25,7 @@
             </swiper-slide>
         </swiper>
 
+        <page-title title="热门推荐"></page-title>
         <div class="list">
             <product-large
                 v-for="(item, index) in products"
@@ -204,10 +204,10 @@ export default {
 
 ::v-deep(.mySwiper) {
     // height: 255px;
-    padding-top: 16px;
-    padding-left: 16px;
+    padding-top: 13px;
+    padding-left: 11px;
     box-sizing: border-box;
-    padding-bottom: 35px;
+    // padding-bottom: 35px;
 
     .swiper-pagination {
         bottom: 13px;
@@ -226,11 +226,11 @@ export default {
     }
 }
 .swiper-slide {
-    width: 255px;
+    width: 350px;
 }
 
 .list {
-    padding: 12px 0 100px;
+    padding: 0 0 100px;
 }
 
 .welcom {

+ 2 - 2
src/main/comos/src/views/Index.vue

@@ -84,9 +84,9 @@ export default {
         border: 1px solid @bg3;
     }
     &.bgBack {
-        background-color: #181818;
+        background-color: @bg;
         &::after {
-            border: 1px solid #181818;
+            border: 1px solid @bg3;
         }
     }
 }

+ 7 - 7
src/main/comos/src/views/Store.vue

@@ -293,7 +293,7 @@ export default {
 .top {
     display: flex;
     padding: 10px 16px;
-    background-color: #181818;
+    background-color: @bg;
     .top-btn {
         flex-grow: 1;
         .btn {
@@ -301,7 +301,7 @@ export default {
             line-height: 26px;
             display: inline-block;
             vertical-align: text-bottom;
-            color: #fff;
+            color: @text0;
 
             &.active {
                 color: @prim;
@@ -323,7 +323,7 @@ export default {
 }
 
 .van-tabs {
-    background-color: #181818;
+    background-color: @bg;
 }
 .select {
     position: absolute;
@@ -337,7 +337,7 @@ export default {
 // }
 
 .discover {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     min-height: 100vh;
     box-sizing: border-box;
 }
@@ -388,18 +388,18 @@ export default {
 }
 /deep/.coupon {
     &::after {
-        background-color: #181818;
+        background-color: @bg3;
     }
 
     .coupon-bottom {
         &::before,
         &::after {
-            background-color: #0f0f0f;
+            background-color: @bg3;
         }
     }
     .btn {
         &::after {
-            background-color: #181818;
+            background-color: @bg3;
         }
     }
 }

+ 2 - 2
src/main/comos/src/views/account/Introduction.vue

@@ -7,7 +7,7 @@
                     RAEX绿洲是全球领先的专业艺术品生态簇运营商,重点打造“全球领先数字藏品生态簇”的产业闭环,持续塑造推出中国权威数字文创商品,参与全球数字藏品定价体系,加速“一带一路”的全球文化内容输出。在这里您可以创造、收集、售卖您的艺术品及数字手办潮玩,感受全球顽家为您带来的新奇别致体验,共同探索艺术宇宙的真实奥秘!欢迎您的加入!
                 </p>
                 <p>
-                    绿洲宇宙,是元宇宙游戏《The Oasis绿洲》旗下重要的艺术品生态簇底层架构及原生内容展示平台,是《The
+                    Comos,是元宇宙游戏《The Oasis绿洲》旗下重要的艺术品生态簇底层架构及原生内容展示平台,是《The
                     Oasis绿洲》体系中的核心载体之一。
                 </p>
                 <p>
@@ -15,7 +15,7 @@
                     Oasis绿洲》的重要特征是开放和自由创作,且可进行不断扩张,摆脱了现实世界时间和空间的束缚,让用户能够放飞自己的想象力,在虚拟世界里自由搭建自己想要做的东西,并在用户互动中碰撞出更多的灵感火花。用户可以搭建建筑并展出自己的成果。用户购买虚拟地产后,可以通过搭建自己喜欢的建筑,展示自己的数字藏品,或者搭建自己的办公室甚至可以在里面开餐厅、数字展厅等。这些成果还可以在项目内进行交易、展览,获得项目积分支持。
                 </p>
                 <p>
-                    绿洲宇宙于全球范围内持续性引入世界级IP,建立强大且完善的IP数据库:包含演艺明星、体育赛事、科技潮玩,潮流音乐,当红小说、知名艺术品及流量动漫在内的多种配置。
+                    Comos于全球范围内持续性引入世界级IP,建立强大且完善的IP数据库:包含演艺明星、体育赛事、科技潮玩,潮流音乐,当红小说、知名艺术品及流量动漫在内的多种配置。
                 </p>
             </div>
         </div>

+ 1 - 1
src/main/comos/src/views/account/Question.vue

@@ -11,7 +11,7 @@
                 <p>您好~已购买的数字藏品是经过蚂蚁链确权,权属清晰、数量透明,永不增发的藏品,极具收藏价值。</p>
                 <h6>3.如何购买数字藏品?</h6>
                 <p>您好~购买步骤如下:</p>
-                <p>1)下载绿洲宇宙;</p>
+                <p>1)下载Comos;</p>
                 <p>2)注册账号;</p>
                 <p>3)浏览首页/发现页中的商品;</p>
                 <p>4)点击“立即购买“,付款;</p>

+ 26 - 27
src/main/comos/src/views/asset/Detail.vue

@@ -638,7 +638,7 @@ export default {
         font-size: @font2;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
     /deep/ .van-cell {
@@ -668,7 +668,7 @@ export default {
         .text1 {
             font-size: @font1;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
         }
         .text2 {
@@ -726,7 +726,7 @@ export default {
             color: #949699;
             line-height: 16px;
             span {
-                color: #fff;
+                color: @text0;
             }
         }
 
@@ -743,7 +743,7 @@ export default {
     .title {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 28px;
         // margin-top: 12px;
     }
@@ -780,7 +780,7 @@ export default {
     .van-cell__title {
         margin-left: 12px;
         .text1 {
-            color: #fff;
+            color: @text0;
             font-size: @font1;
             line-height: 24px;
         }
@@ -799,7 +799,7 @@ export default {
     /deep/ .van-popup {
         width: 260px;
         .linear();
-        border-radius: 10px;
+        border-radius: 4px;
         padding: 0 0;
         .con {
             display: flex;
@@ -809,7 +809,7 @@ export default {
             .Whisper {
                 font-size: 16px;
                 font-weight: 400;
-                color: #000000;
+                color: #fff;
                 line-height: 24px;
             }
             .icon {
@@ -825,8 +825,7 @@ export default {
         }
         .Whisper1 {
             font-size: @font1;
-            font-weight: 400;
-            color: #303133;
+            color: #fff;
             line-height: 18px;
             padding-bottom: 36px;
             margin: 0 auto;
@@ -960,18 +959,18 @@ export default {
         .text1 {
             font-size: @font1;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 28px;
         }
         .text2 {
             width: 94px;
             height: 32px;
-            background: linear-gradient(135deg, @prim, @warn);
+            background: #9395a4;
             border-radius: 4px;
             margin-left: 14px;
             line-height: 30px;
             text-align: center;
-            color: #ffffff;
+            color: @text0;
             position: relative;
             font-size: @font1;
             margin-left: 0;
@@ -1002,13 +1001,13 @@ export default {
                 margin-right: 4px;
             }
             &.prim {
-                color: @text3;
-                border: 1px solid #303133;
-                background: #202122;
+                color: @text0;
+                // border: 1px solid #9395A4;
+                background: #9395a466;
             }
         }
         .text4 {
-            color: #ffffff;
+            color: @text0;
             line-height: 22px;
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
             -webkit-background-clip: text;
@@ -1085,7 +1084,7 @@ export default {
     // padding: 0 16px;
     font-size: @font2;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 28px;
     span {
         color: @text3;
@@ -1132,7 +1131,7 @@ export default {
 
     .text2 {
         font-size: @font1;
-        color: #ffffff;
+        color: @text0;
         line-height: 18px;
         z-index: 1;
         white-space: nowrap;
@@ -1141,13 +1140,13 @@ export default {
 
 .page-text {
     font-size: @font2;
-    color: #ffffff;
+    color: @text0;
     line-height: 28px;
     word-break: break-all;
     // margin-top: 10px;
     // p {
     //     font-size: @font2;
-    //     color: #ffffff;
+    //     color: @text0;
     //     line-height: 28px;
     //     // margin-top: 10px;
     //     word-break: break-all;
@@ -1160,7 +1159,7 @@ export default {
     bottom: 0;
     left: 0;
     right: 0;
-    background: #202122ee;
+    background: @bg;
     .btns {
         padding: 6px 42px;
     }
@@ -1269,7 +1268,7 @@ export default {
     .name {
         font-size: @font4;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         padding: 10px 25px;
         position: relative;
@@ -1338,7 +1337,7 @@ export default {
 .detail-name {
     font-size: @font4;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     padding: 10px 25px;
     position: relative;
@@ -1376,12 +1375,12 @@ export default {
 }
 .goods {
     // padding: 0 16px 0px;
-    background-color: #1c1c1c;
+    background-color: @bgProductDetail2;
 
     .page-title {
         font-size: @font2;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         display: flex;
         align-items: center;
@@ -1441,7 +1440,7 @@ export default {
 
 /deep/.van-collapse-item__content {
     padding: 12px 16px !important;
-    background-color: #131313 !important;
+    background-color: @bgProductDetail !important;
 }
 
 .user-detail {
@@ -1460,7 +1459,7 @@ export default {
         flex-grow: 1;
     }
     .text3 {
-        color: #fff;
+        color: @text0;
         width: 48px;
         flex-shrink: 0;
         margin-right: 20px;

+ 34 - 49
src/main/comos/src/views/product/Detail.vue

@@ -14,11 +14,11 @@
             <div class="price-line">
                 <div class="text" v-if="info.number">编号 {{ info.number }}</div>
                 <div class="text total" v-if="info.salable && info.total > 1">
-                    <span>限量</span>
+                    <span class="sales-fir">限量</span>
                     <span>{{ info.total }}份</span>
                 </div>
                 <div class="text" v-if="info.salable && !isSold && info.total !== 1">
-                    <span>已售 {{ info.sale }}</span>
+                    <span class="sales-fir">已售 {{ info.sale }}</span>
                     <span>剩余 {{ info.stock }}</span>
                 </div>
             </div>
@@ -474,7 +474,7 @@ export default {
         width: 94px;
         height: 32px;
         color: #000;
-        background: linear-gradient(48deg, @prim 0%, @warn 100%);
+        background: @priveBg;
         border-radius: 4px;
         &.prim {
             background: #202122;
@@ -490,7 +490,7 @@ export default {
             font-size: @font1;
             text-align: center;
             margin-left: 2px;
-            color: @btnText;
+            color: @prim;
         }
     }
 }
@@ -508,7 +508,7 @@ export default {
         .name1 {
             font-size: 14px;
             font-weight: 400;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
         }
         .name2 {
@@ -547,7 +547,7 @@ export default {
             color: #949699;
             line-height: 16px;
             span {
-                color: #fff;
+                color: @text0;
             }
         }
 
@@ -560,36 +560,21 @@ export default {
 
         .text {
             font-size: @font1;
-            color: @text3;
             line-height: 20px;
             height: 20px;
-            background-color: #27272b;
             border-radius: 4px;
-            padding: 0 10px;
-
-            span + span {
-                margin-left: 10px;
-            }
+            overflow: hidden;
 
-            &.total {
-                padding: 0 0;
-                border-radius: 4px;
-                overflow: hidden;
-                span {
-                    display: inline-block;
-                    padding: 0 12px;
-                    &:first-child {
-                        background-color: @prim;
-                        color: #fff;
-                    }
-                    &:last-child {
-                        color: @prim;
-                        background-color: #27272b;
-                    }
-                }
-
-                span + span {
-                    margin-left: 0px;
+            span {
+                background-color: @salesBg;
+                color: @salesBgFont;
+                padding: 0 10px;
+                line-height: 20px;
+                height: 20px;
+                display: inline-block;
+                &.sales-fir {
+                    background: @salesBgPrim;
+                    color: @salesBgFont;
                 }
             }
         }
@@ -601,7 +586,7 @@ export default {
     .title {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 28px;
         margin-top: 12px;
     }
@@ -644,7 +629,7 @@ export default {
         font-size: @font2;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
     /deep/ .van-cell {
@@ -658,7 +643,7 @@ export default {
     .van-cell__title {
         margin-left: 6px !important;
         .text1 {
-            color: #fff;
+            color: @text0;
             font-size: @font1;
             line-height: 20px;
         }
@@ -683,7 +668,7 @@ export default {
 .titleIcon {
     font-size: @font2;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 24px;
     // padding: 30px 0 0 16px;
     span {
@@ -709,7 +694,7 @@ export default {
         .text1 {
             font-size: @font2;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 28px;
         }
         .text2 {
@@ -720,7 +705,7 @@ export default {
             margin-left: 14px;
             line-height: 32px;
             text-align: center;
-            color: #ffffff;
+            color: @text0;
             &.text3 {
                 display: flex;
                 align-items: center;
@@ -771,12 +756,12 @@ export default {
 
 .goods {
     // padding: 0 16px 0px;
-    background-color: #1c1c1c;
+    background-color: @bgProductDetail2;
 
     .page-title {
         font-size: @font2;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         display: flex;
         align-items: center;
@@ -797,7 +782,7 @@ export default {
 }
 .qiaohua {
     border-radius: 4px;
-    background: linear-gradient(45deg, @prim, @warn);
+    background: linear-gradient(45deg, #9395a4, #9395a4);
     position: relative;
     width: 94px;
     display: flex;
@@ -883,7 +868,7 @@ export default {
 
     .text2 {
         font-size: @font1;
-        color: #ffffff;
+        color: @text0;
         line-height: 18px;
         z-index: 1;
         white-space: nowrap;
@@ -892,7 +877,7 @@ export default {
 
 .page-text {
     font-size: @font2;
-    color: #ffffff;
+    color: @text0;
     line-height: 28px;
     word-break: break-all;
     // margin-top: 10px;
@@ -908,7 +893,7 @@ export default {
     bottom: 0;
     left: 0;
     right: 0;
-    background-color: @bgProductDetail;
+    background-color: @bg;
     // background: #202122ee;
 
     // filter: blur(19px);
@@ -1038,7 +1023,7 @@ export default {
     .price {
         font-size: 32px;
         font-family: OSP-DIN, OSP;
-        color: @prim;
+        color: @priceColor;
         line-height: 26px;
         display: flex;
         align-items: center;
@@ -1071,9 +1056,9 @@ export default {
     width: 94px;
     height: 30px;
     border-radius: 4px;
-    background: linear-gradient(135deg, @prim, @warn);
+    background: linear-gradient(135deg, #9395a4, #9395a4);
     font-size: @font1;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     text-align: center;
     position: relative;
@@ -1096,7 +1081,7 @@ export default {
 }
 /deep/.van-collapse-item__content {
     padding: 12px 16px !important;
-    background-color: #131313 !important;
+    background-color: @bgProductDetail !important;
 }
 
 .user-detail {
@@ -1117,7 +1102,7 @@ export default {
         min-width: 95px;
     }
     .text3 {
-        color: #fff;
+        color: @text0;
         width: 64px;
         margin-right: 10px;
         flex-basis: 0;

+ 1 - 1
src/main/comos/vue.config.js

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

+ 5 - 1
src/main/nine-space/src/views/asset/Consignment.vue

@@ -88,6 +88,10 @@ export default {
         },
         submit() {
             if (this.price != '') {
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true
+                });
                 this.$http
                     .post('/user/verifyTradeCode', {
                         tradeCode: this.password
@@ -106,7 +110,7 @@ export default {
                             })
                             .catch(e => {
                                 if (e) {
-                                    this.$toast.success(e.error);
+                                    this.$toast(e.error);
                                 }
                             });
                     })

+ 10 - 2
src/main/nine-space/src/views/asset/Detail.vue

@@ -245,8 +245,8 @@
             <div v-if="list2.type === 'code'">
                 <div class="copy">
                     <div class="id">
-                        <!-- {{ list2.detail }} -->
-                        yshsbn
+                        {{ list2.detail }}
+                        <!-- yshsbn -->
                     </div>
                     <img class="copyImg" @click="copy" src="@assets/svgs/copy_icon.svg" alt="" />
                 </div>
@@ -472,6 +472,10 @@ export default {
                             message: '确定取消寄售吗?'
                         })
                             .then(() => {
+                                this.$toast.loading({
+                                    message: '加载中...',
+                                    forbidClick: true
+                                });
                                 return this.$http.post(`/asset/cancelConsignment?id=${this.info.id}`);
                             })
                             .then(res => {
@@ -508,6 +512,10 @@ export default {
                     title: '公开展示',
                     message: '藏品将公开展示,无报价'
                 }).then(() => {
+                    this.$toast.loading({
+                        message: '加载中...',
+                        forbidClick: true
+                    });
                     return this.$http
                         .post(`/asset/publicShow?id=${this.info.id}`)
                         .then(res => {