Merge branch 'dev' of github.com:JX3BOX/pvx into dev

JX3BOX · Dec 4, 2023 · 48ea95a · 48ea95a
2 parents b2bf30d + f038da8
commit 48ea95a
Show file tree

Hide file tree

Showing 6 changed files with 409 additions and 164 deletions.
diff --git a/src/assets/css/gonggao/daily.less b/src/assets/css/gonggao/daily.less
@@ -1,7 +1,7 @@
 .m-daily {
     .flex;
     flex-wrap: wrap;
-    gap: 30px;
+    gap: 20px;
     .m-daily-item {
         flex: none;
         .mb(10px);
@@ -50,6 +50,9 @@
     @media screen and (max-width: @phone) {
         .m-daily-item {
             width: 100%;
+            .m-daily-content {
+                .w(100%);
+            }
         }
     }
     .m-simple-server {
@@ -144,6 +147,12 @@
                             background-color: #f56c6c;
                         }
                     }
+                    @media screen and (max-width: @phone) {
+                        .w(80px);
+                        .u-status {
+                            .w(60px);
+                        }
+                    }
                 }
             }
         }
@@ -225,7 +234,7 @@
         }
         @media screen and (max-width: @phone) {
             .m-simple-daily-item {
-                width: 180px;
+                width: 118px;
             }
         }
     }
@@ -433,47 +442,47 @@
     }
 
     .m-simple-furniture {
-        margin-top: 20px;
         display: flex;
         flex-direction: column;
-        justify-content: center;
+        justify-content: flex-start;
         align-items: flex-start;
         padding: 10px;
-        gap: 5px;
+        gap: 10px;
 
         .w(100%);
-        // height: 99px;
+        height: 119px;
         box-sizing: border-box;
 
         background: #ffffff;
         border-radius: 10px;
         flex: none;
-        & > div {
+        font-size: 14px;
+        line-height: 18px;
+        color: #000000;
+        .u-furniture-standard,
+        .u-furniture-content {
             .flex;
             .w(100%);
             justify-content: space-between;
-            color: #000000;
-            .u-label {
-                // font-weight: 700;
-                font-size: 15px;
-                line-height: 26px;
-                color: #888;
-            }
-            .u-value {
-                font-weight: 400;
-                font-size: 15px;
-                line-height: 26px;
-            }
             .u-link {
                 &:hover {
                     color: @priceColor;
                 }
             }
         }
+        .u-next-content {
+            width: 100%;
+            text-align: right;
+            font-size: 10px;
+            line-height: 13px;
+            color: #00000066;
+        }
 
         .u-furniture-title {
-            .fz(15px,2);
-            color: #888;
+            font-size: 14px;
+            line-height: 18px;
+            .bold;
+            color: #afafaf;
         }
     }
 
@@ -508,88 +517,126 @@
     }
 
     .m-simple-horse {
-        .u-horse {
+        position: relative;
+        .u-switch {
+            position: absolute;
+            right: 10px;
+            top: -34px;
+            font-size: 14px;
+            color: #989898;
+            cursor: pointer;
+        }
+        display: grid;
+        justify-content: flex-start;
+        grid-template-columns: repeat(3, 1fr);
+        flex-wrap: wrap;
+        gap: 10px;
+        width: 100%;
+        .u-item {
+            display: flex;
+            flex-direction: column;
+            padding: 10px;
+            width: 100%;
+            height: 119px;
+            box-sizing: border-box;
+            background: #fff;
+            color: #000000;
+            border-radius: 10px;
+            .u-name {
+                font-size: 10px;
+                line-height: 13px;
+                color: #afafaf;
+                margin-bottom: 2px;
+            }
+            .u-info {
+                .flex;
+                flex-direction: column;
+                gap: 10px;
+            }
+            .u-chitu-info {
+                gap: 8px;
+            }
+        }
+        @media screen and (max-width: @phone) {
+            .u-item {
+                width: 100%;
+            }
+        }
+        @size: 25px;
+        .u-horse-name-wrap {
+            .dbi;
+            width: @size;
+            height: @size;
+            .u-horse-name {
+                .dbi;
+                @size: 25px;
+                width: @size;
+                height: @size;
+            }
+            .el-carousel__container {
+                height: @size;
+            }
+        }
+        .u-img-list {
             .flex;
-            flex-wrap: wrap;
-            gap: 20px 18px;
-            margin-top: 20px;
-            overflow-x: hidden;
-            overflow-y: auto;
-            max-height: 280px;
+            gap: 4px;
+            width: 113px;
+            overflow-y: hidden;
+            overflow-x: auto;
             .scrollbar(2px);
-            .u-item {
-                flex: none;
-                display: flex;
-                justify-content: space-between;
-                padding: 10px;
-                gap: 13px;
-                box-sizing: border-box;
-                width: 200px;
-                height: 80px;
-                background: #fff;
-                color: #000000;
-                border-radius: 10px;
-            }
-            @media screen and (max-width: @phone) {
-                .u-item {
-                    width: 100%;
+            a {
+                .dbi;
+                .size(@size);
+                :hover {
+                    background-color: #eee;
                 }
             }
-            .u-horse-name-wrap {
-                flex: none;
-                width: 60px;
-                height: 100%;
-                .el-carousel__container {
-                    height: 60px;
-                }
-                .u-img-list {
-                    width: 60px;
-                    a {
-                        .dbi;
-                        width: 100%;
-                        height: 100%;
-                        :hover {
-                            background-color: #eee;
-                        }
-                    }
-                    .u-image {
-                        width: 60px;
-                        height: 60px;
-                    }
-                }
+            .u-image {
+                width: @size;
+                height: @size;
+                .r(5px);
             }
-            .u-times-info {
-                .flex;
-                flex-direction: column;
-                // justify-content: space-between;
-                align-items: flex-end;
-                height: 60px;
-                .u-map-name {
-                    font-weight: 700;
-                    font-size: 15px;
-                    line-height: 30px;
-                }
-                .u-times {
-                    font-weight: 400;
-                    font-size: 14px;
-                    line-height: 24px;
-                    text-align: right;
-                    &.is-exist {
-                        line-height: 14px;
-                    }
-                }
-                .u-times-lately {
-                    color: #fba524;
-                }
-                i {
-                    margin-right: 5px;
-                    cursor: pointer;
-                }
-                .is-exist {
-                    font-size: 12px;
-                }
+            @media screen and(max-width:@phone) {
+                .w(98px);
             }
         }
+        .u-times-info {
+            .flex;
+            flex-direction: column;
+            // justify-content: space-between;
+            align-items: flex-end;
+            height: 60px;
+        }
+        .u-map-name {
+            font-weight: 700;
+            font-size: 12px;
+            line-height: 16px;
+        }
+        .u-times-chitu {
+            .flex;
+            gap: 5px;
+            align-items: center;
+            font-size: 12px;
+            color: #afafaf;
+        }
+        .u-times {
+            font-size: 14px;
+            font-weight: 700;
+        }
+        .u-no {
+            color: #afafaf;
+            font-size: 12px;
+            height: 58px;
+            line-height: 58px;
+            text-align: center;
+        }
+        .u-times-lately {
+            color: #fba524;
+        }
+        i {
+            margin-left: 5px;
+            cursor: pointer;
+        }
     }
 
     // 公告新闻
@@ -670,4 +717,50 @@
             }
         }
     }
+
+    // 家园声望
+
+    .m-simple-reputation {
+        display: flex;
+        flex-direction: column;
+        justify-content: flex-start;
+        align-items: flex-start;
+        padding: 10px;
+        gap: 10px;
+        margin-bottom: 10px;
+
+        .w(100%);
+        height: 119px;
+        box-sizing: border-box;
+
+        background: #ffffff;
+        border-radius: 10px;
+        flex: none;
+        font-size: 14px;
+        line-height: 18px;
+        color: #000000;
+        .u-reputation-title {
+            font-size: 14px;
+            line-height: 18px;
+            .bold;
+            color: #afafaf;
+        }
+
+        .m-reputations {
+            display: grid;
+            grid-template-columns: repeat(4, 1fr);
+            gap: 10px;
+            width: 100%;
+            .h(71px);
+            .u-reputation {
+                box-sizing: border-box;
+                padding: 10px;
+                background-color: #f6f6f6;
+                font-size: 14px;
+                line-height: 18px;
+                color: #000;
+                .r(10px);
+            }
+        }
+    }
 }
diff --git a/src/components/gonggao/Daily.vue b/src/components/gonggao/Daily.vue
@@ -25,13 +25,9 @@
                 <SimpleWeek class="m-daily-content" :activities="activities"></SimpleWeek>
             </div>
             <div class="m-daily-item">
-                <div class="u-title">园宅会赛</div>
-                <div class="m-child-item">
-                    <SimpleFurniture :furniture="currentFurniture" title="本期"></SimpleFurniture>
-                </div>
-                <div class="m-child-item">
-                    <SimpleFurniture :furniture="nextFurniture" title="下期"></SimpleFurniture>
-                </div>
+                <div class="u-title">家园</div>
+                <SimpleReputation :activities="activities"></SimpleReputation>
+                <SimpleFurniture :furniture="currentFurniture" :nextFurniture="nextFurniture"></SimpleFurniture>
             </div>
             <div class="m-daily-item">
                 <div class="u-title">抓马播报</div>
@@ -49,6 +45,7 @@ import SimpleServer from "./daily/SimpleServer.vue";
 import SimpleDaily from "./daily/SimpleDaily.vue";
 import SimpleWeek from "./daily/SimpleWeek.vue";
 import SimpleCelebrity from "./daily/SimpleCelebrity.vue";
+import SimpleReputation from "./daily/SimpleReputation.vue";
 import SimpleFurniture from "./daily/SimpleFurniture.vue";
 import SimpleHorse from "./daily/SimpleHorse.vue";
 import dailyKeys from "@/assets/data/daily_keys.json";
@@ -58,6 +55,7 @@ export default {
         SimpleNotice,
         SimpleServer,
         SimpleDaily,
+        SimpleReputation,
         SimpleCelebrity,
         SimpleWeek,
         SimpleFurniture,