فهرست منبع

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

xuqiang 4 سال پیش
والد
کامیت
0ebc6cdfd7

+ 1 - 1
src/main/nine-space/public/index.html

@@ -3,7 +3,7 @@
     <head>
     <head>
         <meta charset="utf-8" />
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, viewport-fit=cover" />
         <meta name="msapplication-tap-highlight" content="no" />
         <meta name="msapplication-tap-highlight" content="no" />
         <meta name="format-detection" content="telphone=no" />
         <meta name="format-detection" content="telphone=no" />
         <meta name="format-detection" content="email=no" />
         <meta name="format-detection" content="email=no" />

+ 1 - 1
src/main/nine-space/src/components/PageTitle.vue

@@ -17,6 +17,6 @@ export default {
             font-family: ZhenyanGB-Regular, ZhenyanGB;
             font-family: ZhenyanGB-Regular, ZhenyanGB;
         }
         }
     }
     }
-    padding: 30px 16px 20px 16px;
+    padding: 30px 16px 12px 16px;
 }
 }
 </style>
 </style>

+ 2 - 0
src/main/pc-space/package.json

@@ -30,6 +30,8 @@
         "less": "^3.0.4",
         "less": "^3.0.4",
         "less-loader": "^5.0.0",
         "less-loader": "^5.0.0",
         "prettier": "^2.2.1",
         "prettier": "^2.2.1",
+        "style-resources-loader": "^1.4.1",
+        "vue-cli-plugin-style-resources-loader": "^0.1.5",
         "vue-template-compiler": "^2.6.11"
         "vue-template-compiler": "^2.6.11"
     }
     }
 }
 }

+ 3 - 6
src/main/pc-space/src/components/goodsInfo.vue → src/main/pc-space/src/components/GoodsInfo.vue

@@ -69,16 +69,13 @@ export default {
     align-items: center;
     align-items: center;
     justify-content: space-between;
     justify-content: space-between;
     .content {
     .content {
+        .line();
         width: 276px;
         width: 276px;
         height: 416px;
         height: 416px;
-        background: #1c1e26;
-        margin-bottom: 40px;
-        border: 1px solid;
-        border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
-        .imgBox {
+       .imgBox {
             height: 266px;
             height: 266px;
             width: 276px;
             width: 276px;
-            // border-radius: 8px 8px 0px 0px;
+            border-radius: 8px 8px 0px 0px;
         }
         }
         .introduce {
         .introduce {
             padding: 10px 16px 6px;
             padding: 10px 16px 6px;

+ 1 - 1
src/main/pc-space/src/main.js

@@ -7,7 +7,7 @@ import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import 'element-ui/lib/theme-chalk/index.css';
 import common from './mixins/common';
 import common from './mixins/common';
 ElementUI.Dialog.props.closeOnClickModal.default = false;
 ElementUI.Dialog.props.closeOnClickModal.default = false;
-import './styles/common.less';
+// import './styles/common.less';
 // import './styles/font.less';
 // import './styles/font.less';
 import './styles/app.less';
 import './styles/app.less';
 
 

+ 1 - 1
src/main/pc-space/src/router/index.js

@@ -10,7 +10,7 @@ Vue.use(VueRouter);
 const routes = [
 const routes = [
     {
     {
         path: '/',
         path: '/',
-        redirect: 'blindsboxDetail'
+        redirect: 'home'
     },
     },
     {
     {
         path: '/',
         path: '/',

+ 2 - 3
src/main/pc-space/src/styles/app.less

@@ -15,7 +15,6 @@ a {
     }
     }
 }
 }
 
 
-
 .hideSelect.el-select-dropdown {
 .hideSelect.el-select-dropdown {
     border-width: 0px;
     border-width: 0px;
     box-shadow: none;
     box-shadow: none;
@@ -145,7 +144,7 @@ body {
             text-align: center;
             text-align: center;
             background-color: #ffffff !important;
             background-color: #ffffff !important;
             color: #353535 !important;
             color: #353535 !important;
-           
+
             &.is-active {
             &.is-active {
                 background-color: transparent !important;
                 background-color: transparent !important;
                 color: #353535 !important;
                 color: #353535 !important;
@@ -160,7 +159,6 @@ body {
     }
     }
 }
 }
 
 
-
 .btn-block {
 .btn-block {
     display: block;
     display: block;
     width: 100%;
     width: 100%;
@@ -183,3 +181,4 @@ body {
     fill: currentColor;
     fill: currentColor;
     overflow: hidden;
     overflow: hidden;
 }
 }
+

+ 46 - 0
src/main/pc-space/src/styles/common.less

@@ -113,3 +113,49 @@
     }
     }
     padding: 0 20px;
     padding: 0 20px;
 }
 }
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+.line(@bg:#1c1e26,@radius:6px,@color1:rgba(0, 255, 203, 1),@color2:rgba(0, 110, 255, 1)) {
+    background-image: linear-gradient(135deg, @color1, @color2);
+    position: relative;
+    padding: 1px;
+    border-radius: @radius;
+    overflow: hidden;
+
+    &::before {
+        position: absolute;
+        z-index: 1;
+        content: '';
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        top: 1px;
+        background-color: @bg;
+        border-radius: @radius;
+    }
+    &::after {
+        position: absolute;
+        z-index: 0;
+        content: '';
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        background-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1));
+        transform-origin: center center;
+        animation: spin ease-in-out 2s infinite;
+    }
+
+    * {
+        z-index: 3;
+        position: relative;
+    }
+}

+ 3 - 0
src/main/pc-space/src/views/Home.vue

@@ -5,6 +5,9 @@
             <div class="title2">全球领先的游戏数字藏品NFT集结地</div>
             <div class="title2">全球领先的游戏数字藏品NFT集结地</div>
             <div class="btn">立即探索</div>
             <div class="btn">立即探索</div>
         </div>
         </div>
+
+        <div class="card">33222</div>
+
         <div class="introduce">
         <div class="introduce">
             <div class="introduce2">
             <div class="introduce2">
                 <img class="img1" src="../assets/img/888.jpg" alt="" />
                 <img class="img1" src="../assets/img/888.jpg" alt="" />

+ 26 - 3
src/main/pc-space/yarn.lock

@@ -1029,7 +1029,7 @@
   dependencies:
   dependencies:
     "@types/node" "*"
     "@types/node" "*"
 
 
-"@types/json-schema@^7.0.5":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
   version "7.0.9"
   version "7.0.9"
   resolved "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   resolved "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0=
   integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0=
@@ -1607,7 +1607,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882384060&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882384060&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0=
   integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0=
 
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   version "6.12.6"
   resolved "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1631470912358&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   resolved "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1631470912358&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=
   integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=
@@ -4156,7 +4156,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 
-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   version "7.2.0"
   resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz?cache=0&sync_timestamp=1632353796482&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob%2Fdownload%2Fglob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz?cache=0&sync_timestamp=1632353796482&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob%2Fdownload%2Fglob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM=
   integrity sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM=
@@ -7236,6 +7236,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.7
     ajv "^6.12.4"
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
     ajv-keywords "^3.5.2"
 
 
+schema-utils@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 select-hose@^2.0.0:
 select-hose@^2.0.0:
   version "2.0.0"
   version "2.0.0"
   resolved "https://registry.nlark.com/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   resolved "https://registry.nlark.com/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -7775,6 +7784,15 @@ strip-json-comments@^3.0.1:
   resolved "https://registry.nlark.com/strip-json-comments/download/strip-json-comments-3.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   resolved "https://registry.nlark.com/strip-json-comments/download/strip-json-comments-3.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-json-comments%2Fdownload%2Fstrip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY=
   integrity sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY=
 
 
+style-resources-loader@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/style-resources-loader/-/style-resources-loader-1.4.1.tgz#87f520e6c8120a71e756726c1c53a78c544ca7db"
+  integrity sha512-UaAoQXq20relw6B633z4QZDxDyW7gevTt1e0y3MZtzdZfnvB90UL658czAgNc609Y7Kn5ErdthK9bSVhnykBUA==
+  dependencies:
+    glob "^7.1.6"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 stylehacks@^4.0.0:
 stylehacks@^4.0.0:
   version "4.0.3"
   version "4.0.3"
   resolved "https://registry.nlark.com/stylehacks/download/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
   resolved "https://registry.nlark.com/stylehacks/download/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -8304,6 +8322,11 @@ vm-browserify@^1.0.1:
   resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA=
   integrity sha1-eGQcSIuObKkadfUR56OzKobl3aA=
 
 
+vue-cli-plugin-style-resources-loader@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/vue-cli-plugin-style-resources-loader/-/vue-cli-plugin-style-resources-loader-0.1.5.tgz#3e95f4df41f5408e1255664690698c0533648109"
+  integrity sha512-LluhjWTZmpGl3tiXg51EciF+T70IN/9t6UvfmgluJBqxbrb6OV9i7L5lTd+OKtcTeghDkhcBmYhtTxxU4w/8sQ==
+
 vue-eslint-parser@^7.0.0:
 vue-eslint-parser@^7.0.0:
   version "7.11.0"
   version "7.11.0"
   resolved "https://registry.npmmirror.com/vue-eslint-parser/download/vue-eslint-parser-7.11.0.tgz?cache=0&sync_timestamp=1634602895439&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"
   resolved "https://registry.npmmirror.com/vue-eslint-parser/download/vue-eslint-parser-7.11.0.tgz?cache=0&sync_timestamp=1634602895439&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"