fix:日常云从社楚天社

JX3BOX · Dec 4, 2023 · 203e006 · 203e006
1 parent 13c1281
commit 203e006
Show file tree

Hide file tree

Showing 5 changed files with 234 additions and 124 deletions.
diff --git a/src/assets/css/gonggao/daily.less b/src/assets/css/gonggao/daily.less
@@ -16,6 +16,15 @@
             .u-server {
                 font-size: 16px;
             }
+            .flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            span {
+                font-size: 14px;
+                color: #989898;
+                cursor: pointer;
+                margin-right: 10px;
+            }
         }
         .m-daily-content {
             .size(420px, 248px);
@@ -222,52 +231,54 @@
     }
 
     .m-simple-celebrity {
-        .mt(20px);
         .flex;
         flex-direction: column;
-        gap: 20px;
+        gap: 10px;
         .m-celebrity-item {
             flex: none;
             .flex;
             flex-direction: column;
             padding: 10px;
-            gap: 13px;
+            gap: 20px;
             width: 100%;
-            height: 80px;
+            height: 76px;
             box-sizing: border-box;
 
             background: #ffffff;
             color: #000000;
             border-radius: 10px;
+            font-size: 14px;
+            line-height: 18px;
             .u-celebrity-title {
                 .flex;
                 justify-content: space-between;
                 align-items: center;
-                // font-weight: 700;
-                font-size: 16px;
-                line-height: 26px;
-                color: #888;
+                .bold;
+            }
+            .u-celebrity-staged {
+                .flex;
+                justify-content: space-between;
+                align-items: center;
+                .bold;
+                img {
+                    .size(18px);
+                    margin-right: 2px;
+                }
             }
             .u-celebrity-desc {
                 .flex;
                 justify-content: space-between;
                 align-items: center;
-                font-weight: 400;
-                font-size: 15px;
-                line-height: 21px;
-                & > div {
+                .u-map {
                     .flex;
                     align-items: center;
+                    gap: 5px;
                 }
-                img {
-                    .size(21px, 21px);
-                    .mr(2px);
+                .u-desc {
+                    font-size: 12px;
+                    color: rgba(0, 0, 0, 0.5);
                 }
             }
-            &.current-item {
-                // background-color: #ffad31;
-                // color: #fff;
-            }
         }
     }
 

diff --git a/src/components/gonggao/Daily.vue b/src/components/gonggao/Daily.vue
@@ -14,25 +14,12 @@
                 <SimpleDaily class="m-daily-content" :activities="activities"></SimpleDaily>
             </div>
             <div class="m-daily-item">
-                <div class="u-title">楚天社</div>
-                <SimpleCelebrity class="m-daily-content"></SimpleCelebrity>
+                <div class="u-title">
+                    <div>{{ !currentCelebrity ? "楚天社" : "云从社" }}</div>
+                    <span @click="switchCelebrity">切换</span>
+                </div>
+                <SimpleCelebrity :type="currentCelebrity" class="m-daily-content"></SimpleCelebrity>
             </div>
-        </template>
-
-        <!-- <div class="m-daily-item is-disabled"></div> -->
-        <!-- <div class="m-daily-item is-disabled">
-            <div class="u-title">武林通鉴·秘境</div>
-            <SimpleFb :list="fbList"></SimpleFb>
-        </div>
-        <div class="m-daily-item is-disabled">
-            <div class="u-title">武林通鉴·团队秘境</div>
-            <SimpleFb :list="teamFbList"></SimpleFb>
-        </div>
-        <div class="m-daily-item is-disabled">
-            <div class="u-title">门派事件</div>
-            <SimpleMp></SimpleMp>
-        </div> -->
-        <template v-if="!isOrigin">
             <div class="m-daily-item">
                 <div class="u-title">园宅会赛</div>
                 <div class="m-child-item">
@@ -78,34 +65,7 @@ export default {
     },
     data() {
         return {
-            fbList: [
-                {
-                    name: "英雄刀轮海厅(完善中...)",
-                    isDone: true,
-                },
-                {
-                    name: "英雄空雾峰(完善中...)",
-                    isDone: false,
-                },
-                {
-                    name: "英雄毒神殿(完善中...)",
-                    isDone: false,
-                },
-            ],
-            teamFbList: [
-                {
-                    name: "西津渡(完善中...)",
-                    isDone: false,
-                },
-                {
-                    name: "持国天王回忆录(完善中...)",
-                    isDone: true,
-                },
-                {
-                    name: "血战天策(完善中...)",
-                    isDone: false,
-                },
-            ],
+            currentCelebrity: 1, // 楚天社0 云从社1
             currentFurniture: {},
             nextFurniture: {},
             activities: [], // 日常配置列表
@@ -140,6 +100,9 @@ export default {
         },
     },
     methods: {
+        switchCelebrity() {
+            this.currentCelebrity = ~~!this.currentCelebrity;
+        },
         loadDailyNew() {
             const params = {
                 client: this.client,