首頁 探索 說明
註冊 登入
licailing
/
modern_point
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

xuqiang 4 年之前
父節點
e3f8324553 7828a84c90
當前提交
fa543b42eb
共有 36 個文件被更改，包括 326 次插入 和 124 次删除
統一視圖 顯示文件統計
  1. 6 0
      src/main/java/com/izouma/nineth/repo/UserRepo.java
  2. 1 0
      src/main/java/com/izouma/nineth/service/UserService.java
  3. 1 1
      src/main/nine-space/.env.development
  4. 2 2
      src/main/nine-space/src/mixins/common.js
  5. 3 3
      src/main/nine-space/src/views/product/Detail.vue
  6. 5 1
      src/main/pc-space/public/index.html
  7. 二進制
      src/main/pc-space/src/assets/img/icon_jiage@3x.png
  8. 二進制
      src/main/pc-space/src/assets/img/like.png
  9. 4 4
      src/main/pc-space/src/components/CollectionInfo.vue
  10. 1 1
      src/main/pc-space/src/components/FansInfo.vue
  11. 2 2
      src/main/pc-space/src/components/GoodsInfo.vue
  12. 1 1
      src/main/pc-space/src/components/LoginInfo.vue
  13. 64 0
      src/main/pc-space/src/components/MoreTitle.vue
  14. 1 1
      src/main/pc-space/src/components/PageHeader.vue
  15. 1 1
      src/main/pc-space/src/components/RegisterInfo.vue
  16. 4 4
      src/main/pc-space/src/components/SecurityPhone.vue
  17. 3 3
      src/main/pc-space/src/components/TransactionPhone.vue
  18. 2 2
      src/main/pc-space/src/plugins/http.js
  19. 4 4
      src/main/pc-space/src/styles/common.less
  20. 5 2
      src/main/pc-space/src/styles/list.less
  21. 1 1
      src/main/pc-space/src/views/CastingDetail.vue
  22. 6 6
      src/main/pc-space/src/views/CollectionDetail.vue
  23. 179 55
      src/main/pc-space/src/views/Home.vue
  24. 1 1
      src/main/pc-space/src/views/My.vue
  25. 1 1
      src/main/pc-space/src/views/user/AccountData.vue
  26. 1 1
      src/main/pc-space/src/views/user/Authentication.vue
  27. 4 4
      src/main/pc-space/src/views/user/EnterpriseAuthentication.vue
  28. 1 1
      src/main/pc-space/src/views/user/Fans.vue
  29. 2 2
      src/main/pc-space/src/views/user/Give.vue
  30. 1 1
      src/main/pc-space/src/views/user/Modifypad.vue
  31. 1 1
      src/main/pc-space/src/views/user/Personal.vue
  32. 3 3
      src/main/pc-space/src/views/user/Security.vue
  33. 4 4
      src/main/pc-space/src/views/user/SecuritySuccess.vue
  34. 3 3
      src/main/pc-space/src/views/user/Transaction.vue
  35. 4 4
      src/main/pc-space/src/views/user/TransactionSuccess.vue
  36. 4 4
      src/main/pc-space/src/views/user/UserAuthentication.vue

+ 6 - 0
src/main/java/com/izouma/nineth/repo/UserRepo.java
查看文件 

@@ -2,11 +2,13 @@ package com.izouma.nineth.repo;
 
 
 
 import com.izouma.nineth.domain.User;
 
 import com.izouma.nineth.domain.User;
 
 import com.izouma.nineth.security.Authority;
 
 import com.izouma.nineth.security.Authority;
 
+import org.springframework.cache.annotation.CacheEvict;
 
 import org.springframework.cache.annotation.Cacheable;
 
 import org.springframework.cache.annotation.Cacheable;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import org.springframework.data.jpa.repository.Modifying;
 
 import org.springframework.data.jpa.repository.Modifying;
 
 import org.springframework.data.jpa.repository.Query;
 
 import org.springframework.data.jpa.repository.Query;
 
+import org.springframework.lang.NonNull;
 
 
 
 import javax.transaction.Transactional;
 
 import javax.transaction.Transactional;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -18,6 +20,10 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
 
     @Query("update User u set u.del = true where u.id = ?1")
 
     @Query("update User u set u.del = true where u.id = ?1")
 
     void softDelete(Long id);
 
     void softDelete(Long id);
 
 
 
+    @CacheEvict(value = "user", key = "#user.username")
 
+    @NonNull
 
+    User save(@NonNull User user);
 
+
 
     @Cacheable("user")
 
     @Cacheable("user")
 
     User findByUsernameAndDelFalse(String username);
 
     User findByUsernameAndDelFalse(String username);

+ 1 - 0
src/main/java/com/izouma/nineth/service/UserService.java
查看文件 

@@ -115,6 +115,7 @@ public class UserService {
 
                 .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
 
                 .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
 
                 .username(name)
 
                 .username(name)
 
                 .nickname(name)
 
                 .nickname(name)
 
+                .password(password)
 
                 .avatar(Constants.DEFAULT_AVATAR)
 
                 .avatar(Constants.DEFAULT_AVATAR)
 
                 .phone(phone)
 
                 .phone(phone)
 
                 .build());
 
                 .build());

+ 1 - 1
src/main/nine-space/.env.development
查看文件 

@@ -1 +1 @@
 
-VUE_APP_BASE_URL=https://nft.9space.vip
 
+VUE_APP_BASE_URL=http://localhost:8080

+ 2 - 2
src/main/nine-space/src/mixins/common.js
查看文件 

@@ -61,7 +61,7 @@ export default {
 
                 return Promise.resolve(res.data);
 
                 return Promise.resolve(res.data);
 
             });
 
             });
 
         },
 
         },
 
-        getImg(imgs = '', type = '') {
 
+        getImg(imgs = '', type = '', size = 600) {
 
             if (!imgs) {
 
             if (!imgs) {
 
                 imgs = '';
 
                 imgs = '';
 
             }
 
             }
 
@@ -74,7 +74,7 @@ export default {
 
             });
 
             });
 
             if (imgs.length > 0) {
 
             if (imgs.length > 0) {
 
                 let img = type ? imgs[0][type] : imgs[0];
 
                 let img = type ? imgs[0][type] : imgs[0];
 
-                return img + (/\.gif$/i.test(img) ? '' : '?x-oss-process=image/resize,h_300,m_lfit');
 
+                return img + (/\.gif$/i.test(img) ? '' : `?x-oss-process=image/resize,h_${size},m_lfit`);
 
             } else {
 
             } else {
 
                 return '';
 
                 return '';
 
             }
 
             }

+ 3 - 3
src/main/nine-space/src/views/product/Detail.vue
查看文件 

@@ -8,7 +8,7 @@
 
                     class="swiper-video"
 
                     class="swiper-video"
 
                     v-if="isVideo(item)"
 
                     v-if="isVideo(item)"
 
                     :src="item.url"
 
                     :src="item.url"
 
-                    :poster="getImg(changeImgs([item]))"
 
+                    :poster="getImg(changeImgs([item]), '', 1200)"
 
                     controls="controls"
 
                     controls="controls"
 
                 >
 
                 >
 
                     您的浏览器不支持 video 标签。
 
                     您的浏览器不支持 video 标签。
 
@@ -16,7 +16,7 @@
 
                 <van-image
 
                 <van-image
 
                     v-else
 
                     v-else
 
                     @click="preview(index, changeImgs(banners))"
 
                     @click="preview(index, changeImgs(banners))"
 
-                    :src="getImg(item.url)"
 
+                    :src="getImg(item.url, '', 1200)"
 
                     width="100vw"
 
                     width="100vw"
 
                     height="100vw"
 
                     height="100vw"
 
                     fit="scale-down"
 
                     fit="scale-down"
 
@@ -84,7 +84,7 @@
 
                         <van-image
 
                         <van-image
 
                             width="100%"
 
                             width="100%"
 
                             height="170"
 
                             height="170"
 
-                            :src="getImg(item)"
 
+                            :src="getImg(item, '', 1000)"
 
                             fit="cover"
 
                             fit="cover"
 
                             radius="12"
 
                             radius="12"
 
                             @click="preview(index, boxs)"
 
                             @click="preview(index, boxs)"

+ 5 - 1
src/main/pc-space/public/index.html
查看文件 

@@ -8,8 +8,12 @@
 
         <title><%= htmlWebpackPlugin.options.title %></title>
 
         <title><%= htmlWebpackPlugin.options.title %></title>
 
         <link rel="stylesheet" href="./client.css" />
 
         <link rel="stylesheet" href="./client.css" />
 
         <link rel="stylesheet" href="https://at.alicdn.com/t/font_2852142_86r1qgys8y5.css" />
 
         <link rel="stylesheet" href="https://at.alicdn.com/t/font_2852142_86r1qgys8y5.css" />
 
+        <link
 
+        rel="stylesheet"
 
+        href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
 
+      />
 
     </head>
 
     </head>
 
-    <body>
 
+     <body>
 
         <noscript>
 
         <noscript>
 
             <strong
 
             <strong
 
                 >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript
 
                 >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript

二進制
src/main/pc-space/src/assets/img/icon_jiage@3x.png
查看文件


二進制
src/main/pc-space/src/assets/img/like.png
查看文件


+ 4 - 4
src/main/pc-space/src/components/CollectionInfo.vue
查看文件 

@@ -6,7 +6,7 @@
 
                 id: info.id
 
                 id: info.id
 
             }
 
             }
 
         }"
 
         }"
 
-        class="content"
 
+        class="collect"
 
     >
 
     >
 
         <el-image class="imgBox" :src="getImg(changeImgs(info.pics))" fit="cover"></el-image>
 
         <el-image class="imgBox" :src="getImg(changeImgs(info.pics))" fit="cover"></el-image>
 
 
 
@@ -86,7 +86,7 @@ export default {
 
 };
 
 };
 
 </script>
 
 </script>
 
 <style lang="less" scoped>
 
 <style lang="less" scoped>
 
-.content {
 
+.collect {
 
     .line();
 
     .line();
 
     width: 276px;
 
     width: 276px;
 
     height: 416px;
 
     height: 416px;
 
@@ -148,7 +148,7 @@ export default {
 
             font-size: 30px;
 
             font-size: 30px;
 
             font-family: OSP-DIN, OSP;
 
             font-family: OSP-DIN, OSP;
 
             font-weight: normal;
 
             font-weight: normal;
 
-            color: #00ffcb;
 
+            color: @prim;
 
             line-height: 30px;
 
             line-height: 30px;
 
         }
 
         }
 
         .time {
 
         .time {
 
@@ -163,7 +163,7 @@ export default {
 
             span {
 
             span {
 
                 font-size: 14px;
 
                 font-size: 14px;
 
                 font-weight: 400;
 
                 font-weight: 400;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 24px;
 
                 line-height: 24px;
 
                 margin-left: 6px;
 
                 margin-left: 6px;
 
             }
 
             }

+ 1 - 1
src/main/pc-space/src/components/FansInfo.vue
查看文件 

@@ -35,7 +35,7 @@ export default {
 
     .top {
 
     .top {
 
         height: 146px;
 
         height: 146px;
 
         width: 100%;
 
         width: 100%;
 
-        background: #00ffcb;
 
+        background: @prim;
 
     }
 
     }
 
     .top1 {
 
     .top1 {
 
         display: flex;
 
         display: flex;

+ 2 - 2
src/main/pc-space/src/components/GoodsInfo.vue
查看文件 

@@ -98,7 +98,7 @@ export default {
 
                 font-size: 30px;
 
                 font-size: 30px;
 
                 font-family: OSP-DIN, OSP;
 
                 font-family: OSP-DIN, OSP;
 
                 font-weight: normal;
 
                 font-weight: normal;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 30px;
 
                 line-height: 30px;
 
             }
 
             }
 
             .time {
 
             .time {
 
@@ -113,7 +113,7 @@ export default {
 
                 span {
 
                 span {
 
                     font-size: 14px;
 
                     font-size: 14px;
 
                     font-weight: 400;
 
                     font-weight: 400;
 
-                    color: #00ffcb;
 
+                    color: @prim;
 
                     line-height: 24px;
 
                     line-height: 24px;
 
                     margin-left: 6px;
 
                     margin-left: 6px;
 
                 }
 
                 }

+ 1 - 1
src/main/pc-space/src/components/LoginInfo.vue
查看文件 

@@ -296,7 +296,7 @@ export default {
 
             width: 330px;
 
             width: 330px;
 
             height: 40px;
 
             height: 40px;
 
             line-height: 40px;
 
             line-height: 40px;
 
-            background: linear-gradient(135deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(135deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             font-size: 13px;
 
             font-size: 13px;
 
             color: #fff;
 
             color: #fff;

+ 64 - 0
src/main/pc-space/src/components/MoreTitle.vue
查看文件 

@@ -0,0 +1,64 @@
 
+<template>
 
+    <div class="more">
 
+        <i class="el-icon-d-arrow-left animate__animated"></i>
 
+        <div v-if="!path" class="name animate__animated" @click="wait"><slot>查看更多</slot></div>
 
+        <router-link v-else :to="path" class="name animate__animated">
 
+            <slot>查看更多</slot>
 
+        </router-link>
 
+        <i class="el-icon-d-arrow-right animate__animated"></i>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    props: {
 
+        path: {
 
+            type: String,
 
+            default: ''
 
+        }
 
+    },
 
+    methods: {
 
+        wait() {
 
+            this.$message.warning('敬请期待');
 
+        }
 
+    }
 
+};
 
+</script>
 
+
 
+<style lang="less" scoped>
 
+.more {
 
+    width: 200px;
 
+    margin: auto;
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+    padding: 20px;
 
+    .name {
 
+        font-size: 16px;
 
+        color: #ffffff;
 
+        line-height: 24px;
 
+        padding: 20px;
 
+        cursor: pointer;
 
+        display: inline-block;
 
+    }
 
+    i {
 
+        font-size: 16px;
 
+        color: #ffffff99;
 
+        font-weight: bold;
 
+    }
 
+
 
+    &:hover {
 
+        i {
 
+            animation-iteration-count: infinite;
 
+            animation-duration: 1s;
 
+            animation-delay: 0.3s;
 
+            &:last-child {
 
+                animation-name: fadeOutRight;
 
+            }
 
+            &:first-child {
 
+                animation-name: fadeOutLeft;
 
+            }
 
+        }
 
+    }
 
+}
 
+</style>

+ 1 - 1
src/main/pc-space/src/components/PageHeader.vue
查看文件 

@@ -197,7 +197,7 @@ export default {
 
                 // border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
 
                 // border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
 
                 line-height: 30px;
 
                 line-height: 30px;
 
                 text-align: center;
 
                 text-align: center;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 font-size: 16px;
 
                 font-size: 16px;
 
                 // .line();
 
                 // .line();
 
                 margin: 0 30px;
 
                 margin: 0 30px;

+ 1 - 1
src/main/pc-space/src/components/RegisterInfo.vue
查看文件 

@@ -287,7 +287,7 @@ export default {
 
             width: 330px;
 
             width: 330px;
 
             height: 40px;
 
             height: 40px;
 
             line-height: 40px;
 
             line-height: 40px;
 
-            background: linear-gradient(135deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(135deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             font-size: 13px;
 
             font-size: 13px;
 
             color: #fff;
 
             color: #fff;

+ 4 - 4
src/main/pc-space/src/components/SecurityPhone.vue
查看文件 

@@ -11,7 +11,7 @@
 
             </el-form-item>
 
             </el-form-item>
 
             <el-form-item label="验证码" prop="code">
 
             <el-form-item label="验证码" prop="code">
 
                 <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
                 <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
-                    <span @click="send" style="color: #00ffcb; cursor: pointer; font-size: 13px" slot="suffix">{{
 
+                    <span @click="send" style="color: @prim; cursor: pointer; font-size: 13px" slot="suffix">{{
 
                         time === 0 ? '发送验证码' : `重新发送${time}s`
 
                         time === 0 ? '发送验证码' : `重新发送${time}s`
 
                     }}</span>
 
                     }}</span>
 
                 </el-input>
 
                 </el-input>
 
@@ -84,14 +84,14 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(2) {
 
 /deep/.el-step:nth-child(2) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%) !important;
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%) !important;
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -134,7 +134,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
     }
 
     }
 
 }
 
 }

+ 3 - 3
src/main/pc-space/src/components/TransactionPhone.vue
查看文件 

@@ -90,14 +90,14 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(2) {
 
 /deep/.el-step:nth-child(2) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%) !important;
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%) !important;
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -140,7 +140,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
     }
 
     }
 
 }
 
 }

+ 2 - 2
src/main/pc-space/src/plugins/http.js
查看文件 

@@ -4,9 +4,9 @@ import qs from 'qs';
 
 let baseUrl = 'http://localhost:8080';
 
 let baseUrl = 'http://localhost:8080';
 
 switch (process.env.NODE_ENV) {
 
 switch (process.env.NODE_ENV) {
 
     case 'development':
 
     case 'development':
 
-        baseUrl = 'https://nft.9space.vip';
 
+        // baseUrl = 'https://nft.9space.vip';
 
         // baseUrl = 'http://192.168.50.190:8080';
 
         // baseUrl = 'http://192.168.50.190:8080';
 
-        // baseUrl = 'http://localhost:8080';
 
+        baseUrl = 'http://localhost:8080';
 
         // baseUrl = 'http://192.168.50.190:8080';
 
         // baseUrl = 'http://192.168.50.190:8080';
 
         break;
 
         break;
 
     case 'test':
 
     case 'test':

+ 4 - 4
src/main/pc-space/src/styles/common.less
查看文件 

@@ -1,7 +1,7 @@
 
-@warn: #0071FD;
 
+@warn: #ff8f3e;
 
 @success: #07c160;
 
 @success: #07c160;
 
 @danger: #ea2d2d;
 
 @danger: #ea2d2d;
 
-@prim: #00ffcb;
 
+@prim: #fdfb60;
 
 @info: #939599;
 
 @info: #939599;
 
 @text0: #181818;
 
 @text0: #181818;
 
 @text1: #323233;
 
 @text1: #323233;
 
@@ -123,7 +123,7 @@
 
     }
 
     }
 
 }
 
 }
 
 
 
-.line(@bg:#1c1e26,@radius:6px,@color1:rgba(0, 255, 203, 1),@color2:rgba(0, 110, 255, 1)) {
 
+.line(@bg:#1c1e26,@radius:6px,@color1:@prim,@color2:@warn) {
 
     background-image: linear-gradient(135deg, @color1, @color2);
 
     background-image: linear-gradient(135deg, @color1, @color2);
 
     position: relative;
 
     position: relative;
 
     padding: 1px;
 
     padding: 1px;
 
@@ -151,7 +151,7 @@
 
         right: 0;
 
         right: 0;
 
         bottom: 0;
 
         bottom: 0;
 
         top: 0;
 
         top: 0;
 
-        background-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1));
 
+        background-image: linear-gradient(135deg, @color1, @color2);
 
         transform-origin: center center;
 
         transform-origin: center center;
 
         animation: spin ease-in-out 3s;
 
         animation: spin ease-in-out 3s;
 
         animation-iteration-count: 0;
 
         animation-iteration-count: 0;

+ 5 - 2
src/main/pc-space/src/styles/list.less
查看文件 

@@ -116,7 +116,7 @@
 
             .follow {
 
             .follow {
 
                 width: 70px;
 
                 width: 70px;
 
                 height: 26px;
 
                 height: 26px;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 font-size: 14px;
 
                 font-size: 14px;
 
                 border-radius: 16px;
 
                 border-radius: 16px;
 
                 border: 1px solid;
 
                 border: 1px solid;
 
@@ -138,7 +138,7 @@
 
         width: 140px;
 
         width: 140px;
 
     }
 
     }
 
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
 
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
 
-        background: linear-gradient(46deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(46deg, @prim 0%, @warn 100%);
 
         color: #fff;
 
         color: #fff;
 
         border-color: #fff;
 
         border-color: #fff;
 
     }
 
     }
 
@@ -162,6 +162,9 @@
 
     .content {
 
     .content {
 
         margin: 16px;
 
         margin: 16px;
 
     }
 
     }
 
+    .collect {
 
+        margin: 16px;
 
+    }
 
 }
 
 }
 
 
 
 .radio-item {
 
 .radio-item {

+ 1 - 1
src/main/pc-space/src/views/CastingDetail.vue
查看文件 

@@ -158,7 +158,7 @@ export default {
 
     height: 240px;
 
     height: 240px;
 
     display: block;
 
     display: block;
 
     /deep/.el-image__error {
 
     /deep/.el-image__error {
 
-        background: linear-gradient(46deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(46deg, @prim 0%, @warn 100%);
 
         color: transparent;
 
         color: transparent;
 
     }
 
     }
 
 }
 
 }

+ 6 - 6
src/main/pc-space/src/views/CollectionDetail.vue
查看文件 

@@ -414,7 +414,7 @@ export default {
 
             span {
 
             span {
 
                 font-size: 16px;
 
                 font-size: 16px;
 
                 font-weight: 400;
 
                 font-weight: 400;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 24px;
 
                 line-height: 24px;
 
                 margin-left: 6px;
 
                 margin-left: 6px;
 
             }
 
             }
 
@@ -463,14 +463,14 @@ export default {
 
                 .price4 {
 
                 .price4 {
 
                     font-size: 40px;
 
                     font-size: 40px;
 
                     font-weight: normal;
 
                     font-weight: normal;
 
-                    color: #00ffcb;
 
+                    color: @prim;
 
                     line-height: 36px;
 
                     line-height: 36px;
 
                     margin-right: 5px;
 
                     margin-right: 5px;
 
                 }
 
                 }
 
                 span {
 
                 span {
 
                     font-size: 16px;
 
                     font-size: 16px;
 
                     font-weight: 400;
 
                     font-weight: 400;
 
-                    color: #00ffcb;
 
+                    color: @prim;
 
                     line-height: 24px;
 
                     line-height: 24px;
 
                 }
 
                 }
 
             }
 
             }
 
@@ -478,7 +478,7 @@ export default {
 
                 height: 52px;
 
                 height: 52px;
 
                 line-height: 52px;
 
                 line-height: 52px;
 
                 text-align: center;
 
                 text-align: center;
 
-                background: linear-gradient(135deg, #00ffcb 0%, #006eff 100%);
 
+                background: linear-gradient(135deg, @prim 0%, @warn 100%);
 
                 border-radius: 8px;
 
                 border-radius: 8px;
 
             }
 
             }
 
         }
 
         }
 
@@ -613,12 +613,12 @@ export default {
 
     width: 100%;
 
     width: 100%;
 
     display: block;
 
     display: block;
 
     height: 52px;
 
     height: 52px;
 
-    background: linear-gradient(135deg, #00ffcb 0%, #006eff 100%);
 
+    background: linear-gradient(135deg, @prim 0%, @warn 100%);
 
     border-radius: 8px;
 
     border-radius: 8px;
 
     border-width: 0;
 
     border-width: 0;
 
     color: #000;
 
     color: #000;
 
     &:hover {
 
     &:hover {
 
-        background: linear-gradient(135deg, darken(#00ffcb, 10%), darken(#006eff, 10%));
 
+        background: linear-gradient(135deg, darken(@prim, 10%), darken(@warn, 10%));
 
     }
 
     }
 
 }
 
 }

+ 179 - 55
src/main/pc-space/src/views/Home.vue
查看文件 

@@ -11,28 +11,45 @@
 
         <!-- <div class="card">33222</div> -->
 
         <!-- <div class="card">33222</div> -->
 
 
 
         <div class="introduce center-content">
 
         <div class="introduce center-content">
 
-            <div class="introduce2">
 
-                <img class="img1" src="../assets/img/888.jpg" alt="" />
 
-                <div>
 
-                    <div class="name">本期推荐：创作者姓名</div>
 
-                    <div class="name name1">作者简介</div>
 
-                    <div class="name2">
 
-                        介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍
 
-                        介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍…
 
+            <router-link
 
+                class="introduce2"
 
+                :class="{ active: index === showCreator }"
 
+                v-for="(item, index) in creators"
 
+                :key="item.id"
 
+                :to="{
 
+                    path: '/castingDetail',
 
+                    query: {
 
+                        id: item.id
 
+                    }
 
+                }"
 
+            >
 
+                <div
 
+                    class="introduce-content"
 
+                    @mouseenter="(showCreator = index), (initChange = false)"
 
+                    @mouseleave="initChange = true"
 
+                >
 
+                    <el-image class="img1" :src="item.avatar" fit="cover" />
 
+                    <div class="">
 
+                        <div class="name">本期推荐：{{ item.nickname }}</div>
 
+                        <div class="name name1">作者简介</div>
 
+                        <div class="name2">
 
+                            {{ item.intro || '该作者什么都没留下～' }}
 
+                        </div>
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
-            </div>
 
-            <img class="img2" src="../assets/img/888.jpg" alt="" />
 
-            <img class="img2" src="../assets/img/888.jpg" alt="" />
 
-            <img class="img2" src="../assets/img/888.jpg" alt="" />
 
+            </router-link>
 
         </div>
 
         </div>
 
-        <div class="content center-content">
 
-            <div class="hot">最HOT收藏品</div>
 
-            <goods-info></goods-info>
 
-            <div class="all all1">
 
-                <img class="img1" src="../assets/img/icon_inter@3x.png" alt="" />
 
-                <div class="name">查看更多</div>
 
-                <img class="img1" src="../assets/img/icon_inter@3x (3).png" alt="" />
 
+        <div class="content">
 
+            <div class="center-content">
 
+                <div class="hot">最HOT收藏品</div>
 
+                <div class="list">
 
+                    <collection-info
 
+                        v-for="(item, index) in products"
 
+                        :key="index"
 
+                        :info.sync="products[index]"
 
+                    ></collection-info>
 
+                </div>
 
+                <more-title path="/collection"></more-title>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
         <div class="content1 center-content">
 
         <div class="content1 center-content">
 
@@ -41,11 +58,7 @@
 
                 <img class="imgBox1" src="../assets/img/888.jpg" alt="" />
 
                 <img class="imgBox1" src="../assets/img/888.jpg" alt="" />
 
                 <img class="imgBox1" src="../assets/img/888.jpg" alt="" />
 
                 <img class="imgBox1" src="../assets/img/888.jpg" alt="" />
 
             </div>
 
             </div>
 
-            <div class="all">
 
-                <img class="img1" src="../assets/img/icon_inter@3x.png" alt="" />
 
-                <div class="name">查看更多</div>
 
-                <img class="img1" src="../assets/img/icon_inter@3x (3).png" alt="" />
 
-            </div>
 
+            <more-title path="/collection"></more-title>
 
             <div class="describe">
 
             <div class="describe">
 
                 <div class="box">
 
                 <div class="box">
 
                     <div class="box1">
 
                     <div class="box1">
 
@@ -96,26 +109,109 @@
 
                     <div class="words2">与收藏夹们共建链上游戏生态的数字现实时间</div>
 
                     <div class="words2">与收藏夹们共建链上游戏生态的数字现实时间</div>
 
                 </div>
 
                 </div>
 
                 <div class="border"></div>
 
                 <div class="border"></div>
 
-                <div>
 
+                <div class="word-item">
 
                     <div class="words1 words3">此为，第九空间</div>
 
                     <div class="words1 words3">此为，第九空间</div>
 
-                    <div class="th2">
 
-                        <img class="img1" src="../assets/img/icon_inter@3x.png" alt="" />
 
-                        <div class="name">了解更多</div>
 
-                        <img class="img1" src="../assets/img/icon_inter@3x (3).png" alt="" />
 
-                    </div>
 
+                    <more-title>了解更多</more-title>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
+import CollectionInfo from '../components/CollectionInfo.vue';
 
 import GoodsInfo from '../components/GoodsInfo.vue';
 
 import GoodsInfo from '../components/GoodsInfo.vue';
 
+import MoreTitle from '../components/MoreTitle.vue';
 
 export default {
 
 export default {
 
-    components: { GoodsInfo },
 
+    components: { GoodsInfo, CollectionInfo, MoreTitle },
 
     data() {
 
     data() {
 
-        return {};
 
+        return {
 
+            creators: [],
 
+            showCreator: 3,
 
+            initChange: true,
 
+            timer: null,
 
+            products: []
 
+        };
 
+    },
 
+    mounted() {
 
+        this.getCreators();
 
+        this.autoChange();
 
+        this.getProduct().then(res => {
 
+            this.products = res;
 
+        });
 
+
 
+        this.$http
 
+                .post(
 
+                    '/banner/all',
 
+                    {
 
+                        query: {
 
+                            type: 'HOME'
 
+                        },
 
+                        sort: 'createdAt,desc'
 
+                    },
 
+                    { body: 'json' }
 
+                )
 
+                .then(res => {
 
+                    this.banners = res.content;
 
+                })
 
     },
 
     },
 
-    mounted() {}
 
+    methods: {
 
+        getCreators() {
 
+            this.$http
 
+                .post(
 
+                    '/user/all',
 
+                    {
 
+                        page: 0,
 
+                        query: { hasRole: 'ROLE_MINTER' },
 
+                        size: 4,
 
+                        sort: 'sales,desc'
 
+                    },
 
+                    { body: 'json' }
 
+                )
 
+                .then(res => {
 
+                    this.creators = res.content;
 
+                });
 
+        },
 
+        autoChange() {
 
+            if (this.timer) {
 
+                clearTimeout(this.timer);
 
+            }
 
+            if (!this.initChange) {
 
+                return;
 
+            }
 
+            this.showCreator = (this.showCreator + 1) % 4;
 
+            this.timer = setTimeout(this.autoChange, 3000);
 
+        },
 
+        getProduct(type = 'DEFAULT') {
 
+            return this.$http
 
+                .post(
 
+                    '/collection/all',
 
+                    {
 
+                        page: 0,
 
+                        size: 4,
 
+                        query: {
 
+                            type: type,
 
+                            onShelf: true,
 
+                            del: false
 
+                        },
 
+                        sort: 'createdAt,desc'
 
+                    },
 
+                    { body: 'json' }
 
+                )
 
+                .then(res => {
 
+                    return Promise.resolve(res.content);
 
+                });
 
+        }
 
+    },
 
+    watch: {
 
+        initChange() {
 
+            if (this.initChange) {
 
+                if (this.timer) {
 
+                    clearTimeout(this.timer);
 
+                }
 
+                this.timer = setTimeout(this.autoChange, 3000);
 
+            }
 
+        }
 
+    }
 
 };
 
 };
 
 </script>
 
 </script>
 
 <style lang="less" scoped>
 
 <style lang="less" scoped>
 
@@ -146,7 +242,7 @@ export default {
 
             margin: 50px 0 0 10px;
 
             margin: 50px 0 0 10px;
 
             position: relative;
 
             position: relative;
 
             font-size: 24px;
 
             font-size: 24px;
 
-            color: #00ffcb;
 
+            color: @prim;
 
             border: 1px solid;
 
             border: 1px solid;
 
             border-radius: 8px;
 
             border-radius: 8px;
 
             background-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
 
             background-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
 
@@ -156,16 +252,23 @@ export default {
 
 .introduce {
 
 .introduce {
 
     display: flex;
 
     display: flex;
 
     align-items: center;
 
     align-items: center;
 
-    justify-content: space-between;
 
-    height: 300px;
 
-    .introduce2 {
 
-        display: flex;
 
+    // justify-content: space-between;
 
+
 
+    .introduce-content {
 
+        display: inline-flex;
 
         align-items: center;
 
         align-items: center;
 
+        height: 300px;
 
+        width: 220px;
 
+        cursor: pointer;
 
+        overflow: hidden;
 
+        transition: width ease-in-out 0.3s;
 
         .img1 {
 
         .img1 {
 
-            width: 180px;
 
+            width: 220px;
 
             height: 180px;
 
             height: 180px;
 
             border-radius: 8px;
 
             border-radius: 8px;
 
             margin-right: 16px;
 
             margin-right: 16px;
 
+            flex-shrink: 0;
 
+            transition: width ease-in-out 0.3s;
 
         }
 
         }
 
         .name {
 
         .name {
 
             font-size: 16px;
 
             font-size: 16px;
 
@@ -187,12 +290,23 @@ export default {
 
             text-overflow: ellipsis;
 
             text-overflow: ellipsis;
 
         }
 
         }
 
     }
 
     }
 
-    .img2 {
 
-        width: 220px;
 
-        height: 180px;
 
-        border-radius: 8px;
 
+    .introduce2 {
 
+        &.active {
 
+            .introduce-content {
 
+                width: 460px;
 
+                .img1 {
 
+                    width: 180px;
 
+                }
 
+            }
 
+        }
 
+    }
 
+    .introduce2 + .introduce2 {
 
         margin-left: 30px;
 
         margin-left: 30px;
 
     }
 
     }
 
+
 
+    .active + .introduce2 {
 
+        margin-left: 20px;
 
+    }
 
 }
 
 }
 
 .content {
 
 .content {
 
     background: #0f1111;
 
     background: #0f1111;
 
@@ -222,6 +336,13 @@ export default {
 
             color: #ffffff;
 
             color: #ffffff;
 
             line-height: 24px;
 
             line-height: 24px;
 
             margin: 0 10px;
 
             margin: 0 10px;
 
+            cursor: pointer;
 
+        }
 
+
 
+        &:hover {
 
+            .name {
 
+                animation-name: jello;
 
+            }
 
         }
 
         }
 
     }
 
     }
 
 }
 
 }
 
@@ -269,21 +390,11 @@ export default {
 
         align-items: center;
 
         align-items: center;
 
         justify-content: space-between;
 
         justify-content: space-between;
 
         .box {
 
         .box {
 
-            // .line();
 
+            .line();
 
             width: 580px;
 
             width: 580px;
 
             height: 114px;
 
             height: 114px;
 
-            background: #0f1111;
 
-            border-radius: 8px;
 
             border: 1px solid;
 
             border: 1px solid;
 
             margin-bottom: 30px;
 
             margin-bottom: 30px;
 
-            border-image: linear-gradient(
 
-                    143deg,
 
-                    rgba(0, 255, 203, 0.6),
 
-                    rgba(0, 209, 220, 0.1),
 
-                    rgba(0, 151, 240, 0.1),
 
-                    rgba(0, 110, 255, 0.5)
 
-                )
 
-                1 1;
 
             .box1 {
 
             .box1 {
 
                 margin: 30px 0 0 40px;
 
                 margin: 30px 0 0 40px;
 
                 .text1 {
 
                 .text1 {
 
@@ -338,7 +449,7 @@ export default {
 
             font-weight: 400;
 
             font-weight: 400;
 
             color: #ffffff;
 
             color: #ffffff;
 
             line-height: 25px;
 
             line-height: 25px;
 
-            margin: 12px 0;
 
+            // margin: 12px 0;
 
             &.words3 {
 
             &.words3 {
 
                 text-align: center;
 
                 text-align: center;
 
             }
 
             }
 
@@ -349,6 +460,7 @@ export default {
 
             font-weight: 400;
 
             font-weight: 400;
 
             color: #939599;
 
             color: #939599;
 
             line-height: 24px;
 
             line-height: 24px;
 
+            margin-top: 12px;
 
         }
 
         }
 
         .th2 {
 
         .th2 {
 
             display: flex;
 
             display: flex;
 
@@ -367,4 +479,16 @@ export default {
 
         }
 
         }
 
     }
 
     }
 
 }
 
 }
 
+
 
+.list {
 
+    margin: -16px;
 
+    .collect {
 
+        margin: 16px;
 
+    }
 
+}
 
+.word-item {
 
+    .more {
 
+        padding: 0;
 
+    }
 
+}
 
 </style>
 
 </style>

+ 1 - 1
src/main/pc-space/src/views/My.vue
查看文件 

@@ -73,7 +73,7 @@ export default {
 
             line-height: 42px;
 
             line-height: 42px;
 
             &.active {
 
             &.active {
 
                 color: #ffffff;
 
                 color: #ffffff;
 
-                background: linear-gradient(46deg, #00ffcb 0%, #006eff 100%);
 
+                background: linear-gradient(46deg, @prim 0%, @warn 100%);
 
             }
 
             }
 
             &:first-child {
 
             &:first-child {
 
                 border-radius: 8px 0px 0px 8px;
 
                 border-radius: 8px 0px 0px 8px;

+ 1 - 1
src/main/pc-space/src/views/user/AccountData.vue
查看文件 

@@ -193,7 +193,7 @@ export default {
 
             .text4 {
 
             .text4 {
 
                 font-size: 16px;
 
                 font-size: 16px;
 
                 font-weight: 400;
 
                 font-weight: 400;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 24px;
 
                 line-height: 24px;
 
                 cursor: pointer;
 
                 cursor: pointer;
 
             }
 
             }

+ 1 - 1
src/main/pc-space/src/views/user/Authentication.vue
查看文件 

@@ -97,7 +97,7 @@ export default {
 
             /deep/ .el-button {
 
             /deep/ .el-button {
 
                 width: 130px;
 
                 width: 130px;
 
                 height: 36px;
 
                 height: 36px;
 
-                background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+                background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
                 border-radius: 4px;
 
                 border-radius: 4px;
 
                 margin-top: 60px;
 
                 margin-top: 60px;
 
                 color: #ffffff;
 
                 color: #ffffff;

+ 4 - 4
src/main/pc-space/src/views/user/EnterpriseAuthentication.vue
查看文件 

@@ -211,7 +211,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
         margin: 0 !important;
 
         margin: 0 !important;
 
     }
 
     }
 
@@ -265,7 +265,7 @@ export default {
 
             .text2 {
 
             .text2 {
 
                 font-size: 20px;
 
                 font-size: 20px;
 
                 font-weight: bold;
 
                 font-weight: bold;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 26px;
 
                 line-height: 26px;
 
                 margin: 20px 0 10px;
 
                 margin: 20px 0 10px;
 
             }
 
             }
 
@@ -283,7 +283,7 @@ export default {
 
                 cursor: pointer;
 
                 cursor: pointer;
 
                 line-height: 36px;
 
                 line-height: 36px;
 
                 text-align: center;
 
                 text-align: center;
 
-                background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+                background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
                 border-radius: 4px;
 
                 border-radius: 4px;
 
                 margin: 87px 0 0 518px;
 
                 margin: 87px 0 0 518px;
 
             }
 
             }
 
@@ -303,7 +303,7 @@ export default {
 
         /deep/ .el-button {
 
         /deep/ .el-button {
 
             width: 130px;
 
             width: 130px;
 
             height: 36px;
 
             height: 36px;
 
-            background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             margin-top: 60px;
 
             margin-top: 60px;
 
             color: #ffffff;
 
             color: #ffffff;

+ 1 - 1
src/main/pc-space/src/views/user/Fans.vue
查看文件 

@@ -114,7 +114,7 @@ export default {
 
                             line-height: 26px;
 
                             line-height: 26px;
 
                             text-align: center;
 
                             text-align: center;
 
                             font-size: 14px;
 
                             font-size: 14px;
 
-                            color: #00ffcb;
 
+                            color: @prim;
 
                         }
 
                         }
 
                     }
 
                     }
 
                 }
 
                 }

+ 2 - 2
src/main/pc-space/src/views/user/Give.vue
查看文件 

@@ -218,7 +218,7 @@ export default {
 
             .follow {
 
             .follow {
 
                 width: 70px;
 
                 width: 70px;
 
                 height: 26px;
 
                 height: 26px;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 font-size: 14px;
 
                 font-size: 14px;
 
                 border-radius: 16px;
 
                 border-radius: 16px;
 
                 border: 1px solid;
 
                 border: 1px solid;
 
@@ -238,7 +238,7 @@ export default {
 
     }
 
     }
 
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
 
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
 
         // background: linear-gradient(41deg, #fdfb60 0%, #ff8f3e 100%);
 
         // background: linear-gradient(41deg, #fdfb60 0%, #ff8f3e 100%);
 
-        background: linear-gradient(46deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(46deg, @prim 0%, @warn 100%);
 
         color: #fff;
 
         color: #fff;
 
         border-color: #fff;
 
         border-color: #fff;
 
     }
 
     }

+ 1 - 1
src/main/pc-space/src/views/user/Modifypad.vue
查看文件 

@@ -128,7 +128,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
     }
 
     }
 
     /deep/ .el-form-item__error {
 
     /deep/ .el-form-item__error {

+ 1 - 1
src/main/pc-space/src/views/user/Personal.vue
查看文件 

@@ -7,7 +7,7 @@
 
                 router
 
                 router
 
                 class="el-menu-vertical-demo"
 
                 class="el-menu-vertical-demo"
 
                 text-color="#939599"
 
                 text-color="#939599"
 
-                active-text-color="#00FFCB"
 
+                active-text-color="@prim"
 
             >
 
             >
 
                 <el-submenu index="1">
 
                 <el-submenu index="1">
 
                     <template slot="title">
 
                     <template slot="title">

+ 3 - 3
src/main/pc-space/src/views/user/Security.vue
查看文件 

@@ -27,7 +27,7 @@
 
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
                             <span
 
                             <span
 
                                 @click="send"
 
                                 @click="send"
 
-                                style="color: #00ffcb; cursor: pointer; font-size: 13px"
 
+                                style="color: @prim; cursor: pointer; font-size: 13px"
 
                                 slot="suffix"
 
                                 slot="suffix"
 
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
 
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
 
                             >
 
                             >
 
@@ -105,7 +105,7 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -155,7 +155,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
     }
 
     }
 
     /deep/ .el-step__title {
 
     /deep/ .el-step__title {

+ 4 - 4
src/main/pc-space/src/views/user/SecuritySuccess.vue
查看文件 

@@ -46,21 +46,21 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(2) {
 
 /deep/.el-step:nth-child(2) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(3) {
 
 /deep/.el-step:nth-child(3) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -88,7 +88,7 @@ export default {
 
             cursor: pointer;
 
             cursor: pointer;
 
             line-height: 36px;
 
             line-height: 36px;
 
             text-align: center;
 
             text-align: center;
 
-            background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             margin: 0 auto;
 
             margin: 0 auto;
 
         }
 
         }

+ 3 - 3
src/main/pc-space/src/views/user/Transaction.vue
查看文件 

@@ -27,7 +27,7 @@
 
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
 
                             <span
 
                             <span
 
                                 @click="send"
 
                                 @click="send"
 
-                                style="color: #00ffcb; cursor: pointer; font-size: 13px"
 
+                                style="color: @prim; cursor: pointer; font-size: 13px"
 
                                 slot="suffix"
 
                                 slot="suffix"
 
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
 
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
 
                             >
 
                             >
 
@@ -105,7 +105,7 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -155,7 +155,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
     }
 
     }
 
     /deep/ .el-step__title {
 
     /deep/ .el-step__title {

+ 4 - 4
src/main/pc-space/src/views/user/TransactionSuccess.vue
查看文件 

@@ -46,21 +46,21 @@ export default {
 
 }
 
 }
 
 /deep/.el-step:nth-child(1) {
 
 /deep/.el-step:nth-child(1) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(2) {
 
 /deep/.el-step:nth-child(2) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
 }
 
 }
 
 /deep/.el-step:nth-child(3) {
 
 /deep/.el-step:nth-child(3) {
 
     .el-step__icon {
 
     .el-step__icon {
 
-        background: linear-gradient(143deg, #00ffcb 0%, #006eff 100%, #006eff 100%);
 
+        background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
 
         color: #ffffff;
 
         color: #ffffff;
 
         border: 0;
 
         border: 0;
 
     }
 
     }
 
@@ -88,7 +88,7 @@ export default {
 
             cursor: pointer;
 
             cursor: pointer;
 
             line-height: 36px;
 
             line-height: 36px;
 
             text-align: center;
 
             text-align: center;
 
-            background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             margin: 0 auto;
 
             margin: 0 auto;
 
         }
 
         }

+ 4 - 4
src/main/pc-space/src/views/user/UserAuthentication.vue
查看文件 

@@ -195,7 +195,7 @@ export default {
 
     /deep/ .el-button {
 
     /deep/ .el-button {
 
         width: 130px;
 
         width: 130px;
 
         height: 36px;
 
         height: 36px;
 
-        background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
         border-radius: 4px;
 
         border-radius: 4px;
 
         margin: 0 !important;
 
         margin: 0 !important;
 
     }
 
     }
 
@@ -249,7 +249,7 @@ export default {
 
             .text2 {
 
             .text2 {
 
                 font-size: 20px;
 
                 font-size: 20px;
 
                 font-weight: bold;
 
                 font-weight: bold;
 
-                color: #00ffcb;
 
+                color: @prim;
 
                 line-height: 26px;
 
                 line-height: 26px;
 
                 margin: 20px 0 10px;
 
                 margin: 20px 0 10px;
 
             }
 
             }
 
@@ -267,7 +267,7 @@ export default {
 
                 color: #ffffff;
 
                 color: #ffffff;
 
                 line-height: 36px;
 
                 line-height: 36px;
 
                 text-align: center;
 
                 text-align: center;
 
-                background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+                background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
                 border-radius: 4px;
 
                 border-radius: 4px;
 
                 margin: 87px 0 0 518px;
 
                 margin: 87px 0 0 518px;
 
             }
 
             }
 
@@ -287,7 +287,7 @@ export default {
 
         /deep/ .el-button {
 
         /deep/ .el-button {
 
             width: 130px;
 
             width: 130px;
 
             height: 36px;
 
             height: 36px;
 
-            background: linear-gradient(133deg, #00ffcb 0%, #006eff 100%);
 
+            background: linear-gradient(133deg, @prim 0%, @warn 100%);
 
             border-radius: 4px;
 
             border-radius: 4px;
 
             margin-top: 60px;
 
             margin-top: 60px;
 
             color: #ffffff;
 
             color: #ffffff;