Merge branch 'master' of git.mycard.moe:mycard/moecube-store

src/app/layout/layout.component.css

@@ -33,8 +33,8 @@
     min-width: 1300px;
     width: 100%;
     height: 100%;
-    background-size: auto 100%;
-    background-image: url("../../assets/img/background.png");
+    background-size: 100% 100%;
+    background-image: url("../../assets/img/background.jpg");
     background-repeat: no-repeat;
     background-position: center;
 }
@@ -244,7 +244,7 @@
     /*height: 100vh;*/
     background-color: #C5D1EB;
     padding-top: 50px;
-    padding-bottom: 100px;
+    padding-bottom: 80px;
 }
 
 .section-third-container {
@@ -263,8 +263,9 @@
 }
 
 .section-third-grid > div {
-    height: 220px;
+    height: 240px;
     margin-top: 10px;
+    line-height: 240px;
 }
 
 .section-third-pic {
@@ -340,25 +341,26 @@
     text-align: center;
     margin: 0 auto;
     width: 300px;
-    height: 220px;
+    height: 300px;
+    background-size: 100% 100%;
 }
 
 .section-fourth-row > div[nz-col]:nth-child(1) > .section-fourth-bg {
-  background: url('https://minio.mycard.moe:9000/ygobbs/original/3X/9/a/9a7b1baa8002e755bab2b192b8e66e626a8d4174.jpeg');
+  background-image: url('https://gd1.alicdn.com/imgextra/i1/3326824106/O1CN01z6DnKm1gCardQ7XUR_!!3326824106.jpg_400x400.jpg');
 }
 .section-fourth-row > div[nz-col]:nth-child(2) > .section-fourth-bg {
-  background: url('https://gd3.alicdn.com/imgextra/i4/3326824106/O1CN01KcaAiT1gCamWPsq7N_!!3326824106.jpg');
+  background-image: url('https://gd3.alicdn.com/imgextra/i3/3326824106/O1CN01DdpzJg1gCasU4R9ml_!!3326824106.jpg_400x400.jpg');
 }
 .section-fourth-row > div[nz-col]:nth-child(3) > .section-fourth-bg {
-  background: url('https://gd4.alicdn.com/imgextra/i2/3326824106/TB250OibAvoK1RjSZPfXXXPKFXa_!!3326824106.jpg');
+  background-image: url('https://gd1.alicdn.com/imgextra/i2/3326824106/O1CN01nD82zW1gCavgN7T36_!!3326824106.jpg_400x400.jpg');
 }
 .section-fourth-row > div[nz-col]:nth-child(4) > .section-fourth-bg {
-  background: url('https://gd1.alicdn.com/imgextra/i3/3326824106/O1CN01YsyZ9Z1gCamd7pKC1_!!3326824106.jpg');
+  background-image: url('https://gd3.alicdn.com/imgextra/i4/3326824106/O1CN01ziXHUa1gCasZ4Uytx_!!3326824106.jpg_400x400.jpg');
 }
 
 .section-card-cover {
     color: #ffffff;
-    height: 220px;
+    height: 300px;
     width: 100%;
     float: right;
     background: rgba(0, 0, 0, 0.8);
@@ -366,18 +368,13 @@
 }
 
 .section-card-cover:hover {
-    color: #ffffff;
-    height: 220px;
-    width: 100%;
-    float: right;
-    background: rgba(0, 0, 0, 0.8);
     opacity: 1;
 }
 .section-card-body {
     margin: 0 auto;
     text-align: center;
     position: relative;
-    top: 50px;
+    top: 80px;
 }
 
 @keyframes iconShow {

src/app/layout/layout.component.html

@@ -29,16 +29,16 @@
             <!--<button nz-button nzType="primary" nzSize="large" nzShape="round"><i nz-icon type="download"></i>下载游戏
                   </button>-->
             <img
-              src="assets/img/button-3.png"
-              width="150px"
+              src="assets/img/button-3_1.png"
+              width="152px"
               style="position: relative;top:80px; border-radius: 3px; border: 1px solid #F2F6FC"
             />
           </a>
         </div>
       </div>
 
-      <div class="no-select" style="position: absolute;bottom:0;left:45%;z-index:0;color:#fff;font-size: 25px;">
-        <p>向下 <i nz-icon nzType="down-circle" nzTheme="outline" class="down-icon"></i> 滚动</p>
+      <div class="no-select" style="position: absolute;bottom:0;left:50%;z-index:0;color:#fff;font-size: 25px;">
+        <p style="position: relative;left: -50%;">向下 <i nz-icon nzType="down-circle" nzTheme="outline" class="down-icon"></i> 滚动</p>
       </div>
       <!--
             <div class="download-button">
@@ -52,9 +52,9 @@
         <div nz-row [nzType]="'flex'" [nzJustify]="'center'" style="padding-top:50px;">
           <div nz-col>
             <div class="no-select" style="position: relative; left: 100px;">
-              <img class="card-one" draggable="false" src="assets/img/card-1.jpg" width="200px" />
-              <img class="card-two" draggable="false" src="assets/img/card-1.jpg" width="200px" />
-              <img class="card-three" draggable="false" src="assets/img/card-1.jpg" width="200px" />
+              <img class="card-one" draggable="false" src="assets/img/55144522.jpg" width="200px" />
+              <img class="card-two" draggable="false" src="assets/img/37818794.jpg" width="200px" />
+              <img class="card-three" draggable="false" src="assets/img/17330916.jpg" width="200px" />
             </div>
           </div>
           <div nz-col style="min-width: 600px">
@@ -62,7 +62,7 @@
               <div nz-col nzSpan="8" class="plant-grid">
                 <i nz-icon nzType="gift" nzTheme="outline" class="icon"></i>
                 <p class="plant-title">免费收录</p>
-                <p class="grid-desc">氪金要素不存在的<br />最开始所有卡片都可选用<br />随心组出想要的卡组</p>
+                <p class="grid-desc">氪金要素不存在的<br />所有卡片都可直接使用<br />随心组出想要的卡组</p>
               </div>
               <div nz-col nzSpan="8" class="plant-grid">
                 <i nz-icon nzType="rocket" nzTheme="outline" class="icon"></i>
@@ -108,7 +108,7 @@
         <div class="section-title"><p style="font-size:50px;color:#313154 !important;">代表作品</p></div>
         <div nz-row class="section-third-grid" [nzType]="'flex'">
           <div nz-col nzSpan="6">
-            <img class="section-third-pic" src="https://minio.mycard.moe:9000/ygobbs/original/3X/2/0/20882f6007c257970d101986d73ceb20b5904540.jpeg" />
+            <img class="section-third-pic" src="assets/img/ygopro-screenshot-1.jpg" />
           </div>
           <div nz-col nzSpan="6">
             <img class="section-third-pic" src="https://cdn01.moecube.com/store/en-US/assets/ozns_1.jpg" />
@@ -120,7 +120,7 @@
             <img class="section-third-pic" src="https://cdn01.moecube.com/store/en-US/assets/df02_1.jpg" />
           </div>
           <div nz-col nzSpan="6">
-            <img class="section-third-pic" src="https://minio.mycard.moe:9000/ygobbs/original/3X/3/9/3903f4cf6c051256862d7cf94e83921024f5b20a.jpeg" />
+            <img class="section-third-pic" src="assets/img/ygopro-screenshot-2.jpg" />
           </div>
           <div nz-col nzSpan="6">
             <img class="section-third-pic" src="https://cdn01.moecube.com/store/en-US/assets/ozns_2.jpg" />
@@ -143,9 +143,9 @@
             <div class="section-fourth-bg">
               <div class="section-card-cover">
                 <div class="section-card-body">
-                  <p>McPro开闪垫</p>
-                  <p>以闪刀姬与混沌战士-开辟的使者为主题的卡垫</p>
-                  <a href="https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-18538369597.5.7ac66b13MPAexy&id=577503221668" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
+                  <p>MCPro五手坑人形牌挂件</p>
+                  <p>灰流丽、幽鬼兔、浮幽樱、屋敷童、儚无水木</p>
+                  <a href="https://item.taobao.com/item.htm?id=605854592741" target="_blank" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
                 </div>
               </div>
             </div>
@@ -154,9 +154,9 @@
             <div class="section-fourth-bg">
               <div class="section-card-cover">
                 <div class="section-card-body">
-                  <p>McPro圣诞黑魔女垫</p>
-                  <p>2017年MCPro圣诞垫——黑魔女圣诞老人登场~</p>
-                  <a href="https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-18538369597.2.7ac66b13MPAexy&id=584397293791" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
+                  <p>McPro原创卡垫</p>
+                  <p>闪刀姬露世圣诞卡垫</p>
+                  <a href="https://item.taobao.com/item.htm?id=616864203942" target="_blank" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
                 </div>
               </div>
             </div>
@@ -165,9 +165,9 @@
             <div class="section-fourth-bg">
               <div class="section-card-cover">
                 <div class="section-card-body">
-                  <p>McPro单闪垫</p>
-                  <p>以闪刀姬为主题的卡垫，画师为Maobro~</p>
-                  <a href="https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-18538369597.10.7ac66b13MPAexy&id=577630610539" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
+                  <p>MCPro原创游戏王主题雕刻骰子</p>
+                  <p>埃及金还有系列家徽等等</p>
+                  <a href="https://item.taobao.com/item.htm?id=638608427667" target="_blank" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
                 </div>
               </div>
             </div>
@@ -176,9 +176,9 @@
             <div class="section-fourth-bg">
               <div class="section-card-cover">
                 <div class="section-card-body">
-                  <p>McPro雪兔垫</p>
-                  <p>2018年MCPro圣诞垫-以幽鬼兔与冰之丽妖 雪女为主题的卡垫</p>
-                  <a href="https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-18538369597.8.7ac66b13MPAexy&id=584662587907" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
+                  <p>McPro原创卡垫</p>
+                  <p>水灵使与火灵使</p>
+                  <a href="https://item.taobao.com/item.htm?id=609176073733" target="_blank" nz-button nzType="primary" nzSize="large"><i nz-icon nzType="shopping" nzTheme="outline"></i>购买</a>
                 </div>
               </div>
             </div>